Compare commits

..

6 Commits

Author SHA1 Message Date
f455a921ce 角色自发光 2024-12-02 17:56:04 +08:00
YinHaoovo
65054a12fa M_FX_Character 增量修正更新
M_FX_Character
M&A 修正格式,增加半透明溶解
修正了未分类的参数
2024:12:2
2024-12-02 14:30:45 +08:00
e5f939049b Create 提取指定更新.bat 2024-12-02 14:28:36 +08:00
YinHaoovo
0458ba1fb4 M_FX_Character
M 修正格式
修正了未分类的参数
2024:12:2
2024-12-02 11:33:23 +08:00
bdc36eb6e3 hcj 2024-12-02 11:30:50 +08:00
YinHaoovo
8020fa0c51 c 2024-11-29 18:32:26 +08:00
25 changed files with 79 additions and 25 deletions

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.

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