diff --git a/config/Charge.xlsx b/config/Charge.xlsx index ff5a2418..e49a7c1c 100644 Binary files a/config/Charge.xlsx and b/config/Charge.xlsx differ diff --git a/config/Collect.xlsx b/config/Collect.xlsx index a7b9021f..65463b06 100644 Binary files a/config/Collect.xlsx and b/config/Collect.xlsx differ diff --git a/config/OrderData.xlsx b/config/OrderData.xlsx index 0d43046a..4efcc70b 100644 Binary files a/config/OrderData.xlsx and b/config/OrderData.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 38dbcc66..383794e8 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -1731,6 +1731,7 @@ message ResCharge{ int32 SpecialChargeWeek = 11; // 距离现在多少周 float TodayCharge = 12; // 今日充值金额 float MonthCharge = 13; // 本月充值金额 + int64 AdEndTime = 14; // 广告礼包结束时间 } message WishList { diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index e474583d..28af4408 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -444,6 +444,13 @@ "sheet_name" :"PetCoin", "fields" :["ChargeId", "Items", "Grade"] }, + { + "in_file": "Charge.xlsx", + "out_file": "ChargeAD.json", + "key": "Id", + "sheet_name" :"AD", + "fields" :["ChargeId", "Items", "PetWork"] + }, { "in_file": "Endless.xlsx", "out_file": "Endless.json",