From 0eb440a97db567a14412891895864c3e2b0d09ab Mon Sep 17 00:00:00 2001
From: "PC-202302260912\\Administrator" <1769111741@qq.com>
Date: Wed, 2 Aug 2023 16:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.sh        | 18 +++++++++++++++---
 update_game.sh |  2 --
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/main.sh b/main.sh
index a22e0e9..715be4a 100644
--- a/main.sh
+++ b/main.sh
@@ -184,10 +184,22 @@ game_update_option() {
     echo -e "${yellow}$action_desc${NC}"
     echo "=============================="
 
-    show_file project
-    read -rp "请输入项目地址: " project
+    # 项目属性
+    if [ $action = "update" ] || [ $action = "hotfix" ]; then
+        show_file project
+        read -rp "${yellow}请输入项目地址: ${NC}" project
+        if [ -z "$project" ]; then
+            echo -e "${red}项目地址不能为空，请重新输入${NC}"
+            return
+        fi
+    fi
+    # 包属性
     show_file package
-    read -rp "请输入包名（不需要带文件后缀）: " package
+    read -rp "${yellow}请输入包名（不需要带文件后缀）: ${NC}" package
+    if [ -z "$package" ]; then
+        echo -e "${red}包名不能为空，请重新输入${NC}"
+        return
+    fi
 
     echo -e "开始执行操作 项目：$project, 包名：$package"
     if [ "$send_to" = "txt" ]; then
diff --git a/update_game.sh b/update_game.sh
index 1d03a2f..16607ef 100644
--- a/update_game.sh
+++ b/update_game.sh
@@ -66,8 +66,6 @@ cd ${BASE_DIR}/fighting || exit
 svn up
 
 cd ${BASE_DIR}/data_excel || exit
-#echo "当前分支是: `git branch`"
-#git pull
 svn up
 cd  ${BASE_DIR}/execl_to_txt || exit
 java -Dfile.encoding=UTF-8 -Djava.ext.dirs=./lib ExcelUtils