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

proto/Gameapi.proto

@@ -372,7 +372,7 @@ message ReqChessEx{
 	int32 OldChessId = 1;
 	int32 NewChessId = 2;
 	int32 CostDia = 3;
-	int32 Type = 4; //1 气泡 2 宝箱解锁 3 快捷购买
+	int32 Type = 4; //1 气泡 2 宝箱解锁 3 快捷购买 4 限时事件气泡
 	map<string, int32> mChessData = 5;
 }
 

tool/cfg/cfg_xlsx.json

@@ -13,7 +13,7 @@
         {
             "in_file": "MergeData.xlsx",
             "out_file": "MergeDataConst.json",
-            "key": "Id",
+            "key": "Key",
             "sheet_name" :"Const",
             "fields" :["Key", "Value"]
         },
@@ -48,7 +48,7 @@
         {
             "in_file": "OrderData.xlsx",
             "out_file": "OrderData.json",
-            "key": "Id",
+            "key": "EnergyMul",
             "sheet_name" :"Order",
             "fields" :["EnergyMul", "LvMin"]
         },
@@ -106,12 +106,12 @@
             "out_file": "Item.json",
             "key": "Id",
             "sheet_name" :"Item",
-            "fields" :["Id", "IType", "Effect"]
+            "fields" :["Id", "IType", "Effect","Name"]
         },
         {
             "in_file": "Card.xlsx",
             "out_file": "CardConst.json",
-            "key": "key",
+            "key": "Key",
             "sheet_name" :"CardConst",
             "fields" :["Key", "Value"]
         },
@@ -153,7 +153,7 @@
         {
             "in_file": "DailyTask.xlsx",
             "out_file": "DailyTask.json",
-            "key": "Key",
+            "key": "Id",
             "sheet_name" :"DailyTask",
             "fields" :["Task", "Lv"]
         },

tool/cfg/tool_cfg_json.py

@@ -35,7 +35,7 @@ for file_cfg in file_list:
     indexed_data = {}
     for row in rows:
         row_dict = {fieldnames[i]: row[i] for i in range(len(fieldnames))}
-        index = row_dict.pop(fieldnames[0])  # 获取第一列的值作为索引并移除第一列
+        index = row_dict.pop(file_cfg["key"])  # 获取第一列的值作为索引并移除第一列
         
         # 仅保留需要的字段
         row_dict = {field: row_dict[field] for field in file_cfg['fields'] if field in row_dict}