From ce72ae32bb595321535c2ddb86589c4d8135eae8 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 19 Jul 2023 14:28:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=A3=E6=A1=83=E6=A0=91=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=20=E9=85=8D=E7=BD=AE=E6=97=B6=E9=97=B4=E4=B8=BA?= =?UTF-8?q?=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_peachreward.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hero/api_peachreward.go b/modules/hero/api_peachreward.go index c11169487..166f3d10e 100644 --- a/modules/hero/api_peachreward.go +++ b/modules/hero/api_peachreward.go @@ -36,7 +36,7 @@ func (this *apiComp) PeachReward(session comm.IUserSession, req *pb.HeroPeachRew } if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { if drawConf.Etime != -1 { - if user.Ctime+int64(drawConf.Etime) < configure.Now().Unix() { + if user.Ctime+int64(drawConf.Etime*3600*24) < configure.Now().Unix() { errdata = &pb.ErrorData{ Code: pb.ErrorCode_HeroDrawOutTime, Message: pb.ErrorCode_HeroDrawOutTime.ToString(), From b02ea8c70373ae47565d648886ff002e136bdcfe Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 19 Jul 2023 14:32:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 4 +- bin/json/game_cardpool.json | 516 +++++++++++++++++++++++++++++++++ bin/json/game_global.json | 2 +- bin/json/game_rdtasknpc.json | 90 ++++-- bin/json/game_skillbuff.json | 4 +- 5 files changed, 581 insertions(+), 35 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index fd947a339..6a741fc73 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -339,7 +339,7 @@ "LockSlots": [], "AssistTeam": 0, "CanFriendHelp": 0, - "Numrounds": 0 + "Numrounds": 100 }, { "id": 118, @@ -480,7 +480,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_chef_02" + "bossfight_translate_01" ], "disableAiCamera": 1, "ChoseCamp": [], diff --git a/bin/json/game_cardpool.json b/bin/json/game_cardpool.json index 5f0e5cab6..62b3a81fb 100644 --- a/bin/json/game_cardpool.json +++ b/bin/json/game_cardpool.json @@ -1648,5 +1648,521 @@ "card_pool_type": "camp4_pool", "id": "45004", "weight": 1000 + }, + { + "key": 277, + "card_pool_type": "pro_pool70003", + "id": "24002", + "weight": 36 + }, + { + "key": 278, + "card_pool_type": "pro_pool70003", + "id": "13003", + "weight": 36 + }, + { + "key": 279, + "card_pool_type": "pro_pool70003", + "id": "43006", + "weight": 9 + }, + { + "key": 280, + "card_pool_type": "pro_pool70003", + "id": "43001", + "weight": 9 + }, + { + "key": 281, + "card_pool_type": "pro_pool70003", + "id": "13001", + "weight": 36 + }, + { + "key": 282, + "card_pool_type": "pro_pool70003", + "id": "33002", + "weight": 36 + }, + { + "key": 283, + "card_pool_type": "pro_pool70003", + "id": "13005", + "weight": 36 + }, + { + "key": 284, + "card_pool_type": "pro_pool70003", + "id": "23004", + "weight": 36 + }, + { + "key": 285, + "card_pool_type": "pro_pool70003", + "id": "13004", + "weight": 36 + }, + { + "key": 286, + "card_pool_type": "pro_pool70003", + "id": "43003", + "weight": 9 + }, + { + "key": 287, + "card_pool_type": "pro_pool70003", + "id": "13002", + "weight": 36 + }, + { + "key": 288, + "card_pool_type": "pro_pool70003", + "id": "33003", + "weight": 36 + }, + { + "key": 289, + "card_pool_type": "pro_pool70003", + "id": "43002", + "weight": 9 + }, + { + "key": 290, + "card_pool_type": "pro_pool70004", + "id": "24004", + "weight": 27 + }, + { + "key": 291, + "card_pool_type": "pro_pool70004", + "id": "24008", + "weight": 27 + }, + { + "key": 292, + "card_pool_type": "pro_pool70004", + "id": "24003", + "weight": 27 + }, + { + "key": 293, + "card_pool_type": "pro_pool70004", + "id": "24005", + "weight": 27 + }, + { + "key": 294, + "card_pool_type": "pro_pool70004", + "id": "14001", + "weight": 27 + }, + { + "key": 295, + "card_pool_type": "pro_pool70004", + "id": "34007", + "weight": 27 + }, + { + "key": 296, + "card_pool_type": "pro_pool70004", + "id": "14003", + "weight": 27 + }, + { + "key": 297, + "card_pool_type": "pro_pool70004", + "id": "14007", + "weight": 27 + }, + { + "key": 298, + "card_pool_type": "pro_pool70004", + "id": "34006", + "weight": 27 + }, + { + "key": 299, + "card_pool_type": "pro_pool70004", + "id": "34002", + "weight": 27 + }, + { + "key": 300, + "card_pool_type": "pro_pool70004", + "id": "44005", + "weight": 16 + }, + { + "key": 301, + "card_pool_type": "pro_pool70004", + "id": "44006", + "weight": 16 + }, + { + "key": 302, + "card_pool_type": "pro_pool70004", + "id": "14005", + "weight": 27 + }, + { + "key": 303, + "card_pool_type": "pro_pool70004", + "id": "24001", + "weight": 27 + }, + { + "key": 304, + "card_pool_type": "pro_pool70004", + "id": "34008", + "weight": 27 + }, + { + "key": 305, + "card_pool_type": "pro_pool70004", + "id": "34003", + "weight": 27 + }, + { + "key": 306, + "card_pool_type": "pro_pool70004", + "id": "24009", + "weight": 27 + }, + { + "key": 307, + "card_pool_type": "pro_pool70004", + "id": "34005", + "weight": 27 + }, + { + "key": 308, + "card_pool_type": "pro_pool70004", + "id": "44004", + "weight": 16 + }, + { + "key": 309, + "card_pool_type": "pro_pool70005", + "id": "25001", + "weight": 100 + }, + { + "key": 310, + "card_pool_type": "pro_pool70005", + "id": "25004", + "weight": 100 + }, + { + "key": 311, + "card_pool_type": "pro_pool70005", + "id": "15005", + "weight": 100 + }, + { + "key": 312, + "card_pool_type": "pro_pool70005", + "id": "35006", + "weight": 100 + }, + { + "key": 313, + "card_pool_type": "pro_pool70005", + "id": "45003", + "weight": 0 + }, + { + "key": 314, + "card_pool_type": "pro_pool70005", + "id": "35001", + "weight": 100 + }, + { + "key": 315, + "card_pool_type": "pro_pool70005", + "id": "15004", + "weight": 100 + }, + { + "key": 316, + "card_pool_type": "pro_pool70005", + "id": "45001", + "weight": 0 + }, + { + "key": 317, + "card_pool_type": "pro_pool70005", + "id": "35005", + "weight": 100 + }, + { + "key": 318, + "card_pool_type": "pro_pool70005", + "id": "15002", + "weight": 100 + }, + { + "key": 319, + "card_pool_type": "pro_pool70005", + "id": "15003", + "weight": 100 + }, + { + "key": 320, + "card_pool_type": "base_pool70003", + "id": "24002", + "weight": 36 + }, + { + "key": 321, + "card_pool_type": "base_pool70003", + "id": "13003", + "weight": 36 + }, + { + "key": 322, + "card_pool_type": "base_pool70003", + "id": "43006", + "weight": 9 + }, + { + "key": 323, + "card_pool_type": "base_pool70003", + "id": "43001", + "weight": 9 + }, + { + "key": 324, + "card_pool_type": "base_pool70003", + "id": "13001", + "weight": 36 + }, + { + "key": 325, + "card_pool_type": "base_pool70003", + "id": "33002", + "weight": 36 + }, + { + "key": 326, + "card_pool_type": "base_pool70003", + "id": "13005", + "weight": 36 + }, + { + "key": 327, + "card_pool_type": "base_pool70003", + "id": "23004", + "weight": 36 + }, + { + "key": 328, + "card_pool_type": "base_pool70003", + "id": "13004", + "weight": 36 + }, + { + "key": 329, + "card_pool_type": "base_pool70003", + "id": "43003", + "weight": 9 + }, + { + "key": 330, + "card_pool_type": "base_pool70003", + "id": "13002", + "weight": 36 + }, + { + "key": 331, + "card_pool_type": "base_pool70003", + "id": "33003", + "weight": 36 + }, + { + "key": 332, + "card_pool_type": "base_pool70003", + "id": "43002", + "weight": 9 + }, + { + "key": 333, + "card_pool_type": "base_pool70004", + "id": "24004", + "weight": 27 + }, + { + "key": 334, + "card_pool_type": "base_pool70004", + "id": "24008", + "weight": 27 + }, + { + "key": 335, + "card_pool_type": "base_pool70004", + "id": "24003", + "weight": 27 + }, + { + "key": 336, + "card_pool_type": "base_pool70004", + "id": "24005", + "weight": 27 + }, + { + "key": 337, + "card_pool_type": "base_pool70004", + "id": "14001", + "weight": 27 + }, + { + "key": 338, + "card_pool_type": "base_pool70004", + "id": "34007", + "weight": 27 + }, + { + "key": 339, + "card_pool_type": "base_pool70004", + "id": "14003", + "weight": 27 + }, + { + "key": 340, + "card_pool_type": "base_pool70004", + "id": "14007", + "weight": 27 + }, + { + "key": 341, + "card_pool_type": "base_pool70004", + "id": "34006", + "weight": 27 + }, + { + "key": 342, + "card_pool_type": "base_pool70004", + "id": "34002", + "weight": 27 + }, + { + "key": 343, + "card_pool_type": "base_pool70004", + "id": "44005", + "weight": 16 + }, + { + "key": 344, + "card_pool_type": "base_pool70004", + "id": "44006", + "weight": 16 + }, + { + "key": 345, + "card_pool_type": "base_pool70004", + "id": "14005", + "weight": 27 + }, + { + "key": 346, + "card_pool_type": "base_pool70004", + "id": "24001", + "weight": 27 + }, + { + "key": 347, + "card_pool_type": "base_pool70004", + "id": "34008", + "weight": 27 + }, + { + "key": 348, + "card_pool_type": "base_pool70004", + "id": "34003", + "weight": 27 + }, + { + "key": 349, + "card_pool_type": "base_pool70004", + "id": "24009", + "weight": 27 + }, + { + "key": 350, + "card_pool_type": "base_pool70004", + "id": "34005", + "weight": 27 + }, + { + "key": 351, + "card_pool_type": "base_pool70004", + "id": "44004", + "weight": 16 + }, + { + "key": 352, + "card_pool_type": "base_pool70005", + "id": "25001", + "weight": 18 + }, + { + "key": 353, + "card_pool_type": "base_pool70005", + "id": "25004", + "weight": 18 + }, + { + "key": 354, + "card_pool_type": "base_pool70005", + "id": "15005", + "weight": 18 + }, + { + "key": 355, + "card_pool_type": "base_pool70005", + "id": "35006", + "weight": 18 + }, + { + "key": 356, + "card_pool_type": "base_pool70005", + "id": "45003", + "weight": 9 + }, + { + "key": 357, + "card_pool_type": "base_pool70005", + "id": "35001", + "weight": 18 + }, + { + "key": 358, + "card_pool_type": "base_pool70005", + "id": "15004", + "weight": 18 + }, + { + "key": 359, + "card_pool_type": "base_pool70005", + "id": "45001", + "weight": 9 + }, + { + "key": 360, + "card_pool_type": "base_pool70005", + "id": "35005", + "weight": 18 + }, + { + "key": 361, + "card_pool_type": "base_pool70005", + "id": "15002", + "weight": 18 + }, + { + "key": 362, + "card_pool_type": "base_pool70005", + "id": "15003", + "weight": 18 } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 807ed7b7c..b0d432f51 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -43,7 +43,7 @@ "load_chat": 10, "channel_allocation_max": 2000, "channel_switching_max": 3000, - "draw_toplimit": 20, + "draw_toplimit": 9999, "draw10_star4_max": 8, "draw10_star5_max": 2, "draw_floor_star4": 20, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index a260fbfb2..9de568279 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -5251,7 +5251,8 @@ "heroid": 25001, "datas": [ "WuGuanScene", - "武馆的老虎" + "武馆的老虎", + "137" ], "event": [ 2, @@ -5263,7 +5264,8 @@ "id": 300018, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5274,7 +5276,8 @@ "id": 300019, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5286,7 +5289,8 @@ "heroid": 25001, "datas": [ "GameMain", - "烹饪处的阿宝" + "烹饪处的阿宝", + "901" ], "event": [ 2, @@ -5299,7 +5303,8 @@ "heroid": 25001, "datas": [ "WuGuanScene", - "武馆的老虎" + "武馆的老虎", + "137" ], "event": [ 2, @@ -5312,7 +5317,8 @@ "heroid": 25001, "datas": [ "WuGuanScene", - "武馆的老虎" + "武馆的老虎", + "137" ], "event": [ 2, @@ -5325,7 +5331,8 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征" + "功能入口-维京远征", + "901" ], "event": [ 2, @@ -5338,7 +5345,8 @@ "heroid": 25001, "datas": [ "GameMain", - "装木炭的箱子" + "装木炭的箱子", + "901" ], "event": [], "goto": 0 @@ -5348,7 +5356,8 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征" + "功能入口-维京远征", + "901" ], "event": [ 2, @@ -5361,7 +5370,8 @@ "heroid": 25001, "datas": [ "GameMain", - "希卡普旁的亚丝翠" + "希卡普旁的亚丝翠", + "901" ], "event": [ 2, @@ -5374,7 +5384,8 @@ "heroid": 25001, "datas": [ "GameMain", - "亚丝翠旁的鼻涕粗" + "亚丝翠旁的鼻涕粗", + "901" ], "event": [ 1, @@ -5386,7 +5397,8 @@ "id": 300049, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5398,7 +5410,8 @@ "heroid": 25001, "datas": [ "GameMain", - "亚丝翠旁的鼻涕粗" + "亚丝翠旁的鼻涕粗", + "901" ], "event": [ 2, @@ -5411,7 +5424,8 @@ "heroid": 25001, "datas": [ "GameMain", - "亚丝翠旁的鼻涕粗" + "亚丝翠旁的鼻涕粗", + "901" ], "event": [ 1, @@ -5423,7 +5437,8 @@ "id": 300059, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5435,7 +5450,8 @@ "heroid": 25001, "datas": [ "GameMain", - "亚丝翠旁的鼻涕粗" + "亚丝翠旁的鼻涕粗", + "901" ], "event": [ 2, @@ -5447,7 +5463,8 @@ "id": 300068, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5458,7 +5475,8 @@ "id": 300069, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5470,7 +5488,8 @@ "heroid": 25001, "datas": [ "GameMain", - "车站旁的鼻涕粗" + "车站旁的鼻涕粗", + "901" ], "event": [ 2, @@ -5482,7 +5501,8 @@ "id": 300618, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5493,7 +5513,8 @@ "id": 300619, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5505,7 +5526,8 @@ "heroid": 25001, "datas": [ "GameMain", - "希卡普旁的亚丝翠" + "希卡普旁的亚丝翠", + "901" ], "event": [ 2, @@ -5517,7 +5539,8 @@ "id": 300628, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5528,7 +5551,8 @@ "id": 300629, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5540,7 +5564,8 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪" + "功能入口-烹饪", + "901" ], "event": [ 2, @@ -5552,7 +5577,8 @@ "id": 300078, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5563,7 +5589,8 @@ "id": 300079, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5575,7 +5602,8 @@ "heroid": 25001, "datas": [ "GameMain", - "铁匠铺门口的暴芙那特" + "铁匠铺门口的暴芙那特", + "901" ], "event": [ 2, @@ -5587,7 +5615,8 @@ "id": 300088, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5598,7 +5627,8 @@ "id": 300089, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 9d583b0ee..f3d681fdb 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -6,7 +6,7 @@ "text": "[color=#37d8a9]攻击提升[/color] " }, "Desc": { - "key": "skill_skill_buff_Desc_390001001", + "key": "780002904", "text": "攻击提升60%。" }, "BuffType": 1, @@ -324,7 +324,7 @@ }, "BuffType": 30, "EffectArgu": [ - -1, + 14, 100 ], "BufParNum": 1, From 41d66bdc5fd9c5c54c7dba00f359904195ca5342 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 19 Jul 2023 15:05:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=BB=93=E6=9D=9F=20?= =?UTF-8?q?=E8=A1=A5=E5=8F=91=E6=B2=A1=E6=9C=89=E9=A2=86=E5=8F=96=E7=9A=84?= =?UTF-8?q?=E5=9C=A3=E6=A1=83=E6=A0=91=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 3 + comm/imodule.go | 3 + modules/hero/api_drawCard.go | 2 +- modules/hero/module.go | 49 ++++++++++++ modules/user/api_login.go | 2 +- pb/hero_db.pb.go | 140 +++++++++++++++++++---------------- 6 files changed, 132 insertions(+), 67 deletions(-) diff --git a/comm/const.go b/comm/const.go index 9c9ab3833..60746ee7e 100644 --- a/comm/const.go +++ b/comm/const.go @@ -783,6 +783,9 @@ const ( ResonanceDefPro = "defpro" ) +const ( + MailPeackReward = "PeackReward" +) const ( PagodaType = 101 // 普通塔 SeasonType = 2 // 赛季塔类型 diff --git a/comm/imodule.go b/comm/imodule.go index 77864e11f..1d05c8c71 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -141,6 +141,9 @@ type ( PassonHero(session IUserSession, heroObjID map[string]bool) (errdata *pb.ErrorData) GetVirtualHero(hero *pb.DBHero, lv int32) (vHero *pb.DBHero) + + // 检查圣桃树奖励是否发放 + CheckPeachReward(session IUserSession, ctime int64) } //玩家 diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 692c2f270..7ceef39a9 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -39,6 +39,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq IsBaodiPool bool // 是否是保底卡池 appointmap map[int32]string // 指定次数抽卡到指定卡池 ) + update = make(map[string]interface{}) appointmap = make(map[int32]string) szCards = make([]string, 0) heroRecord, _ = this.module.modelRecord.GetHeroRecord(session.GetUserId()) @@ -136,7 +137,6 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq //////////////////////////////////////////////////////// - update = make(map[string]interface{}) cfgGlobal = this.module.ModuleTools.GetGlobalConf() // 读取抽卡配置文件 if cfgGlobal == nil { return diff --git a/modules/hero/module.go b/modules/hero/module.go index b4e7c279d..ae05eef12 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -9,6 +9,7 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/sys/db" "go_dreamfactory/utils" @@ -34,6 +35,7 @@ type Hero struct { moduleHoroscope comm.IHoroscope chat comm.IChat passon comm.IPasson + mail comm.Imail } // 模块名 @@ -78,6 +80,11 @@ func (this *Hero) Start() (err error) { return } this.passon = module.(comm.IPasson) + + if module, err = this.service.GetModule(comm.ModuleMail); err != nil { + return + } + this.mail = module.(comm.Imail) event.RegisterGO(comm.EventUserOffline, this.EventUserOffline) return } @@ -1044,3 +1051,45 @@ func (this *Hero) GetVirtualHero(hero *pb.DBHero, lv int32) (vHero *pb.DBHero) { this.modelHero.PropertyCompute(hero) return hero } + +func (this *Hero) CheckPeachReward(session comm.IUserSession, ctime int64) { + var ( + reward []*cfg.Gameatn // 奖励 + ) + // 校验时间 是否在活动范围 + drawConf, err := this.configure.GetHeroDrawConfigByType(comm.DrawCardType0) + if err != nil { + + return + } + if drawConf.Etime != -1 { + if ctime+int64(drawConf.Etime*3600*24) < configure.Now().Unix() { + heroRecord, _ := this.modelRecord.GetHeroRecord(session.GetUserId()) + if !heroRecord.Peachreward { + allreawd := this.configure.GetAllDrawRewardConf() + + for k, v := range allreawd { + if _, ok := heroRecord.Peach[k]; !ok { + if v1, ok := heroRecord.Race[comm.DrawCardType0]; ok { + if v1 > v.Num { //可以领取 + + reward = append(reward, v.Reward) + } + } + } + } + heroRecord.Peachreward = true + update := make(map[string]interface{}) + update["peachreward"] = heroRecord.Peachreward + this.modelRecord.ChangeHeroRecord(session.GetUserId(), update) + // 发邮件 + if len(reward) > 0 { + this.mail.SendMailByUID(session.GetUserId(), comm.MailPeackReward, reward, []string{}) + } + } + + return + } + } + return +} diff --git a/modules/user/api_login.go b/modules/user/api_login.go index 62f0eb8b6..0a2da5f29 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -164,7 +164,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err this.module.modelSign.UserSign(session) go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype8, 1)) } - + this.module.ModuleHero.CheckPeachReward(session, user.Ctime) this.module.RecoverUserPsStart(user.Uid) // 日常登录任务 go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype7, 1)) diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 8cceede4d..4d8e38826 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -327,23 +327,24 @@ type DBHeroRecord struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - Mtime int64 `protobuf:"varint,3,opt,name=mtime,proto3" json:"mtime"` // 修改时间 - Drawcount int32 `protobuf:"varint,4,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数 - Condition map[string]int32 `protobuf:"bytes,5,rep,name=condition,proto3" json:"condition" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key recharge、login 等 value 累计抽卡次数 - Star5Hero map[string]int32 `protobuf:"bytes,6,rep,name=star5Hero,proto3" json:"star5Hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 第totalcount 次抽到的5星英雄 key 英雄id - Totalcount int32 `protobuf:"varint,7,opt,name=totalcount,proto3" json:"totalcount"` // 总的累计抽卡次数 - Daycount int32 `protobuf:"varint,8,opt,name=daycount,proto3" json:"daycount"` // 今天抽卡次数 - Race map[int32]int32 `protobuf:"bytes,11,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //key对应的数据 2.普通招募 3-6：阵营招募，分别对应hero表1/2/3/4阵营 7：限时招募 - Baodi4 map[int32]int32 `protobuf:"bytes,12,rep,name=baodi4,proto3" json:"baodi4" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 4星保底次数 key 阵营类型 value count - Baodi5 map[int32]int32 `protobuf:"bytes,13,rep,name=baodi5,proto3" json:"baodi5" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 5星保底次数 key 阵营类型 value count - Count map[int32]int32 `protobuf:"bytes,14,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 抽卡次数 key 阵营类型 value count - Peach map[int32]bool `protobuf:"bytes,15,rep,name=peach,proto3" json:"peach" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 记录圣桃结实已领取的奖励 - Limit map[string]int64 `protobuf:"bytes,16,rep,name=limit,proto3" json:"limit" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 限定抽卡 key:英雄id value 冷却结束时间 - LimitHero string `protobuf:"bytes,17,opt,name=limitHero,proto3" json:"limitHero"` // 默认值为0 需客户端 查表读取默认字段 - Wish map[string]int64 `protobuf:"bytes,18,rep,name=wish,proto3" json:"wish" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 许愿招募 key:英雄id value 冷却结束时间 - WishHero string `protobuf:"bytes,19,opt,name=wishHero,proto3" json:"wishHero"` // 当前许愿英雄 (默认值为0 需客户端 查表读取默认字段) + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + Mtime int64 `protobuf:"varint,3,opt,name=mtime,proto3" json:"mtime"` // 修改时间 + Drawcount int32 `protobuf:"varint,4,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数 + Condition map[string]int32 `protobuf:"bytes,5,rep,name=condition,proto3" json:"condition" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key recharge、login 等 value 累计抽卡次数 + Star5Hero map[string]int32 `protobuf:"bytes,6,rep,name=star5Hero,proto3" json:"star5Hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 第totalcount 次抽到的5星英雄 key 英雄id + Totalcount int32 `protobuf:"varint,7,opt,name=totalcount,proto3" json:"totalcount"` // 总的累计抽卡次数 + Daycount int32 `protobuf:"varint,8,opt,name=daycount,proto3" json:"daycount"` // 今天抽卡次数 + Race map[int32]int32 `protobuf:"bytes,11,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //key对应的数据 2.普通招募 3-6：阵营招募，分别对应hero表1/2/3/4阵营 7：限时招募 + Baodi4 map[int32]int32 `protobuf:"bytes,12,rep,name=baodi4,proto3" json:"baodi4" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 4星保底次数 key 阵营类型 value count + Baodi5 map[int32]int32 `protobuf:"bytes,13,rep,name=baodi5,proto3" json:"baodi5" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 5星保底次数 key 阵营类型 value count + Count map[int32]int32 `protobuf:"bytes,14,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 抽卡次数 key 阵营类型 value count + Peach map[int32]bool `protobuf:"bytes,15,rep,name=peach,proto3" json:"peach" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 记录圣桃结实已领取的奖励 + Limit map[string]int64 `protobuf:"bytes,16,rep,name=limit,proto3" json:"limit" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 限定抽卡 key:英雄id value 冷却结束时间 + LimitHero string `protobuf:"bytes,17,opt,name=limitHero,proto3" json:"limitHero"` // 默认值为0 需客户端 查表读取默认字段 + Wish map[string]int64 `protobuf:"bytes,18,rep,name=wish,proto3" json:"wish" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 许愿招募 key:英雄id value 冷却结束时间 + WishHero string `protobuf:"bytes,19,opt,name=wishHero,proto3" json:"wishHero"` // 当前许愿英雄 (默认值为0 需客户端 查表读取默认字段) + Peachreward bool `protobuf:"varint,20,opt,name=peachreward,proto3" json:"peachreward"` // 圣桃结实已领取奖励 } func (x *DBHeroRecord) Reset() { @@ -497,6 +498,13 @@ func (x *DBHeroRecord) GetWishHero() string { return "" } +func (x *DBHeroRecord) GetPeachreward() bool { + if x != nil { + return x.Peachreward + } + return false +} + // 英雄天赋系统 type DBHeroTalent struct { state protoimpl.MessageState @@ -660,7 +668,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb4, 0x09, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd6, 0x09, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, @@ -702,56 +710,58 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x57, 0x69, 0x73, 0x68, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x77, 0x69, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x69, 0x73, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x13, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x77, 0x69, 0x73, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x1a, 0x3c, 0x0a, 0x0e, - 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x28, 0x09, 0x52, 0x08, 0x77, 0x69, 0x73, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x0b, + 0x70, 0x65, 0x61, 0x63, 0x68, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x14, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x0b, 0x70, 0x65, 0x61, 0x63, 0x68, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3c, + 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, + 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, - 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, - 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x65, 0x61, 0x63, 0x68, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, - 0x69, 0x6d, 0x69, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x57, 0x69, 0x73, 0x68, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, + 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, - 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, - 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, - 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, - 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, - 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, - 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, - 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, + 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x65, 0x61, 0x63, 0x68, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, + 0x0a, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x57, 0x69, 0x73, 0x68, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, + 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, + 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, + 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, + 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, + 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, + 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, + 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (