From bcd23a28a0a1e64e38d840affefb5d9c5203d403 Mon Sep 17 00:00:00 2001
From: Foldcc_b1 <lhyuau@qq.com>
Date: Thu, 13 Mar 2025 18:13:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Upm.bat=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BC=BA=E5=88=B6=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E3=80=81=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=92=8C=E5=88=86=E5=BC=80=E6=8E=A8=E9=80=81tag=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E7=A1=AE=E4=BF=9D=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=AD=E7=9A=84=E7=A8=B3=E5=AE=9A=E6=80=A7?=
 =?UTF-8?q?=E5=92=8C=E5=8F=AF=E9=9D=A0=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Update Upm.bat | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/Update Upm.bat b/Update Upm.bat
index 8117725..2f6c0c8 100644
--- a/Update Upm.bat	
+++ b/Update Upm.bat	
@@ -31,33 +31,63 @@ set /p Flg=确认提交的版本号%version%，是否开始提交(y/n) --------
 IF "%Flg%" equ "y" (
 	echo 开始提交，请勿关闭该窗口！
 	
+	:: Force switch to master first
+	git checkout -f master
+	
 	:: Delete local upm branch if exists
 	git branch -D upm 2>nul
 	
 	:: Create new upm branch from current Assets folder
 	git subtree split --prefix=Assets --branch upm
+	if %errorlevel% neq 0 (
+		echo 错误：创建upm分支失败！
+		goto :END
+	)
 	
 	:: Force update local upm branch with remote changes
 	git fetch origin upm
-	git checkout upm
+	git checkout -f upm
 	git reset --hard origin/upm
 	
 	:: Create new subtree split
-	git checkout master
+	git checkout -f master
 	git subtree split --prefix=Assets --branch upm-temp
 	
 	:: Apply new changes and force push
-	git checkout upm
+	git checkout -f upm
 	git merge upm-temp --allow-unrelated-histories -X theirs
 	git branch -D upm-temp
 	
-	:: Create and push tag
+	:: Create and push tag with explicit steps
+	echo 创建并推送tag %version%...
+	git tag -d %version% 2>nul
 	git tag %version% upm
-	git push -f origin upm --tags
+	if %errorlevel% neq 0 (
+		echo 错误：创建tag失败！
+		git checkout -f master
+		goto :END
+	)
 	
-	:: Return to original branch
-	git checkout master
-	GOTO :END
+	:: Push changes and tags separately
+	echo 推送upm分支...
+	git push -f origin upm
+	if %errorlevel% neq 0 (
+		echo 错误：推送upm分支失败！
+		git checkout -f master
+		goto :END
+	)
+	
+	echo 推送tag...
+	git push origin %version%
+	if %errorlevel% neq 0 (
+		echo 错误：推送tag失败！
+		git tag -d %version%
+		git checkout -f master
+		goto :END
+	)
+	
+	:: Return to master branch
+	git checkout -f master
 )
 
 :END