diff --git a/config/MergeData.xlsx b/config/MergeData.xlsx index 54427600..16d72049 100644 Binary files a/config/MergeData.xlsx and b/config/MergeData.xlsx differ diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index 28af4408..d2a22d57 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -8,7 +8,7 @@ "out_file": "MergeData.json", "key": "Id", "sheet_name" :"MergeData", - "fields" :["Id", "Icon", "Lv", "MaxLv", "MergeId", "SellType", "SellNum", "SellDiamond", "CoolTime", "Star", "Type", "Emit_Product", "Product_Type", "Color", "Emit_ID", "PType", "Emit_Min_Lv", "Title", "Dynamic", "Emit_Type", "Emit_List"] + "fields" :["Id", "Icon", "Lv", "MaxLv", "MergeId", "SellType", "SellNum", "SellDiamond", "CoolTime", "Star", "Type", "Emit_Product", "Product_Type", "Color", "Emit_ID", "PType", "Emit_Min_Lv", "Title", "Dynamic","Dynamic1","Dynamic2","Dynamic3", "Emit_Type", "Emit_List"] }, { "in_file": "MergeData.xlsx",