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

# Conflicts: # config/Item.xlsx
2025-09-16 14:53:23 +08:00 · 2025-09-16 14:53:23 +08:00 · 2e54f40610
commit 2e54f40610
parent af17bc6e35 d4d226d68f
8 changed files with 2 additions and 1 deletions
--- a/config/Endless.xlsx
+++ b/config/Endless.xlsx
--- a/config/IndoorProgress.xlsx
+++ b/config/IndoorProgress.xlsx
--- a/config/Item.xlsx
+++ b/config/Item.xlsx
--- a/config/Mail.xlsx
+++ b/config/Mail.xlsx
--- a/config/MergeData.xlsx
+++ b/config/MergeData.xlsx
--- a/config/OrderData.xlsx
+++ b/config/OrderData.xlsx
--- a/proto/Gameapi.proto
+++ b/proto/Gameapi.proto
@ -172,6 +172,7 @@ enum TIME_LINE_TYPE {
 	LOG_TYPE_PLAYROOM_CAT_LOSE  = 27; // 小猫游戏，装箱小猫未成功
 	LOG_TYPE_CARD_GIVE_ACCEPT   = 28; // 接受卡牌请求
 	LOG_TYPE_FRIEND_INVITE      = 29; // 邀请注册
+	LOG_TYPE_TREASURE_HELP = 30; // 宠物宝藏帮助
 }


--- a/tool/cfg/cfg_xlsx.json
+++ b/tool/cfg/cfg_xlsx.json
@ -449,7 +449,7 @@
            "out_file": "EndlessJackpot.json",
            "key": "Id",
            "sheet_name" :"Jackpot",
-            "fields" :["ItemId", "Type", "Diamond"]
+            "fields" :["ItemId", "Type", "Diamond","Lv"]
        },
        {
            "in_file": "Champship.xlsx",