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/DecorateCost.xlsx b/config/DecorateCost.xlsx index 819431b8..dcd896e4 100644 Binary files a/config/DecorateCost.xlsx and b/config/DecorateCost.xlsx differ diff --git a/config/Face.xlsx b/config/Face.xlsx index dab88a5a..49a549ff 100644 Binary files a/config/Face.xlsx and b/config/Face.xlsx differ diff --git a/config/IndoorProgress.xlsx b/config/IndoorProgress.xlsx index 95b6705c..f24d9f80 100644 Binary files a/config/IndoorProgress.xlsx and b/config/IndoorProgress.xlsx differ diff --git a/config/Item.xlsx b/config/Item.xlsx index 6f0fa7a0..0480e3d5 100644 Binary files a/config/Item.xlsx and b/config/Item.xlsx differ diff --git a/config/MergeData.xlsx b/config/MergeData.xlsx index 45cae32b..e0f0f430 100644 Binary files a/config/MergeData.xlsx and b/config/MergeData.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/config/Playroom.xlsx b/config/Playroom.xlsx index 24677b31..eca29b5e 100644 Binary files a/config/Playroom.xlsx and b/config/Playroom.xlsx differ diff --git a/config/UserData.xlsx b/config/UserData.xlsx index 47e513cc..511506ae 100644 Binary files a/config/UserData.xlsx and b/config/UserData.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..30956a42 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -8,7 +8,7 @@ "out_file": "MergeData.json", "key": "Id", "sheet_name" :"MergeData", - "fields" :["Id", "Icon", "Lv", "MaxLv", "MergeId", "SellType", "SellNum", "SellDiamond", "CoolTime", "Star", "Type", "Emit_Product", "Product_Type", "Color", "Emit_ID", "PType", "Emit_Min_Lv", "Title", "Dynamic", "Emit_Type", "Emit_List"] + "fields" :["Id", "Icon", "Lv", "MaxLv", "MergeId", "SellType", "SellNum", "SellDiamond", "CoolTime", "Star", "Type", "Emit_Product", "Product_Type", "Color", "Emit_ID", "PType", "Emit_Min_Lv", "Title", "Dynamic","Dynamic1","Dynamic2","Dynamic3", "Emit_Type", "Emit_List"] }, { "in_file": "MergeData.xlsx", @@ -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", @@ -603,7 +610,7 @@ "out_file": "PlayroomOrderItem.json", "key": "ItemId", "sheet_name" :"OrderItem", - "fields" :["Type", "Star"] + "fields" :["Type", "Star", "Grade"] }, { "in_file": "Playroom.xlsx",