From e4cdc450eac2becaadd091a6e7e386c0754ca572 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 27 Mar 2025 10:44:42 +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 --- config/DailyTask.xlsx | Bin 12268 -> 12250 bytes proto/Gameapi.proto | 2 +- tool/cfg/cfg_xlsx.json | 10 +++++----- tool/cfg/tool_cfg_json.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/DailyTask.xlsx b/config/DailyTask.xlsx index 072138d1e569a46ec0207ccb456819b0487bfb0a..6c0da7105d4ddf24668c71386a1191fca148bd05 100644 GIT binary patch delta 3267 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 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}