Effect/c_101
19
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: Effect:f455a921ce786b718e8a22147089775d83df23d8
Branches Tags
Effect:Dev
Effect:Dev_LW
Effect:Dev_SZH
Effect:Dev_YYH
Effect:Dev_LZY
Effect:Dev_LXY
Effect:Dev_wy
Effect:Dev_XH
Effect:Dev_HCJ
Effect:xh-patch-1
Effect:Dev_LXL
Effect:Dev-Lsb
Effect:Dev_lxc
Effect:xxxxchuan1-patch-1
Effect:Dev_WX
Effect:yinhao-patch-1
Effect:Dev_ZYH
Effect:YINKAMISAMA
Effect:Dev_main
Effect:Dev_lw
Effect:master
Effect:YYH_BF
Effect:Dev_BF
Effect:Main
..
compare: Effect:3cf897f2831d897cb56308612cc5040c8e4ef789
Branches Tags
Effect:Dev_LW
Effect:Dev_SZH
Effect:Dev_YYH
Effect:Dev_LZY
Effect:Dev_LXY
Effect:Dev_wy
Effect:Dev_XH
Effect:Dev_HCJ
Effect:xh-patch-1
Effect:Dev_LXL
Effect:Dev-Lsb
Effect:Dev_lxc
Effect:xxxxchuan1-patch-1
Effect:Dev_WX
Effect:yinhao-patch-1
Effect:Dev_ZYH
Effect:YINKAMISAMA
Effect:Dev_main
Effect:Dev_lw
Effect:master
Effect:YYH_BF
Effect:Dev_BF
Effect:Dev
Effect:Main

No commits in common. "f455a921ce786b718e8a22147089775d83df23d8" and "3cf897f2831d897cb56308612cc5040c8e4ef789" have entirely different histories.
f455a921ce ... 3cf897f283

25 changed files with 25 additions and 79 deletions
Show Stats Expand all files Collapse all files

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakRGB_Sole.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTextureAndClamp_Sole.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTexture_Sole.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Default_Sole.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_DeriveHDRfromLDR.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Dissolve_Sole.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Fresnel.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FresnelFunction.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Mask_Sole.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_MaterialFunction_TexSV.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Refine.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VectorToRadialValue.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/MSPresets/M_MS_Character_Material/Functions/MF_FX.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMaterialLiberal/MSPresets/M_MS_Character_Material/M_FX_Character.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/Level/Level_Base.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/Material/1/MI_Body1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/Material/1/MI_Body2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/1/zhahuan3.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/1/zhahuan3_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/1/zhahuan3_PhysicsAsset.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/2/zhahuan4.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/2/zhahuan4_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/2/zhahuan4_PhysicsAsset.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/seq/NewLevelSequence.uasset (Stored with Git LFS)
View File

Binary file not shown.

30
提取指定更新.bat
View File

@ -1,30 +0,0 @@
@echo off
:: 切换到脚本所在目录
cd /d %~dp0
:: 更新记录
git fetch
:: 提示用户输入提交的哈希值
set /p hash=请输入目标提交的哈希值：
:: 检查输入是否为空
if "%hash%"=="" (
echo 错误：哈希值不能为空！
pause
exit /b
)
:: 执行 git cherry-pick 命令并指定冲突解决策略
git cherry-pick %hash% -X theirs
:: 检查 cherry-pick 是否成功
if %errorlevel% equ 0 (
echo cherry-pick 成功！
) else (
echo cherry-pick 失败，请检查冲突或哈希值是否正确。
)
pause