This commit is contained in:
LI0502-WEN 2024-12-03 16:31:26 +08:00
parent 7a732b1ebb
commit 562e577558
84 changed files with 277 additions and 4 deletions

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/BloomFactor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/BreakRGB.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/BreakTexture.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/ColorMap.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Common_VFX.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Decal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Default.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/DeriveHDRfromLDR.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Dissolve02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Dissolve03.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/FX_ParticleColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/FlowMap.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Fresnel.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/FresnelFunction.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_BreakVector3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_CameraOffset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_GlobalColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_RefineColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_Shine.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Mask.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Refraction.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/UVAnimation.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/VertexAnimation.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Materials/MPC_Effect.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/yu/M_Smoke1_Mat_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/yu/M_YU.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/yu/M_YU1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/yu/YUDI.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/yu/YUDI1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/yu/YUDI2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/yu/YUDI3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/yu/YUDI4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/UE5_Third_Course/skill01/TEX/FX_check.uasset (Stored with Git LFS) Normal file

Binary file not shown.

30
提取指定更新.bat Normal file
View 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