diff --git a/config/DailyTask.xlsx b/config/DailyTask.xlsx index 072138d1..6c0da710 100644 Binary files a/config/DailyTask.xlsx and b/config/DailyTask.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 7350e0cc..e9520ddd 100644 --- a/proto/Gameapi.proto +++ b/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 mChessData = 5; } diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index 967db6c0..0913abc5 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/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"] }, diff --git a/tool/cfg/tool_cfg_json.py b/tool/cfg/tool_cfg_json.py index ca785fd0..528b4a7f 100644 --- a/tool/cfg/tool_cfg_json.py +++ b/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}