1

demo_game.sh

@@ -184,7 +184,7 @@ check_install_docker() {
 
 }
 
-# 更新分支函数
+# 更新分支函数（带更新前恢复）
 update_branch() {
 	local repo_url=$1
 	local branch=$2
@@ -193,7 +193,15 @@ update_branch() {
 	echo "Updating branch '$branch' in '$target_dir'..."
 	cd "$target_dir" || return 1
 
+	# 切换到目标分支
 	git checkout "$branch" >/dev/null 2>&1
+
+	# 更新前恢复到干净状态
+	echo "🔄 Resetting local changes on '$branch'..."
+	git reset --hard HEAD >/dev/null 2>&1
+	git clean -fd >/dev/null 2>&1
+
+	# 获取远程最新提交
 	git fetch origin "$branch"
 
 	local_commit=$(git rev-parse "$branch")
@@ -268,11 +276,11 @@ fetch_git_web() {
 	MAX_RETRY=3 # 最大重试次数
 
 	BRANCHES=(
+		"main-admin"
 		"agent-admin"
 		"bank-client"
 		"bank-server"
 		"down"
-		"main-admin"
 		"mobile"
 		"webgame"
 	)