diff --git a/config/Endless.xlsx b/config/Endless.xlsx index fdbd66f4..f4538179 100644 Binary files a/config/Endless.xlsx and b/config/Endless.xlsx differ diff --git a/config/IndoorProgress.xlsx b/config/IndoorProgress.xlsx index 30be8aa5..cc0bfaf1 100644 Binary files a/config/IndoorProgress.xlsx and b/config/IndoorProgress.xlsx differ diff --git a/config/Item.xlsx b/config/Item.xlsx index ba004cf8..ab1aa69f 100644 Binary files a/config/Item.xlsx and b/config/Item.xlsx differ diff --git a/config/Mail.xlsx b/config/Mail.xlsx index b1eb38a5..476430b9 100644 Binary files a/config/Mail.xlsx and b/config/Mail.xlsx differ diff --git a/config/MergeData.xlsx b/config/MergeData.xlsx index 714e588d..d516e9a9 100644 Binary files a/config/MergeData.xlsx and b/config/MergeData.xlsx differ diff --git a/config/OrderData.xlsx b/config/OrderData.xlsx index 6c8ae8d6..b974e5ff 100644 Binary files a/config/OrderData.xlsx and b/config/OrderData.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index dbd02599..8ae7ebda 100644 --- 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; // 宠物宝藏帮助 } diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index fe2645a1..56769c99 100644 --- 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",