diff --git a/config/Activity.xlsx b/config/Activity.xlsx index e172bddd..eb04b287 100644 Binary files a/config/Activity.xlsx and b/config/Activity.xlsx differ diff --git a/config/AllLanguage.xlsx b/config/AllLanguage.xlsx index 784e81a6..a6001197 100644 Binary files a/config/AllLanguage.xlsx and b/config/AllLanguage.xlsx differ diff --git a/config/ComboGift.xlsx b/config/ComboGift.xlsx index 337508e9..da1756ce 100644 Binary files a/config/ComboGift.xlsx and b/config/ComboGift.xlsx differ diff --git a/config/DailyTask.xlsx b/config/DailyTask.xlsx index 1f053eb7..3f29e870 100644 Binary files a/config/DailyTask.xlsx and b/config/DailyTask.xlsx differ diff --git a/config/Item.xlsx b/config/Item.xlsx index d4bce206..dff17961 100644 Binary files a/config/Item.xlsx and b/config/Item.xlsx differ diff --git a/config/SevenLoginCfg.xlsx b/config/SevenLoginCfg.xlsx index b9893d8c..d7578d5e 100644 Binary files a/config/SevenLoginCfg.xlsx and b/config/SevenLoginCfg.xlsx differ diff --git a/config/UIForm.xlsx b/config/UIForm.xlsx index 623d0b14..84ab7179 100644 Binary files a/config/UIForm.xlsx and b/config/UIForm.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 8ee005f7..3a8cf9bf 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -85,6 +85,7 @@ enum ITEM_POP_LABEL { // item弹窗标签 GetChessRetireReward = 77; // 退役奖励 ApplyFriendSponsor = 78; // 申请好友赞助 PetFurShop = 79; //宠物毛皮商店购买 + ActTypeAddGift = 80; // 加送礼包 } enum HANDLE_TYPE { ADD = 0; @@ -2079,7 +2080,7 @@ message ResChampship{ int32 EndTime = 3; int32 Period = 4; int32 Rank = 5; - int32 RankReward = 6; + int32 RankReward = 6; // 1可领取 2已领取 int32 Status = 7; int32 TodayActivityId = 8;//今日生效的活动类型 int32 YesterdayActivityId = 9;//昨日生效的活动类型 diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index 04084ca3..e2b764fe 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -4,6 +4,13 @@ "file_list": [ { "in_file":"AllLanguage.xlsx", + "out_file":"AllLanguageClient.json", + "key": "key", + "sheet_name" :"client", + "fields" :["en_US","zh_CN","pt_BR","es_LATAM"] + }, + { + "in_file":"AllLanguage.xlsx", "out_file":"AllLanguage.json", "key": "key", "sheet_name" :"backend",