Merge branch 'main' into sdk

2026-03-19 19:15:18 +08:00 · 2026-03-19 19:15:18 +08:00 · 34c8d23532
commit 34c8d23532
parent d8eaf3f5f7 c4334882ff
7 changed files with 1 additions and 1 deletions
--- a/config/AllLanguage.xlsx
+++ b/config/AllLanguage.xlsx
--- a/config/DecorateCost.xlsx
+++ b/config/DecorateCost.xlsx
--- a/config/DialogueData.xlsx
+++ b/config/DialogueData.xlsx
--- a/config/Pet.xlsx
+++ b/config/Pet.xlsx
--- a/config/Playroom.xlsx
+++ b/config/Playroom.xlsx
--- a/config/SevenLoginCfg.xlsx
+++ b/config/SevenLoginCfg.xlsx
--- a/tool/cfg/cfg_xlsx.json
+++ b/tool/cfg/cfg_xlsx.json
@ -262,7 +262,7 @@
            "out_file": "SevenLoginJackpot.json",
            "key": "Id",
            "sheet_name" :"Jackpot",
-            "fields" :["Energy", "Item", "Month", "Type"]
+            "fields" :["Energy", "Item", "Month", "Type", "Level"]
        },
        {
            "in_file": "SevenLoginCfg.xlsx",