Merge branch 'main' of gitea.bywaystudios.com:wuminzhe/docs

proto/Gameapi.proto

@@ -336,11 +336,11 @@ message ResPlayerBaseInfo{
 	int32 guild = 10;
 	int32 pack_unlock_count = 11;
 	int32 last_play_time = 12;
-	int32 EnergyBuyCount = 13;
+	int64 ban = 13;
 	string user_name = 14;
 	int32 login_time = 15;
 	int32 logout_time = 16;
-	int32 todayolinetime = 17;
+	int32 node = 17;
 	int32 rolecreatetime = 18;
 	int32 EmitOrderCnt = 19;
 	int32 NoAd = 20;

tool/cfg/cfg_xlsx.json

@@ -147,7 +147,7 @@
             "out_file": "CardDetail.json",
             "key": "Id",
             "sheet_name" :"CardDetail",
-            "fields" :["Id", "PictureAlbum", "Star", "IsGold","Round", "ItemId"]
+            "fields" :["Id", "PictureAlbum", "Star", "IsGold","Round", "ItemId", "Icon", "Name"]
         },
         {
             "in_file": "Card.xlsx",
@@ -161,7 +161,7 @@
             "out_file": "CardCollect.json",
             "key": "Id",
             "sheet_name" :"CardCollect",
-            "fields" :["Id", "Color", "Item", "Chess"]
+            "fields" :["Id", "Color", "Item", "Chess", "Name", "Icon"]
         },
         {
             "in_file": "Card.xlsx",
@@ -217,7 +217,7 @@
             "out_file": "Avatar.json",
             "key": "Id",
             "sheet_name" :"Avatar",
-            "fields" :["Init"]
+            "fields" :["Init", "NameKey", "Icon"]
         },
         {
             "in_file": "Emoji.xlsx",
@@ -792,6 +792,13 @@
             "key": "Id",
             "sheet_name" :"Active",
             "fields" :["Active","Items"]
+        },
+        {
+            "in_file": "NetAssetData.xlsx",
+            "out_file": "NetAssetData.json",
+            "key": "LanguageKey",
+            "sheet_name" :"LevelLauncherData",
+            "fields" :["Picture"]
         }
     ]
 }

tool/cfg/tool_cfg_txt.py

@@ -39,6 +39,17 @@ if os.path.isfile(cfg_local_path):
 else:
     cfg = cfg_main
 
+# 尝试读取 files 配置文件（可纳入Git管理）
+cfg_files_path = os.path.join(current_dir, 'tool/cfg/cfg_txt_files.json')
+if os.path.isfile(cfg_files_path):
+    try:
+        with open(cfg_files_path, 'r', encoding='utf-8') as ff:
+            cfg_files = json.load(ff)
+        cfg = deep_merge(cfg, cfg_files)
+        print(f"Loaded files config: {cfg_files_path}")
+    except Exception as e:
+        print(f"加载files配置文件失败: {e}")
+
 def read_table(file_path, sheet_name=None):
     if file_path.lower().endswith('.xlsx'):
         workbook = openpyxl.load_workbook(file_path)