diff --git a/config/Activity.xlsx b/config/Activity.xlsx index 57cde9d2..89e002cf 100644 Binary files a/config/Activity.xlsx and b/config/Activity.xlsx differ diff --git a/config/AllLanguage.xlsx b/config/AllLanguage.xlsx index 7b3c49b0..8d59f1fc 100644 Binary files a/config/AllLanguage.xlsx and b/config/AllLanguage.xlsx differ diff --git a/config/Champship.xlsx b/config/Champship.xlsx index 18efabb5..9175b8dc 100644 Binary files a/config/Champship.xlsx and b/config/Champship.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 67939412..915204b8 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -2065,6 +2065,8 @@ message ResChampship{ int32 Rank = 5; int32 RankReward = 6; int32 Status = 7; + int32 TodayActivityId = 8;//今日生效的活动类型 + int32 YesterdayActivityId = 9;//昨日生效的活动类型 } message ReqChampshipReward{} diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index c97addf0..86e65a18 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -276,7 +276,7 @@ "out_file": "Activity.json", "key": "Id", "sheet_name" :"Activity", - "fields" :["Type", "AType", "StartTime", "EndTime", "Name", "Title", "Mail_Title","Mail_Content", "Reward"] + "fields" :["Type", "AType", "StartTime", "EndTime", "Name", "Title", "Mail_Title","Mail_Content", "Reward", "Level"] }, { "in_file": "Activity.xlsx", @@ -474,6 +474,13 @@ "sheet_name" :"Jackpot", "fields" :["ItemId", "Type", "Energy","Lv"] }, + { + "in_file": "Champship.xlsx", + "out_file": "ChampshipConst.json", + "key": "Key", + "sheet_name" :"Const", + "fields" :["Value"] + }, { "in_file": "Champship.xlsx", "out_file": "ChampshipScore.json", @@ -486,14 +493,14 @@ "out_file": "ChampshipJackpot.json", "key": "Id", "sheet_name" :"Jackpot", - "fields" :["Total", "Score", "Items"] + "fields" :["Total", "Score", "Items", "RewardGroupType"] }, { "in_file": "Champship.xlsx", "out_file": "ChampshipRank.json", "key": "Id", "sheet_name" :"Rank", - "fields" :["Min", "Max", "Items"] + "fields" :["Min", "Max", "Items", "RewardGroupType"] }, { "in_file": "Champship.xlsx",