diff --git a/config/Activity.xlsx b/config/Activity.xlsx index d983b146..27c0ed15 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..14a67dea 100644 Binary files a/config/AllLanguage.xlsx and b/config/AllLanguage.xlsx differ diff --git a/config/Collect.xlsx b/config/Collect.xlsx index 486e7253..a13adb6f 100644 Binary files a/config/Collect.xlsx and b/config/Collect.xlsx differ diff --git a/config/Constant.xlsx b/config/Constant.xlsx index cde51366..4911e339 100644 Binary files a/config/Constant.xlsx and b/config/Constant.xlsx differ diff --git a/config/DailyTask.xlsx b/config/DailyTask.xlsx index 1f053eb7..09ed5cba 100644 Binary files a/config/DailyTask.xlsx and b/config/DailyTask.xlsx differ diff --git a/config/DecorateCost.xlsx b/config/DecorateCost.xlsx index 3182ffad..d8bf1832 100644 Binary files a/config/DecorateCost.xlsx and b/config/DecorateCost.xlsx differ diff --git a/config/DialogueData.xlsx b/config/DialogueData.xlsx index fe63cc11..8eb2318c 100644 Binary files a/config/DialogueData.xlsx and b/config/DialogueData.xlsx differ diff --git a/config/FriendTreasure.xlsx b/config/FriendTreasure.xlsx index 16056a74..d0452b2e 100644 Binary files a/config/FriendTreasure.xlsx and b/config/FriendTreasure.xlsx differ diff --git a/config/Invite.xlsx b/config/Invite.xlsx index 336b792f..3f4b83c1 100644 Binary files a/config/Invite.xlsx and b/config/Invite.xlsx differ diff --git a/config/Item.xlsx b/config/Item.xlsx index 6528088d..2fbf1b0d 100644 Binary files a/config/Item.xlsx and b/config/Item.xlsx differ diff --git a/config/Pet.xlsx b/config/Pet.xlsx index 001d069b..982f2878 100644 Binary files a/config/Pet.xlsx and b/config/Pet.xlsx differ diff --git a/config/Playroom.xlsx b/config/Playroom.xlsx index 4aa481cf..8f8b4f22 100644 Binary files a/config/Playroom.xlsx and b/config/Playroom.xlsx differ diff --git a/config/SevenLoginCfg.xlsx b/config/SevenLoginCfg.xlsx index b9893d8c..49d7260d 100644 Binary files a/config/SevenLoginCfg.xlsx and b/config/SevenLoginCfg.xlsx differ diff --git a/config/Shop.xlsx b/config/Shop.xlsx index 8521acfd..21c71072 100644 Binary files a/config/Shop.xlsx and b/config/Shop.xlsx differ diff --git a/config/UIForm.xlsx b/config/UIForm.xlsx index 623d0b14..40397394 100644 Binary files a/config/UIForm.xlsx and b/config/UIForm.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 3a8cf9bf..37511015 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -1311,6 +1311,8 @@ enum ACTIVITY_TYPE { message ResActivity{ repeated ActivityInfo ActiveList = 1; + int64 AddEnd = 2; // 买一赠一礼包倒计时 + bool AddReward = 3; // 买一赠一礼包奖励是否已领取 } message ActivityInfo{ @@ -1333,6 +1335,16 @@ message ResActivityReward{ string Msg = 2; } +// 领取买一赠一奖励 +message ReqAddGiftReward{ + +} + +message ResAddGiftReward{ + RES_CODE Code = 1; + string Msg = 2; +} + // #region 限时事件 // 限时事件 message ReqLimitEvent{} @@ -2902,6 +2914,33 @@ message ResCatnipEmoji{ int32 Id = 4; // 猫草id } +message MiningCfg{ + string Name = 1; + int32 PassNum = 2; + repeated ItemInfo itemCost = 3; + int32 ItemId = 4; + int32 startItemnum = 5; + map Gem = 6; + map Jackpot = 7; + map Pass = 8; +} + +message MinigCfgGem{ + string Area = 1; +} + +message MiningCfgJackpot{ + int32 Prob = 1; + repeated ItemInfo Items = 2; +} + +message MiningCfgPass{ + repeated ItemInfo Items = 1; + string Area = 2; + int32 Gem = 3; + int32 StarReward = 4; +} + // -------------------后台管理------------------- message AdminReq{ @@ -2939,4 +2978,30 @@ message ReqAdminShipping{ string OrderSn = 1; // 订单号 int32 Status = 2; // 1:支付成功 2:支付失败 string ChannelOrderSn = 3; // 渠道订单号 +} + +message ReqActivityCfgReload{ + repeated ActivityCfg List = 1; +} + +message ActivityCfg{ + int32 Id = 1; + int32 Type = 2; + int64 Starttime = 3; + int64 Endtime = 4; + int32 Level = 5; + string Title = 6; + string MailTitle = 7; + string MailContent = 8; + string RewardItem = 9; + string Extra = 10; +} + +message ResActivityCfgReload{ + int32 Code = 1; + string Msg = 2; +} + +service Backend { + rpc ReloadActivity(ReqActivityCfgReload) returns (ResActivityCfgReload); } \ No newline at end of file diff --git a/tool/cfg/cfg_txt.json b/tool/cfg/cfg_txt.json index 37a4d78b..0c23e8a3 100644 --- a/tool/cfg/cfg_txt.json +++ b/tool/cfg/cfg_txt.json @@ -224,6 +224,16 @@ "int", "int" ] + }, + { + "in_file": "Collect.xlsx", + "out_file": "CollectionsUnlockLineData.txt", + "sheet_name": "CollectionsUnlockLine", + "coloum_type": [ + "int", + "int", + "int" + ] }, { "in_file": "ComboGift.xlsx", @@ -1157,6 +1167,16 @@ "string" ] }, + { + "in_file": "Constant.xlsx", + "out_file": "ConstantInt.txt", + "sheet_name": "ConstantInt", + "coloum_type": [ + "int", + "string", + "int" + ] + }, { "in_file": "Guide.xlsx", "out_file": "GuideReward.txt", @@ -1234,6 +1254,16 @@ "int", "int" ] + }, + { + "in_file": "Invite.xlsx", + "out_file": "FriendInviteRewardData.txt", + "sheet_name": "Reward", + "coloum_type": [ + "int", + "int", + "string" + ] } ] } \ No newline at end of file diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index 04084ca3..74d352da 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", @@ -248,21 +255,21 @@ "out_file": "SevenLogin.json", "key": "Id", "sheet_name" :"SevenLogin", - "fields" :["Diamond", "RewardNum"] + "fields" :["Energy", "RewardNum"] }, { "in_file": "SevenLoginCfg.xlsx", "out_file": "SevenLoginJackpot.json", "key": "Id", "sheet_name" :"Jackpot", - "fields" :["Diamond", "Item", "Month", "Type"] + "fields" :["Energy", "Item", "Month", "Type", "Level"] }, { "in_file": "SevenLoginCfg.xlsx", "out_file": "SevenLoginMonth.json", "key": "Id", "sheet_name" :"Month", - "fields" :["Active", "Diamond", "RewardNum", "Month"] + "fields" :["Active", "Energy", "RewardNum", "Month"] }, { "in_file": "Base.xlsx",