Compare commits
6 Commits
3cf897f283
...
f455a921ce
Author | SHA1 | Date | |
---|---|---|---|
f455a921ce | |||
![]() |
65054a12fa | ||
e5f939049b | |||
![]() |
0458ba1fb4 | ||
bdc36eb6e3 | |||
![]() |
8020fa0c51 |
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakRGB_Sole.uasset
(Stored with Git LFS)
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakRGB_Sole.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTexture_Sole.uasset
(Stored with Git LFS)
Normal file
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTexture_Sole.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Default_Sole.uasset
(Stored with Git LFS)
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Default_Sole.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_DeriveHDRfromLDR.uasset
(Stored with Git LFS)
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_DeriveHDRfromLDR.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Dissolve_Sole.uasset
(Stored with Git LFS)
Normal file
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Dissolve_Sole.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Fresnel.uasset
(Stored with Git LFS)
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Fresnel.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FresnelFunction.uasset
(Stored with Git LFS)
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FresnelFunction.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Mask_Sole.uasset
(Stored with Git LFS)
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Mask_Sole.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Refine.uasset
(Stored with Git LFS)
BIN
Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Refine.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/MSPresets/M_MS_Character_Material/Functions/MF_FX.uasset
(Stored with Git LFS)
BIN
Content/CommonLiberal/CommonMaterialLiberal/MSPresets/M_MS_Character_Material/Functions/MF_FX.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/CommonLiberal/CommonMaterialLiberal/MSPresets/M_MS_Character_Material/M_FX_Character.uasset
(Stored with Git LFS)
BIN
Content/CommonLiberal/CommonMaterialLiberal/MSPresets/M_MS_Character_Material/M_FX_Character.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/Level/Level_Base.umap
(Stored with Git LFS)
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/Level/Level_Base.umap
(Stored with Git LFS)
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/Material/1/MI_Body1.uasset
(Stored with Git LFS)
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/Material/1/MI_Body1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/Material/1/MI_Body2.uasset
(Stored with Git LFS)
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/Material/1/MI_Body2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/1/zhahuan3.uasset
(Stored with Git LFS)
Normal file
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/1/zhahuan3.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/1/zhahuan3_Anim.uasset
(Stored with Git LFS)
Normal file
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/1/zhahuan3_Anim.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/1/zhahuan3_PhysicsAsset.uasset
(Stored with Git LFS)
Normal file
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/1/zhahuan3_PhysicsAsset.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/2/zhahuan4.uasset
(Stored with Git LFS)
Normal file
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/2/zhahuan4.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/2/zhahuan4_Anim.uasset
(Stored with Git LFS)
Normal file
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/2/zhahuan4_Anim.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/2/zhahuan4_PhysicsAsset.uasset
(Stored with Git LFS)
Normal file
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/rw/2/zhahuan4_PhysicsAsset.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/seq/NewLevelSequence.uasset
(Stored with Git LFS)
BIN
Content/PrivateCommonLiberal/C_001/HCJ/zhaohuan/seq/NewLevelSequence.uasset
(Stored with Git LFS)
Binary file not shown.
30
提取指定更新.bat
Normal file
30
提取指定更新.bat
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
@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
|
Loading…
Reference in New Issue
Block a user