From f7f74c4e07a5584f3e0f2e452f8235e2eff6aa50 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 18 Aug 2023 10:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=AE=A1=E8=B4=B9=E7=82=B9?= =?UTF-8?q?=E5=9F=8B=E7=82=B9=E5=92=8C=E5=B7=A5=E4=BC=9A=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedtype.json | 37 +- bin/json/game_dispatch_battle.json | 4 +- bin/json/game_guildbossscore.json | 2 +- bin/json/game_item.json | 370 +++++----- bin/json/game_mainstage.json | 54 +- bin/json/game_playerlv.json | 2 +- bin/json/game_recharge.json | 56 ++ modules/guildgve/api_info.go | 2 +- modules/pay/module.go | 5 +- pb/comm.pb.go | 744 +++++++++++---------- pb/guildgve_msg.pb.go | 205 +++--- sys/configure/structs/Game.RechargeData.go | 2 + 12 files changed, 826 insertions(+), 657 deletions(-) diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 70b9d4c1c..15fe25e6f 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1260,7 +1260,7 @@ }, { "id": 219, - "insert": 2, + "insert": 1, "filter": [] }, { @@ -1270,7 +1270,7 @@ }, { "id": 221, - "insert": 2, + "insert": 1, "filter": [ "eq" ] @@ -1321,5 +1321,38 @@ "filter": [ "eq" ] + }, + { + "id": 228, + "insert": 1, + "filter": [ + "eq" + ] + }, + { + "id": 229, + "insert": 1, + "filter": [ + "eq" + ] + }, + { + "id": 230, + "insert": 1, + "filter": [ + "eq" + ] + }, + { + "id": 231, + "insert": 1, + "filter": [] + }, + { + "id": 232, + "insert": 1, + "filter": [ + "eq" + ] } ] \ No newline at end of file diff --git a/bin/json/game_dispatch_battle.json b/bin/json/game_dispatch_battle.json index ab732b938..2698ac815 100644 --- a/bin/json/game_dispatch_battle.json +++ b/bin/json/game_dispatch_battle.json @@ -15,7 +15,7 @@ "key": "pandamas_pandamas_npcbattle_battletxt_1", "text": "有人前来闹事，快去解决掉他" }, - "BattleReadyID": 100, + "BattleReadyID": 103, "monsterformat_id": 101011, "EventList": [], "award": [ @@ -59,7 +59,7 @@ "key": "pandamas_pandamas_npcbattle_battletxt_2", "text": "有人前来闹事，快去解决掉他" }, - "BattleReadyID": 100, + "BattleReadyID": 103, "monsterformat_id": 101051, "EventList": [], "award": [ diff --git a/bin/json/game_guildbossscore.json b/bin/json/game_guildbossscore.json index cd9f8674b..526fd9cbd 100644 --- a/bin/json/game_guildbossscore.json +++ b/bin/json/game_guildbossscore.json @@ -6,7 +6,7 @@ "text": "e" }, "score": 1, - "rank_low": 1, + "rank_low": 0, "rank_up": 19999, "hp": 30, "drop": 19100001, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 4bf8187a8..59a4db7ea 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -126,7 +126,7 @@ }, "describe": { "key": "item_item_describe_3", - "text": "菲奥娜配置的神奇药剂，滋味甘美，饮后精神焕发，获得50点体力值。" + "text": "菲奥娜配置的神奇药剂，滋味甘美，饮后精神焕发。" }, "dialogue": { "key": "item_item_dialogue_3", @@ -173,7 +173,7 @@ }, "describe": { "key": "item_item_describe_4", - "text": "记载基本技能的卷轴，看完约估三小时，可用来提升稀有守护者技能等级。" + "text": "记载基本技能的卷轴，看完约估三小时。" }, "dialogue": { "key": "item_item_dialogue_4", @@ -220,7 +220,7 @@ }, "describe": { "key": "item_item_describe_5", - "text": "记载晋升技能的卷轴，看完约估三天，可用于提升完美守护者技能等级。" + "text": "记载晋升技能的卷轴，看完约估三天。" }, "dialogue": { "key": "item_item_dialogue_5", @@ -267,7 +267,7 @@ }, "describe": { "key": "item_item_describe_6", - "text": "记载绝世技能的卷轴，根据各人资质而定，听闻有人三年还未学会……可用于提升史诗守护者技能等级。" + "text": "记载绝世技能的卷轴，根据各人资质而定，听闻有人三年还未学会……加油。" }, "dialogue": { "key": "item_item_dialogue_6", @@ -310,11 +310,11 @@ "img": "item_10000007", "intr": { "key": "item_item_intr_7", - "text": "通过完成周常任务获得活跃度，活跃度一定数额后可以领取周常奖励。" + "text": "通过完成周常任务获得情绪值，情绪值一定数额后可以领取周常奖励。" }, "describe": { "key": "item_item_describe_7", - "text": "完成周常任务会使波比变得开心，获得一定情绪值领取周常奖励。" + "text": "完成周常任务会使波比变得开心，浇花时哼起欢快的小曲。" }, "dialogue": { "key": "item_item_dialogue_7", @@ -361,7 +361,7 @@ }, "describe": { "key": "item_item_describe_8", - "text": "初级的护身符，守护者的道路由此开启，用于提升守护者等级的道具。" + "text": "初级的护身符，守护者的道路由此开启。" }, "dialogue": { "key": "item_item_dialogue_8", @@ -408,7 +408,7 @@ }, "describe": { "key": "item_item_describe_9", - "text": "中级的护身符，通常给予那些战斗比较熟练的守护者，用于提升守护者等级的道具。" + "text": "中级的护身符，通常给予那些战斗比较熟练的守护者。" }, "dialogue": { "key": "item_item_dialogue_9", @@ -455,7 +455,7 @@ }, "describe": { "key": "item_item_describe_10", - "text": "高级的护身符，常见于经历上千次战斗的守护者，用于提升守护者等级的道具。" + "text": "高级的护身符，常见于经历上千次战斗的守护者。" }, "dialogue": { "key": "item_item_dialogue_10", @@ -514,7 +514,7 @@ }, "describe": { "key": "item_item_describe_11", - "text": "看上去平平无奇，却是对于实力的小小证明，用于提升三星守护者星级的道具。" + "text": "看上去平平无奇，却是对于实力的小小证明。" }, "dialogue": { "key": "item_item_dialogue_11", @@ -585,7 +585,7 @@ }, "describe": { "key": "item_item_describe_12", - "text": "稍显锋芒，守护者实力进阶的一种认可，用于提升四星守护者星级的道具。" + "text": "稍显锋芒，守护者实力进阶的一种认可。" }, "dialogue": { "key": "item_item_dialogue_12", @@ -644,7 +644,7 @@ }, "describe": { "key": "item_item_describe_13", - "text": "显贵不凡，只有十分强大的守护者才能拥有，用于提升五星守护者星级的道具。" + "text": "显贵不凡，只有十分强大的守护者才能拥有。" }, "dialogue": { "key": "item_item_dialogue_13", @@ -687,11 +687,11 @@ "img": "wp_icon_10020", "intr": { "key": "item_item_intr_14", - "text": "蕴含着奥术力量的神石，用于属性招募抽取守护者" + "text": "蕴含着真诚力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_14", - "text": "熊熊燃烧的火焰，热情的红色，就像那些真诚直率的守护者，可以用于真诚阵营招募。" + "text": "熊熊燃烧的火焰，热情的红色，就像那些真诚直率的守护者。" }, "dialogue": { "key": "item_item_dialogue_14", @@ -734,11 +734,11 @@ "img": "wp_icon_10021", "intr": { "key": "item_item_intr_15", - "text": "蕴含着科技力量的神石，用于属性招募抽取守护者" + "text": "蕴含着直觉力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_15", - "text": "翠绿欲滴的木枝，温润的绿色，就像那些忠于自我的守护者，可以用于直觉阵营招募。" + "text": "翠绿欲滴的木枝，温润的绿色，就像那些忠于自我的守护者。" }, "dialogue": { "key": "item_item_dialogue_15", @@ -781,11 +781,11 @@ "img": "wp_icon_10022", "intr": { "key": "item_item_intr_16", - "text": "蕴含着自然力量的神石，用于属性招募抽取守护者" + "text": "蕴含着共情力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_16", - "text": "寒气四溢的冰霜，沉静的蓝色，就像那些善于聆听的守护者，可以用于共情阵营招募。" + "text": "寒气四溢的冰霜，沉静的蓝色，就像那些善于聆听的守护者。" }, "dialogue": { "key": "item_item_dialogue_16", @@ -828,11 +828,11 @@ "img": "wp_icon_10024", "intr": { "key": "item_item_intr_17", - "text": "蕴含着光耀力量的神石，用于属性招募抽取守护者" + "text": "蕴含着责任力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_17", - "text": "金光闪耀的金器，神圣的金色，就像那些出类拔萃的守护者，可以用于责任阵营招募。" + "text": "金光闪耀的金器，神圣的金色，就像那些出类拔萃的守护者。" }, "dialogue": { "key": "item_item_dialogue_17", @@ -875,11 +875,11 @@ "img": "wp_icon_10020", "intr": { "key": "item_item_intr_18", - "text": "蕴含着奥术力量的神石的碎片，消耗10个可用于属性招募抽取守护者" + "text": "蕴含着真诚力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_18", - "text": "消耗10个可以用于真诚阵营招募。" + "text": "星星之火，永不熄灭。" }, "dialogue": { "key": "item_item_dialogue_18", @@ -922,11 +922,11 @@ "img": "wp_icon_10021", "intr": { "key": "item_item_intr_19", - "text": "蕴含着科技力量的神石的碎片，消耗10个可用于属性招募抽取守护者" + "text": "蕴含着直觉力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_19", - "text": "消耗10个可以用于直觉阵营招募。" + "text": "苍松如翠，永不枯萎。" }, "dialogue": { "key": "item_item_dialogue_19", @@ -969,11 +969,11 @@ "img": "wp_icon_10022", "intr": { "key": "item_item_intr_20", - "text": "蕴含着自然力量的神石的碎片，消耗10个可用于属性招募抽取守护者" + "text": "蕴含着共情力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_20", - "text": "消耗10个可以用于共情阵营招募。" + "text": "点点微霜，永不融化。" }, "dialogue": { "key": "item_item_dialogue_20", @@ -1016,11 +1016,11 @@ "img": "wp_icon_10024", "intr": { "key": "item_item_intr_21", - "text": "蕴含着光耀力量的神石的碎片，消耗10个可用于属性招募抽取守护者" + "text": "蕴含着责任力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_21", - "text": "消耗10个可以用于责任阵营招募。" + "text": "细细粒金，永恒闪耀。" }, "dialogue": { "key": "item_item_dialogue_21", @@ -1063,11 +1063,11 @@ "img": "wp_icon_10023", "intr": { "key": "item_item_intr_22", - "text": "蕴含神秘力量的石头，消耗100个可以在许愿招募池内兑换英雄" + "text": "蕴含神秘力量的桃子，消耗100个可以在圣泪池池内召唤守护者。" }, "describe": { "key": "item_item_describe_22", - "text": "巨大诱人的蟠桃，就连神仙也无法抵挡。它帮助传承者在许愿招募中许愿，获得心仪的守护者。" + "text": "巨大诱人的蟠桃，就连神仙也无法抵挡。" }, "dialogue": { "key": "item_item_dialogue_22", @@ -4729,7 +4729,7 @@ }, "describe": { "key": "item_item_describe_94", - "text": "闪闪守护之心，可用于相应守护者的觉醒等级提升。" + "text": "心中一闪而过的光芒，是闪闪回忆中吉姆战斗的身影。" }, "dialogue": { "key": "item_item_dialogue_94", @@ -4776,7 +4776,7 @@ }, "describe": { "key": "item_item_describe_95", - "text": "食人鱼先生守护之心，可用于相应守护者的觉醒等级提升。" + "text": "这个……这颗心有股杀伤力很强的味道。" }, "dialogue": { "key": "item_item_dialogue_95", @@ -4823,7 +4823,7 @@ }, "describe": { "key": "item_item_describe_96", - "text": "啊啊守护之心，可用于相应守护者的觉醒等级提升。" + "text": "你仔细往碎片中看去，看见了大量的毛线球。" }, "dialogue": { "key": "item_item_dialogue_96", @@ -4870,7 +4870,7 @@ }, "describe": { "key": "item_item_describe_97", - "text": "法夸德勋爵守护之心，可用于相应守护者的觉醒等级提升。" + "text": "这颗心跟原主一样，充满了浮夸的视觉污染效果。" }, "dialogue": { "key": "item_item_dialogue_97", @@ -4917,7 +4917,7 @@ }, "describe": { "key": "item_item_describe_98", - "text": "大大守护之心，可用于相应守护者的觉醒等级提升。" + "text": "暖暖的，满满的蓝色，一见到就令人身心放松。" }, "dialogue": { "key": "item_item_dialogue_98", @@ -4964,7 +4964,7 @@ }, "describe": { "key": "item_item_describe_99", - "text": "史图依克守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一抹棕红色的身影掠过，是博克岛曾经的首领吗？" }, "dialogue": { "key": "item_item_dialogue_99", @@ -5011,7 +5011,7 @@ }, "describe": { "key": "item_item_describe_100", - "text": "大龙守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一抹凶狠的眼神闪过，令你不寒而栗。" }, "dialogue": { "key": "item_item_dialogue_100", @@ -5058,7 +5058,7 @@ }, "describe": { "key": "item_item_describe_101", - "text": "亚丝翠守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一个骑在龙上的金发女孩正在对你微笑。" }, "dialogue": { "key": "item_item_dialogue_101", @@ -5105,7 +5105,7 @@ }, "describe": { "key": "item_item_describe_102", - "text": "克莱尔·努涅斯守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一个黑发的甜美女孩正在舞台上排练。" }, "dialogue": { "key": "item_item_dialogue_102", @@ -5152,7 +5152,7 @@ }, "describe": { "key": "item_item_describe_103", - "text": "鹤大师守护之心，可用于相应守护者的觉醒等级提升。" + "text": "洁白的翅膀，尖尖的喙，神秘的斗笠，隐然有世外高人之姿。" }, "dialogue": { "key": "item_item_dialogue_103", @@ -5199,7 +5199,7 @@ }, "describe": { "key": "item_item_describe_104", - "text": "布兰奇守护之心，可用于相应守护者的觉醒等级提升。" + "text": "阴暗，老成，满脸不高兴。似乎原主并不招人喜欢。" }, "dialogue": { "key": "item_item_dialogue_104", @@ -5246,7 +5246,7 @@ }, "describe": { "key": "item_item_describe_105", - "text": "格里斯特王子守护之心，可用于相应守护者的觉醒等级提升。" + "text": "咦？为什么这里全是小精灵的脸？" }, "dialogue": { "key": "item_item_dialogue_105", @@ -5293,7 +5293,7 @@ }, "describe": { "key": "item_item_describe_106", - "text": "吉姆·莱克守护之心，可用于相应守护者的觉醒等级提升。" + "text": "这年轻人神采奕奕，正拿着魔杖对抗着巨怪。" }, "dialogue": { "key": "item_item_dialogue_106", @@ -5340,7 +5340,7 @@ }, "describe": { "key": "item_item_describe_107", - "text": "船长守护之心，可用于相应守护者的觉醒等级提升。" + "text": "面对它，你感觉自己像一个刚入伍的小兵。" }, "dialogue": { "key": "item_item_dialogue_107", @@ -5387,7 +5387,7 @@ }, "describe": { "key": "item_item_describe_108", - "text": "希沙窦斯守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一股古老的，仿佛女巫魔药汤锅的味道飘来。" }, "dialogue": { "key": "item_item_dialogue_108", @@ -5434,7 +5434,7 @@ }, "describe": { "key": "item_item_describe_109", - "text": "小欧守护之心，可用于相应守护者的觉醒等级提升。" + "text": "絮絮叨叨的声音不断萦绕在耳边，和原主一样话痨。" }, "dialogue": { "key": "item_item_dialogue_109", @@ -5481,7 +5481,7 @@ }, "describe": { "key": "item_item_describe_110", - "text": "亚力克斯守护之心，可用于相应守护者的觉醒等级提升。" + "text": "啊！这就是纽约最受欢迎的明星亚历克斯的心！" }, "dialogue": { "key": "item_item_dialogue_110", @@ -5528,7 +5528,7 @@ }, "describe": { "key": "item_item_describe_111", - "text": "斯梅克船长守护之心，可用于相应守护者的觉醒等级提升。" + "text": "据说这是伟大的斯梅克船长留下的，而他之所以伟大是因为他逃跑得最快。" }, "dialogue": { "key": "item_item_dialogue_111", @@ -5575,7 +5575,7 @@ }, "describe": { "key": "item_item_describe_112", - "text": "警卫队长守护之心，可用于相应守护者的觉醒等级提升。" + "text": "平平无奇，朝九晚五，埋头做事的队长。" }, "dialogue": { "key": "item_item_dialogue_112", @@ -5622,7 +5622,7 @@ }, "describe": { "key": "item_item_describe_113", - "text": "黛塔黛恩守护之心，可用于相应守护者的觉醒等级提升。" + "text": "眼泪来自眼中的灰尘，心像皮革一样坚硬。" }, "dialogue": { "key": "item_item_dialogue_113", @@ -5669,7 +5669,7 @@ }, "describe": { "key": "item_item_describe_114", - "text": "吉姆·普雷斯科特守护之心，可用于相应守护者的觉醒等级提升。" + "text": "明明是一个西部单身汉，为什么有草莓的味道？" }, "dialogue": { "key": "item_item_dialogue_114", @@ -5716,7 +5716,7 @@ }, "describe": { "key": "item_item_describe_115", - "text": "警长守护之心，可用于相应守护者的觉醒等级提升。" + "text": "劳累之余，就很想来上一杯正宗的马丁尼，搅拌均匀。" }, "dialogue": { "key": "item_item_dialogue_115", @@ -5763,7 +5763,7 @@ }, "describe": { "key": "item_item_describe_116", - "text": "牙仙守护之心，可用于相应守护者的觉醒等级提升。" + "text": "要少吃糖，才能拥有一口洁白的好牙哦！不知哪里的声音传到你耳边。" }, "dialogue": { "key": "item_item_dialogue_116", @@ -5810,7 +5810,7 @@ }, "describe": { "key": "item_item_describe_117", - "text": "睡神沙人守护之心，可用于相应守护者的觉醒等级提升。" + "text": "金色的细微粒沙像雾一样萦绕着，美轮美奂。突然" }, "dialogue": { "key": "item_item_dialogue_117", @@ -5857,7 +5857,7 @@ }, "describe": { "key": "item_item_describe_118", - "text": "邦尼兔守护之心，可用于相应守护者的觉醒等级提升。" + "text": "黑洞突然出现又消失，那个浓眉大眼的兔子在打量你。" }, "dialogue": { "key": "item_item_dialogue_118", @@ -5904,7 +5904,7 @@ }, "describe": { "key": "item_item_describe_119", - "text": "金猴守护之心，可用于相应守护者的觉醒等级提升。" + "text": "哎哟不错哦！金猴对你调皮地眨了眨眼。" }, "dialogue": { "key": "item_item_dialogue_119", @@ -5951,7 +5951,7 @@ }, "describe": { "key": "item_item_describe_120", - "text": "凯尔守护之心，可用于相应守护者的觉醒等级提升。" + "text": "与其他外星人的气质迥然不同，凯尔给人一种秩序井然的感觉。" }, "dialogue": { "key": "item_item_dialogue_120", @@ -5998,7 +5998,7 @@ }, "describe": { "key": "item_item_describe_121", - "text": "小钱守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一双好奇的大眼睛望着你，一个早熟而可爱的孩子。" }, "dialogue": { "key": "item_item_dialogue_121", @@ -6045,7 +6045,7 @@ }, "describe": { "key": "item_item_describe_122", - "text": "暴芙那特守护之心，可用于相应守护者的觉醒等级提升。" + "text": "未及靠近，你便已经感受到她火爆的性子了。" }, "dialogue": { "key": "item_item_dialogue_122", @@ -6092,7 +6092,7 @@ }, "describe": { "key": "item_item_describe_123", - "text": "云朵先生守护之心，可用于相应守护者的觉醒等级提升。" + "text": "玩世不恭，慵懒，云淡风轻的样子。" }, "dialogue": { "key": "item_item_dialogue_123", @@ -6139,7 +6139,7 @@ }, "describe": { "key": "item_item_describe_124", - "text": "阿宝守护之心，可用于相应守护者的觉醒等级提升。" + "text": "黑白两色不断变换，就像一个太极图。" }, "dialogue": { "key": "item_item_dialogue_124", @@ -6186,7 +6186,7 @@ }, "describe": { "key": "item_item_describe_125", - "text": "沃尔夫先生守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一只大尾巴在不断摆动，什么情况？" }, "dialogue": { "key": "item_item_dialogue_125", @@ -6233,7 +6233,7 @@ }, "describe": { "key": "item_item_describe_126", - "text": "羊仙姑守护之心，可用于相应守护者的觉醒等级提升。" + "text": "从茶壶里升腾而出的烟雾正在幻化出异象，仿佛是某种预言。" }, "dialogue": { "key": "item_item_dialogue_126", @@ -6280,7 +6280,7 @@ }, "describe": { "key": "item_item_describe_127", - "text": "波比守护之心，可用于相应守护者的觉醒等级提升。" + "text": "无数的爱心，糖果，向日葵，水果，凝结了一切美好。" }, "dialogue": { "key": "item_item_dialogue_127", @@ -6327,7 +6327,7 @@ }, "describe": { "key": "item_item_describe_128", - "text": "巫嘎守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一股妈妈般的温暖与坚韧。" }, "dialogue": { "key": "item_item_dialogue_128", @@ -6374,7 +6374,7 @@ }, "describe": { "key": "item_item_describe_129", - "text": "坦克守护之心，可用于相应守护者的觉醒等级提升。" + "text": "里面有个散发着蓝光的漩涡，盯着看就会沉迷其中。" }, "dialogue": { "key": "item_item_dialogue_129", @@ -6421,7 +6421,7 @@ }, "describe": { "key": "item_item_describe_130", - "text": "胡德先生守护之心，可用于相应守护者的觉醒等级提升。" + "text": "“强盗也有心，强盗也有爱。哦，菲奥娜！”一首难听的歌谣传出。" }, "dialogue": { "key": "item_item_dialogue_130", @@ -6468,7 +6468,7 @@ }, "describe": { "key": "item_item_describe_131", - "text": "普鲁格兰杰守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一个身材瘦小的女孩子递来一个苹果。" }, "dialogue": { "key": "item_item_dialogue_131", @@ -6515,7 +6515,7 @@ }, "describe": { "key": "item_item_describe_132", - "text": "鼻涕粗守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一股浓浓的自恋气息扑面而来。" }, "dialogue": { "key": "item_item_dialogue_132", @@ -6562,7 +6562,7 @@ }, "describe": { "key": "item_item_describe_133", - "text": "珍妮丝·邓普顿守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一个疲惫不堪的女人在两个孩子和老板电话的夹击下濒临崩溃。" }, "dialogue": { "key": "item_item_dialogue_133", @@ -6609,7 +6609,7 @@ }, "describe": { "key": "item_item_describe_134", - "text": "贫嘴驴守护之心，可用于相应守护者的觉醒等级提升。" + "text": "你看见一堆小龙驴正在大喊爹地。" }, "dialogue": { "key": "item_item_dialogue_134", @@ -6656,7 +6656,7 @@ }, "describe": { "key": "item_item_describe_135", - "text": "蒂姆·邓普顿守护之心，可用于相应守护者的觉醒等级提升。" + "text": "科学怪人复活海底冒险火山爆发……原主的经历真是精彩非凡啊。" }, "dialogue": { "key": "item_item_dialogue_135", @@ -6703,7 +6703,7 @@ }, "describe": { "key": "item_item_describe_136", - "text": "圣诞老人守护之心，可用于相应守护者的觉醒等级提升。" + "text": "如你想象中一样，是位慈祥的老人，只不过是手臂刺青手拿双刀的那种慈祥老人。" }, "dialogue": { "key": "item_item_dialogue_136", @@ -6750,7 +6750,7 @@ }, "describe": { "key": "item_item_describe_137", - "text": "瓜哥守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一群红手印，一群红色小人，一个滚动的大石球？？" }, "dialogue": { "key": "item_item_dialogue_137", @@ -6797,7 +6797,7 @@ }, "describe": { "key": "item_item_describe_138", - "text": "沃尔特·史翠克勒守护之心，可用于相应守护者的觉醒等级提升。" + "text": "严谨，克制，外冷内热，深沉的爱。不善言辞却热烈的心。" }, "dialogue": { "key": "item_item_dialogue_138", @@ -6844,7 +6844,7 @@ }, "describe": { "key": "item_item_describe_139", - "text": "冰霜杰克守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一个男孩看着一个小女孩在冰面上玩耍，若隐若现的回忆，凝结了一层冰霜。" }, "dialogue": { "key": "item_item_dialogue_139", @@ -6891,7 +6891,7 @@ }, "describe": { "key": "item_item_describe_140", - "text": "菲奥娜守护之心，可用于相应守护者的觉醒等级提升。" + "text": "囚禁在古堡中的漫长岁月，沼泽生活的自由自在，两段回忆来回交织着。" }, "dialogue": { "key": "item_item_dialogue_140", @@ -6938,7 +6938,7 @@ }, "describe": { "key": "item_item_describe_141", - "text": "悍夫那特守护之心，可用于相应守护者的觉醒等级提升。" + "text": "这个雀斑男孩有着比他姐姐更为火爆的脾性，他的守护之心看上去随时要炸开。" }, "dialogue": { "key": "item_item_dialogue_141", @@ -6985,7 +6985,7 @@ }, "describe": { "key": "item_item_describe_142", - "text": "师父守护之心，可用于相应守护者的觉醒等级提升。" + "text": "翡翠宫，六个徒儿。还有一处看不清的地方，可能师傅并不想让外人看见。" }, "dialogue": { "key": "item_item_dialogue_142", @@ -7032,7 +7032,7 @@ }, "describe": { "key": "item_item_describe_143", - "text": "希卡普守护之心，可用于相应守护者的觉醒等级提升。" + "text": "广阔的天空，他拥有不输于他父亲的胸襟。" }, "dialogue": { "key": "item_item_dialogue_143", @@ -7079,7 +7079,7 @@ }, "describe": { "key": "item_item_describe_144", - "text": "漆黑守护之心，可用于相应守护者的觉醒等级提升。" + "text": "无形无色的黑雾，恐怖而绝望，虚无没有尽头。" }, "dialogue": { "key": "item_item_dialogue_144", @@ -7126,7 +7126,7 @@ }, "describe": { "key": "item_item_describe_145", - "text": "黛安·福克斯顿守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一个狡黠的媚眼，三道猩红的血爪。" }, "dialogue": { "key": "item_item_dialogue_145", @@ -7173,7 +7173,7 @@ }, "describe": { "key": "item_item_describe_146", - "text": "幸运·普雷斯科特守护之心，可用于相应守护者的觉醒等级提升。" + "text": "草莓，草莓，全是草莓，还有一匹马。" }, "dialogue": { "key": "item_item_dialogue_146", @@ -7220,7 +7220,7 @@ }, "describe": { "key": "item_item_describe_147", - "text": "平先生守护之心，可用于相应守护者的觉醒等级提升。" + "text": "好香啊！这味道令人食指大动，必须竭力控制自己才能不把它吞下去。" }, "dialogue": { "key": "item_item_dialogue_147", @@ -7267,7 +7267,7 @@ }, "describe": { "key": "item_item_describe_148", - "text": "阿比盖尔·斯通守护之心，可用于相应守护者的觉醒等级提升。" + "text": "两个金发小人在追逐，似乎是一个女孩在追她捣乱的弟弟。" }, "dialogue": { "key": "item_item_dialogue_148", @@ -7314,7 +7314,7 @@ }, "describe": { "key": "item_item_describe_149", - "text": "果酱教授守护之心，可用于相应守护者的觉醒等级提升。" + "text": "荣誉的光环围绕四周，你却从光辉中嗅到一丝阴谋的气息。" }, "dialogue": { "key": "item_item_dialogue_149", @@ -7361,7 +7361,7 @@ }, "describe": { "key": "item_item_describe_150", - "text": "史蒂夫·帕丘克守护之心，可用于相应守护者的觉醒等级提升。" + "text": "黄瓜蘸冰淇淋，给外星美女生孩子……真是令普通人望尘莫及的人生。" }, "dialogue": { "key": "item_item_dialogue_150", @@ -7408,7 +7408,7 @@ }, "describe": { "key": "item_item_describe_151", - "text": "姜饼人守护之心，可用于相应守护者的觉醒等级提升。" + "text": "铺天盖地的女姜饼人正将一栋小屋包围，嗯，好像看到了一段不愉快的回忆。" }, "dialogue": { "key": "item_item_dialogue_151", @@ -7455,7 +7455,7 @@ }, "describe": { "key": "item_item_describe_152", - "text": "瓦希尔指挥官守护之心，可用于相应守护者的觉醒等级提升。" + "text": "日复一日的操练，尽忠职守的指挥官。" }, "dialogue": { "key": "item_item_dialogue_152", @@ -7502,7 +7502,7 @@ }, "describe": { "key": "item_item_describe_153", - "text": "布里奇特守护之心，可用于相应守护者的觉醒等级提升。" + "text": "满满全是格里斯特王子的脸，还有一圈爱心围绕着。" }, "dialogue": { "key": "item_item_dialogue_153", @@ -7549,7 +7549,7 @@ }, "describe": { "key": "item_item_describe_154", - "text": "戈伯守护之心，可用于相应守护者的觉醒等级提升。" + "text": "骨碎龙，希卡普，龙宿舍，铁匠铺，闹事的病人……每一天都充满刺激和惊喜。" }, "dialogue": { "key": "item_item_dialogue_154", @@ -7596,7 +7596,7 @@ }, "describe": { "key": "item_item_describe_155", - "text": "美肚鲨守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一副蒙娜丽莎的微笑，但那微笑和记忆中似乎不太一样？" }, "dialogue": { "key": "item_item_dialogue_155", @@ -7643,7 +7643,7 @@ }, "describe": { "key": "item_item_describe_156", - "text": "蛇先生守护之心，可用于相应守护者的觉醒等级提升。" + "text": "这家伙嘴上不爱说，心里时时刻刻都是坏蛋联盟成员的笑脸。" }, "dialogue": { "key": "item_item_dialogue_156", @@ -7690,7 +7690,7 @@ }, "describe": { "key": "item_item_describe_157", - "text": "匹诺曹守护之心，可用于相应守护者的觉醒等级提升。" + "text": "木匠爷爷，一只蟋蟀，还有他那因为说谎而变得超级长的鼻子。" }, "dialogue": { "key": "item_item_dialogue_157", @@ -7737,7 +7737,7 @@ }, "describe": { "key": "item_item_describe_158", - "text": "骇客蛛守护之心，可用于相应守护者的觉醒等级提升。" + "text": "网站，网点，网址，密密麻麻交织的网。" }, "dialogue": { "key": "item_item_dialogue_158", @@ -7784,7 +7784,7 @@ }, "describe": { "key": "item_item_describe_159", - "text": "小伊守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一颗巨大的太阳，还有盖。" }, "dialogue": { "key": "item_item_dialogue_159", @@ -7831,7 +7831,7 @@ }, "describe": { "key": "item_item_describe_160", - "text": "悍娇虎守护之心，可用于相应守护者的觉醒等级提升。" + "text": "虎虎生风的威力，还有一股火辣的味道。" }, "dialogue": { "key": "item_item_dialogue_160", @@ -7878,7 +7878,7 @@ }, "describe": { "key": "item_item_describe_161", - "text": "乌龟大师守护之心，可用于相应守护者的觉醒等级提升。" + "text": "心如止水。" }, "dialogue": { "key": "item_item_dialogue_161", @@ -7925,7 +7925,7 @@ }, "describe": { "key": "item_item_describe_162", - "text": "梅林守护之心，可用于相应守护者的觉醒等级提升。" + "text": "驱散一切邪恶与黑暗的化身，追随光明的魔法奥义。" }, "dialogue": { "key": "item_item_dialogue_162", @@ -7972,7 +7972,7 @@ }, "describe": { "key": "item_item_describe_163", - "text": "盖守护之心，可用于相应守护者的觉醒等级提升。" + "text": "一颗巨大的太阳，还有小伊。" }, "dialogue": { "key": "item_item_dialogue_163", @@ -8019,7 +8019,7 @@ }, "describe": { "key": "item_item_describe_164", - "text": "穿靴子的猫守护之心，可用于相应守护者的觉醒等级提升。" + "text": "侠士总是来无影，去无踪，只留下一枝玫瑰。" }, "dialogue": { "key": "item_item_dialogue_164", @@ -15802,11 +15802,11 @@ }, "describe": { "key": "item_item_describe_329", - "text": "进入竞技场的凭证。" + "text": "这既是对实力的证明，也是试探。谁不想证明自己才是最正统的传承者呢？" }, "dialogue": { "key": "item_item_dialogue_327", - "text": "" + "text": "【这东西可不是谁都能获得的。】靴猫坏笑道。" }, "sale": [ { @@ -16930,7 +16930,7 @@ }, "describe": { "key": "item_item_describe_353", - "text": "在教授功夫时用来进行动作演示的工具。" + "text": "光秃秃的棍子，因为常年用来教习被使用者盘得十分光润。" }, "dialogue": { "key": "item_item_dialogue_351", @@ -16977,7 +16977,7 @@ }, "describe": { "key": "item_item_describe_354", - "text": "质地坚韧的云杉木，熊猫武馆升级木桩所需道具。" + "text": "质地坚韧的云杉木，可以在木匠手中很快变身成一个木偶。" }, "dialogue": { "key": "item_item_dialogue_352", @@ -17159,11 +17159,11 @@ }, "describe": { "key": "item_item_describe_358", - "text": "" + "text": "超高蛋白，可以提供一家人的营养所需。获取时稍有不慎会成为角鸟的营养所需。" }, "dialogue": { "key": "item_item_dialogue_356", - "text": "【快走，鸵鸟要发现了。】" + "text": "【快逃，角鸟要发现了！】" }, "sale": [ { @@ -17204,11 +17204,11 @@ }, "describe": { "key": "item_item_describe_359", - "text": "" + "text": "完美定格了神龙大侠深藏功与名的身姿，限量发售，先到先得。" }, "dialogue": { "key": "item_item_dialogue_357", - "text": "【没事不要吹海螺，坦克，说你呢！】" + "text": "【本周边唯一指定贩卖点为平先生面馆。】" }, "sale": [ { @@ -17249,11 +17249,11 @@ }, "describe": { "key": "item_item_describe_360", - "text": "" + "text": "纯黄金打造，眼睛用祖母绿镶嵌而成，价值连城的宝物。" }, "dialogue": { "key": "item_item_dialogue_358", - "text": "【霍普妈妈的精细手工，用过的人都不敢不说好。】" + "text": "【小道消息称，它是唯一没被血红爪偷走的宝物。】" }, "sale": [ { @@ -17294,7 +17294,7 @@ }, "describe": { "key": "item_item_describe_361", - "text": "" + "text": "纯天然鼻涕虫黏液制成，使用后会获得和史莱克一样绿莹莹的洁白牙齿。" }, "dialogue": { "key": "item_item_dialogue_359", @@ -17339,11 +17339,11 @@ }, "describe": { "key": "item_item_describe_362", - "text": "" + "text": "最强恶龙碎骨龙的骨片，只有那些最英勇的勇士才能获得。" }, "dialogue": { "key": "item_item_dialogue_360", - "text": "【秘诀是一点葱，就这么一点。阿宝，你学到了没有？】平先生笑着说。" + "text": "【当年我手持一把板斧，与它大战一天一夜……嗝！】戈伯说完打了个酒嗝。" }, "sale": [ { @@ -17384,11 +17384,11 @@ }, "describe": { "key": "item_item_describe_363", - "text": "" + "text": "名为马鞍，实际是龙鞍，为了避免龙骑士被龙甩下去而发明。" }, "dialogue": { "key": "item_item_dialogue_361", - "text": "【成为神龙大侠的最快途径。】" + "text": "【如果不想体会头朝下坠落三千里的滋味……就最好装上这个。】" }, "sale": [ { @@ -17429,11 +17429,11 @@ }, "describe": { "key": "item_item_describe_364", - "text": "" + "text": "六根闪闪发亮的彩色琴弦，正在合奏一首唯美的乐章。" }, "dialogue": { "key": "item_item_dialogue_362", - "text": "【限量发售，先到先得，售完即止。并附有神龙大侠亲笔签名。】" + "text": "【和而不同，才能演奏出最美妙的音乐。】" }, "sale": [ { @@ -17474,11 +17474,11 @@ }, "describe": { "key": "item_item_describe_365", - "text": "" + "text": "轻轻地嘬一口，便可从大人迅速变身穿着尿不湿咿咿呀呀的婴儿，宝贝公司的独门配方。" }, "dialogue": { "key": "item_item_dialogue_363", - "text": "【大红灯笼高高挂，节庆喜气到万家。】" + "text": "【你是想做永远的大人，还是想做一天的宝宝？】" }, "sale": [ { @@ -17519,7 +17519,7 @@ }, "describe": { "key": "item_item_describe_366", - "text": "" + "text": "滑稽的小丑服，将快乐带给别人，把悲伤留给自己。" }, "dialogue": { "key": "item_item_dialogue_364", @@ -17564,11 +17564,11 @@ }, "describe": { "key": "item_item_describe_367", - "text": "" + "text": "格尔族人研发的超级芯片，据说有个波波星人偷走了一块。" }, "dialogue": { "key": "item_item_dialogue_365", - "text": "【高贵中彰显不凡，没有人知道，这杯子是某个国王用来吐漱口水的。】" + "text": "【我没有偷！我只是刚好看见那艘坏掉的飞船。】小欧说道。" }, "sale": [ { @@ -17609,11 +17609,11 @@ }, "describe": { "key": "item_item_describe_368", - "text": "" + "text": "金碧辉煌的筒箱中，睡着一颗乳牙。这会是谁的记忆呢？" }, "dialogue": { "key": "item_item_dialogue_366", - "text": "【生日一点也不重要！一点也不！】蛇先生含着热泪笑着说。" + "text": "【这颗的牙的小主人从来没吃过糖，太难得了！】牙仙激动地说。" }, "sale": [ { @@ -17654,11 +17654,11 @@ }, "describe": { "key": "item_item_describe_369", - "text": "" + "text": "特别发行的纪念版徽章，一比一复刻，巨怪商队人手一个。" }, "dialogue": { "key": "item_item_dialogue_367", - "text": "【美肚鲨和蛇先生的挚爱，冰箱里必定要放上一根。】" + "text": "【多漂亮，它的齿轮还会转动呢。】" }, "sale": [ { @@ -17699,11 +17699,11 @@ }, "describe": { "key": "item_item_describe_370", - "text": "" + "text": "原始时代遗留的巨石，上面还能看见一些红色的涂鸦。" }, "dialogue": { "key": "item_item_dialogue_368", - "text": "【听说当年就是这块毯子让一个穷小子和公主喜结良缘。】" + "text": "【我的壁画怎么没了？！】瓜哥怒道。" }, "sale": [ { @@ -17744,11 +17744,11 @@ }, "describe": { "key": "item_item_describe_371", - "text": "" + "text": "一枝细小的生日蜡烛正在燃烧着，虽然不大，却承载着世间最美好的祝福。" }, "dialogue": { "key": "item_item_dialogue_369", - "text": "【其实它只会增强自信心，但要想获得幸福，为什么不能自信点呢？】" + "text": "【生日一点也不重要！一点也不！】蛇先生含着热泪笑着说。" }, "sale": [ { @@ -17789,11 +17789,11 @@ }, "describe": { "key": "item_item_describe_372", - "text": "" + "text": "丰盛诱人的热带水果，躺在沙滩上，与伙伴们一起享受吧。" }, "dialogue": { "key": "item_item_dialogue_370", - "text": "【打起手鼓唱起歌，骑着贫嘴驴翻山坡。】" + "text": "【比起高高在上的水晶盆，还是藤篮更适合水果。】" }, "sale": [ { @@ -17834,11 +17834,11 @@ }, "describe": { "key": "item_item_describe_373", - "text": "" + "text": "雕饰华丽的宫廷高脚杯，珍藏的葡萄美酒必得要它来配。" }, "dialogue": { "key": "item_item_dialogue_371", - "text": "【我能说出你心中所想，等等，你把油漆拿来做什么？】魔镜惊恐地说道。" + "text": "【红酒装在木杯里是生活，装在玻璃杯里是享受的艺术。】" }, "sale": [ { @@ -17879,11 +17879,11 @@ }, "describe": { "key": "item_item_describe_374", - "text": "" + "text": "一根棒棒糖，酸中带甜，在口中不断变换。" }, "dialogue": { "key": "item_item_dialogue_372", - "text": "【又叫驯养龙族指南，每个铲屎官都有一本。】" + "text": "【有的人并不是真的在抽烟，只是吮棒棒糖太用力尾部冒烟了。】" }, "sale": [ { @@ -17924,11 +17924,11 @@ }, "describe": { "key": "item_item_describe_375", - "text": "" + "text": "岩洞天然形成的晶石，在人类诞生之前，就已经存在。" }, "dialogue": { "key": "item_item_dialogue_373", - "text": "【放心，原材料来自于一位可爱小龙脱落的乳牙。】" + "text": "【如果有人可以听到我说话，我想说，让我呆在原地好吗？】晶石说道。" }, "sale": [ { @@ -17969,11 +17969,11 @@ }, "describe": { "key": "item_item_describe_376", - "text": "" + "text": "白雪公主在逃跑，彼得潘总长不大……太多故事组成了童年的美好回忆。" }, "dialogue": { "key": "item_item_dialogue_374", - "text": "【箭头涂毒，小小的一支就可以让龙昏睡好几天。】" + "text": "【童话里公主一定会嫁给王子？也有可能嫁给一个怪物。】" }, "sale": [ { @@ -18014,11 +18014,11 @@ }, "describe": { "key": "item_item_describe_377", - "text": "" + "text": "这个木桶因为装过太多东西，闻起来十分动人：牛奶味，酒味，火药味，袜子味……" }, "dialogue": { "key": "item_item_dialogue_375", - "text": "【如果不想体会头朝下坠落三千里的滋味……就最好装上这个。】" + "text": "【其实，我并不喜欢橡木塞子，那很不舒服。】木桶说道。" }, "sale": [ { @@ -18059,11 +18059,11 @@ }, "describe": { "key": "item_item_describe_378", - "text": "" + "text": "饱经风霜的盾牌，上面有数之不尽的战斗痕迹，这些是它光荣过往的证明。" }, "dialogue": { "key": "item_item_dialogue_376", - "text": "" + "text": "【保护人是我的职责，但我只能尽量做到，尽量。】盾牌说道。" }, "sale": [ { @@ -18104,11 +18104,11 @@ }, "describe": { "key": "item_item_describe_379", - "text": "" + "text": "找一处安静的湖边，找两颗结实的树，捆绑好，躺上去，度过一个美妙的午后。" }, "dialogue": { "key": "item_item_dialogue_377", - "text": "" + "text": "【听说有个熊猫把竹吊床压塌了。】" }, "sale": [ { @@ -18149,11 +18149,11 @@ }, "describe": { "key": "item_item_describe_380", - "text": "" + "text": "系上溜冰鞋的带子，低调地开始滑行，然后高调地制霸溜冰场。" }, "dialogue": { "key": "item_item_dialogue_378", - "text": "" + "text": "【本国的国王和王后就是在下撮合的。】其中一双溜冰鞋说道。" }, "sale": [ { @@ -18194,11 +18194,11 @@ }, "describe": { "key": "item_item_describe_381", - "text": "" + "text": "奶油在舌尖融化的刹那，在炎炎夏日中感受久违的清凉。" }, "dialogue": { "key": "item_item_dialogue_379", - "text": "" + "text": "【没有人能拒绝一支冰淇淋，如果不行就再来一支！】" }, "sale": [ { @@ -18239,11 +18239,11 @@ }, "describe": { "key": "item_item_describe_382", - "text": "" + "text": "精准地一击即中，它总能得到它想要的猎物。" }, "dialogue": { "key": "item_item_dialogue_380", - "text": "" + "text": "【箭头涂毒，小小的一支就可以让龙昏睡好几天。】" }, "sale": [ { @@ -18284,11 +18284,11 @@ }, "describe": { "key": "item_item_describe_383", - "text": "" + "text": "钢琴曲有可能是月光也有可能是波西米亚狂想曲，弹奏者有可能是绅士也有可能是江洋大盗。" }, "dialogue": { "key": "item_item_dialogue_381", - "text": "此处是包装描述" + "text": "【沃尔夫，你能听懂这支曲子的意思吗？】戴安狐演奏致爱丽丝，玩味地笑着。" }, "sale": [ { @@ -18329,11 +18329,11 @@ }, "describe": { "key": "item_item_describe_384", - "text": "" + "text": "排齿尖尖，大口朝天。隐于草内，请君笑纳。" }, "dialogue": { "key": "item_item_dialogue_382", - "text": "此处是包装描述" + "text": "【小心，如果安装不仔细，它会瞬间吃掉你的手臂。】" }, "sale": [ { @@ -18374,11 +18374,11 @@ }, "describe": { "key": "item_item_describe_385", - "text": "" + "text": "“小红帽投诉邻居史莱克夫妇。”“血红爪重出江湖……”可以看到全宇宙琐事的神奇报纸。" }, "dialogue": { "key": "item_item_dialogue_383", - "text": "此处是包装描述" + "text": "【角落里有行不起眼的小字：灰姑娘姐姐的征婚启事。】" }, "sale": [ { @@ -18419,11 +18419,11 @@ }, "describe": { "key": "item_item_describe_386", - "text": "" + "text": "咚咚咚，蹦蹦蹦，哒哒哒，咚哒咚哒咚咚哒。" }, "dialogue": { "key": "item_item_dialogue_384", - "text": "此处是包装描述" + "text": "【啪哒啪哒啪哒。】" }, "sale": [ { @@ -18464,11 +18464,11 @@ }, "describe": { "key": "item_item_describe_387", - "text": "" + "text": "获取途径成谜的珍惜物品，据说买卖的人在监狱里踩了一辈子缝纫机。" }, "dialogue": { "key": "item_item_dialogue_385", - "text": "此处是包装描述" + "text": "【我不会告诉你，黑市里这玩意大部分是假货。】" }, "sale": [ { @@ -18509,11 +18509,11 @@ }, "describe": { "key": "item_item_describe_388", - "text": "" + "text": "岩层中开采出的稀有铁矿，其貌不扬，质地坚韧，可以制成各种铁器。" }, "dialogue": { "key": "item_item_dialogue_386", - "text": "此处是包装描述" + "text": "【这玩意不好弄到，得加钱。】商队成员说道。" }, "sale": [ { @@ -18554,11 +18554,11 @@ }, "describe": { "key": "item_item_describe_389", - "text": "" + "text": "红的蓝的紫的绿的黄的……梦幻轻盈的，飘然易碎的，童真的，幻想的。" }, "dialogue": { "key": "item_item_dialogue_387", - "text": "此处是包装描述" + "text": "【飘进爱里，飘进心里。】" }, "sale": [ { @@ -18599,11 +18599,11 @@ }, "describe": { "key": "item_item_describe_390", - "text": "" + "text": "原始社会最常见的货币，在搁浅的沙滩上很容易找到它。光滑小巧的个头方便携带，又受人们喜爱。" }, "dialogue": { "key": "item_item_dialogue_388", - "text": "此处是包装描述" + "text": "【别捡太多扇贝！要捡这种光滑的螺贝，这种才能用来交易。】" }, "sale": [ { @@ -18644,11 +18644,11 @@ }, "describe": { "key": "item_item_describe_391", - "text": "" + "text": "迷宫中的美丽水晶，波澜浮光的棕红，是石洞天然形成的瑰宝。它拥有特殊的能量，将它握在手中，能使感官大幅度增强。（注意要和巨怪商队中的画的不一样）" }, "dialogue": { "key": "item_item_dialogue_389", - "text": "此处是包装描述" + "text": "【握紧它，静静感受它的变化。】" }, "sale": [ { @@ -18689,11 +18689,11 @@ }, "describe": { "key": "item_item_describe_392", - "text": "" + "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。" }, "dialogue": { "key": "item_item_dialogue_390", - "text": "此处是包装描述" + "text": "【这种螺贝非常稀有，且用且珍惜。 】" }, "sale": [ { @@ -18820,11 +18820,11 @@ "img": "wp_icon_jjcq", "intr": { "key": "item_item_intr_395", - "text": "可用于拼图游戏中完成拼图游戏" + "text": "可用于拼图游戏中完成拼图游戏。" }, "describe": { "key": "item_item_describe_395", - "text": "" + "text": "碎片虽小，窥一斑而知全豹。" }, "dialogue": { "key": "item_item_dialogue_393", @@ -18865,15 +18865,15 @@ "img": "wp_icon_jjcq", "intr": { "key": "item_item_intr_396", - "text": "可用于云上行走游戏中" + "text": "可用于云上行走游戏中。" }, "describe": { "key": "item_item_describe_396", - "text": "" + "text": "涂抹在脚底板，在云朵上体验平地上行走的快乐。" }, "dialogue": { "key": "item_item_dialogue_394", - "text": "" + "text": "【涂得太多了会粘在云上哦！】云朵先生严肃说道。" }, "sale": [ { @@ -18910,11 +18910,11 @@ "img": "wp_icon_jjcq", "intr": { "key": "item_item_intr_397", - "text": "可用于黄金矿工游戏中" + "text": "可用于黄金矿工游戏中。" }, "describe": { "key": "item_item_describe_397", - "text": "" + "text": "黄金弥足珍贵，挖掘机会渺茫，且挖且珍惜。" }, "dialogue": { "key": "item_item_dialogue_395", @@ -18955,15 +18955,15 @@ "img": "item_10000035", "intr": { "key": "item_item_intr_398", - "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。" + "text": "可用于开启石阵秘境宝箱。" }, "describe": { "key": "item_item_describe_398", - "text": "" + "text": "一流的开锁者往往只需要一根毛，海豹鸡身上的一小撮毛。 圆滑的触感，锋利的尾端，看似平平无奇，却暗藏玄机。" }, "dialogue": { "key": "item_item_dialogue_396", - "text": "此处是包装描述" + "text": "【想要获得钥匙，就要做好耳聋的心理准备。】" }, "sale": [ { @@ -19000,11 +19000,11 @@ "img": "", "intr": { "key": "item_item_intr_399", - "text": "可以从中自由选择3种属性招募卷的宝箱" + "text": "可以从中自由选择3种属性招募卷的宝箱。" }, "describe": { "key": "item_item_describe_399", - "text": "" + "text": "自由选择，完全自由。" }, "dialogue": { "key": "item_item_dialogue_397", diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 11e48f8c7..1519a607d 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -2260,7 +2260,7 @@ "previous_group_id": [ 100120 ], - "previoustage": 1100116, + "previoustage": 1100125, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -2371,7 +2371,7 @@ "previous_group_id": [ 100120 ], - "previoustage": 1100117, + "previoustage": 1100126, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -2482,7 +2482,7 @@ "previous_group_id": [ 100120 ], - "previoustage": 1100118, + "previoustage": 1100127, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -2593,7 +2593,7 @@ "previous_group_id": [ 100120 ], - "previoustage": 1100119, + "previoustage": 1100128, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -2704,7 +2704,7 @@ "previous_group_id": [ 100120 ], - "previoustage": 1100120, + "previoustage": 1100129, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -2815,7 +2815,7 @@ "previous_group_id": [ 100120 ], - "previoustage": 1100121, + "previoustage": 1100130, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -2926,7 +2926,7 @@ "previous_group_id": [ 100120 ], - "previoustage": 1100122, + "previoustage": 1100131, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -3148,7 +3148,7 @@ "previous_group_id": [ 100121 ], - "previoustage": 1100124, + "previoustage": 1100133, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -3259,7 +3259,7 @@ "previous_group_id": [ 100121 ], - "previoustage": 1100125, + "previoustage": 1100134, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -3370,7 +3370,7 @@ "previous_group_id": [ 100121 ], - "previoustage": 1100126, + "previoustage": 1100135, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -3481,7 +3481,7 @@ "previous_group_id": [ 100121 ], - "previoustage": 1100127, + "previoustage": 1100136, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -3592,7 +3592,7 @@ "previous_group_id": [ 100121 ], - "previoustage": 1100128, + "previoustage": 1100137, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -3703,7 +3703,7 @@ "previous_group_id": [ 100121 ], - "previoustage": 1100129, + "previoustage": 1100138, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -3814,7 +3814,7 @@ "previous_group_id": [ 100121 ], - "previoustage": 1100130, + "previoustage": 1100139, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -4036,7 +4036,7 @@ "previous_group_id": [ 100122 ], - "previoustage": 1100132, + "previoustage": 1100141, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -4147,7 +4147,7 @@ "previous_group_id": [ 100122 ], - "previoustage": 1100133, + "previoustage": 1100142, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -4258,7 +4258,7 @@ "previous_group_id": [ 100122 ], - "previoustage": 1100134, + "previoustage": 1100143, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -4369,7 +4369,7 @@ "previous_group_id": [ 100122 ], - "previoustage": 1100135, + "previoustage": 1100144, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -4480,7 +4480,7 @@ "previous_group_id": [ 100122 ], - "previoustage": 1100136, + "previoustage": 1100145, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -4591,7 +4591,7 @@ "previous_group_id": [ 100122 ], - "previoustage": 1100137, + "previoustage": 1100146, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -4702,7 +4702,7 @@ "previous_group_id": [ 100122 ], - "previoustage": 1100138, + "previoustage": 1100147, "Episodetype": 8, "openlevel": 1, "EditorStage": 0, @@ -5645,7 +5645,7 @@ "previous_group_id": [ 100129 ], - "previoustage": 1100150, + "previoustage": 1100159, "Episodetype": 4, "openlevel": 1, "EditorStage": 0, @@ -5756,7 +5756,7 @@ "previous_group_id": [ 100129 ], - "previoustage": 1100151, + "previoustage": 1100160, "Episodetype": 4, "openlevel": 1, "EditorStage": 0, @@ -5867,7 +5867,7 @@ "previous_group_id": [ 100129 ], - "previoustage": 1100152, + "previoustage": 1100161, "Episodetype": 4, "openlevel": 1, "EditorStage": 0, @@ -5978,7 +5978,7 @@ "previous_group_id": [ 100129 ], - "previoustage": 1100153, + "previoustage": 1100162, "Episodetype": 4, "openlevel": 1, "EditorStage": 0, @@ -6089,7 +6089,7 @@ "previous_group_id": [ 100129 ], - "previoustage": 1100154, + "previoustage": 1100163, "Episodetype": 4, "openlevel": 1, "EditorStage": 0, @@ -6200,7 +6200,7 @@ "previous_group_id": [ 100129 ], - "previoustage": 1100155, + "previoustage": 1100164, "Episodetype": 4, "openlevel": 1, "EditorStage": 0, diff --git a/bin/json/game_playerlv.json b/bin/json/game_playerlv.json index b8086093d..e361869e7 100644 --- a/bin/json/game_playerlv.json +++ b/bin/json/game_playerlv.json @@ -970,7 +970,7 @@ }, { "lv": 50, - "exp": 4300, + "exp": 0, "reward": [ { "a": "attr", diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json index 38cb35cd6..49c1f42ae 100644 --- a/bin/json/game_recharge.json +++ b/bin/json/game_recharge.json @@ -1,6 +1,7 @@ [ { "id": "gold6", + "pid": 1, "editionid": "debug", "recharge_type": 1, "monetaryunit": "￥", @@ -27,6 +28,7 @@ }, { "id": "gold30", + "pid": 2, "editionid": "debug", "recharge_type": 1, "monetaryunit": "￥", @@ -53,6 +55,7 @@ }, { "id": "gold68", + "pid": 3, "editionid": "debug", "recharge_type": 1, "monetaryunit": "￥", @@ -79,6 +82,7 @@ }, { "id": "gold128", + "pid": 4, "editionid": "debug", "recharge_type": 1, "monetaryunit": "￥", @@ -105,6 +109,7 @@ }, { "id": "gold198", + "pid": 5, "editionid": "debug", "recharge_type": 1, "monetaryunit": "￥", @@ -131,6 +136,7 @@ }, { "id": "gold328", + "pid": 6, "editionid": "debug", "recharge_type": 1, "monetaryunit": "￥", @@ -157,6 +163,7 @@ }, { "id": "gold448", + "pid": 7, "editionid": "debug", "recharge_type": 1, "monetaryunit": "￥", @@ -183,6 +190,7 @@ }, { "id": "gold648", + "pid": 8, "editionid": "debug", "recharge_type": 1, "monetaryunit": "￥", @@ -209,6 +217,7 @@ }, { "id": "lb6_1", + "pid": 9, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -223,6 +232,7 @@ }, { "id": "day_1", + "pid": 10, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -237,6 +247,7 @@ }, { "id": "day_2", + "pid": 11, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -251,6 +262,7 @@ }, { "id": "day_3", + "pid": 12, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -265,6 +277,7 @@ }, { "id": "day_4", + "pid": 13, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -279,6 +292,7 @@ }, { "id": "week_1", + "pid": 14, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -293,6 +307,7 @@ }, { "id": "week_2", + "pid": 15, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -307,6 +322,7 @@ }, { "id": "week_3", + "pid": 16, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -321,6 +337,7 @@ }, { "id": "week_4", + "pid": 17, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -335,6 +352,7 @@ }, { "id": "week_5", + "pid": 18, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -349,6 +367,7 @@ }, { "id": "week_6", + "pid": 19, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -363,6 +382,7 @@ }, { "id": "month_1", + "pid": 20, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -377,6 +397,7 @@ }, { "id": "month_2", + "pid": 21, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -391,6 +412,7 @@ }, { "id": "month_3", + "pid": 22, "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", @@ -405,6 +427,7 @@ }, { "id": "yueka_lv1", + "pid": 23, "editionid": "debug", "recharge_type": 3, "monetaryunit": "￥", @@ -425,6 +448,7 @@ }, { "id": "yueka_lv2", + "pid": 24, "editionid": "debug", "recharge_type": 3, "monetaryunit": "￥", @@ -445,6 +469,7 @@ }, { "id": "passcheck_1", + "pid": 25, "editionid": "debug", "recharge_type": 4, "monetaryunit": "￥", @@ -459,6 +484,7 @@ }, { "id": "passcheck_2", + "pid": 26, "editionid": "debug", "recharge_type": 4, "monetaryunit": "￥", @@ -473,6 +499,7 @@ }, { "id": "drawcard_pack1", + "pid": 27, "editionid": "debug", "recharge_type": 5, "monetaryunit": "￥", @@ -487,6 +514,7 @@ }, { "id": "passcheck_3", + "pid": 28, "editionid": "debug", "recharge_type": 4, "monetaryunit": "￥", @@ -501,6 +529,7 @@ }, { "id": "passcheck_4", + "pid": 29, "editionid": "debug", "recharge_type": 4, "monetaryunit": "￥", @@ -515,6 +544,7 @@ }, { "id": "fund_1", + "pid": 30, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -529,6 +559,7 @@ }, { "id": "fund_2", + "pid": 31, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -543,6 +574,7 @@ }, { "id": "fund_3", + "pid": 32, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -557,6 +589,7 @@ }, { "id": "fund_4", + "pid": 33, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -571,6 +604,7 @@ }, { "id": "fund_5", + "pid": 34, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -585,6 +619,7 @@ }, { "id": "fund_6", + "pid": 35, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -599,6 +634,7 @@ }, { "id": "fund_7", + "pid": 36, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -613,6 +649,7 @@ }, { "id": "fund_8", + "pid": 37, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -627,6 +664,7 @@ }, { "id": "fund_9", + "pid": 38, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -641,6 +679,7 @@ }, { "id": "fund_10", + "pid": 39, "editionid": "debug", "recharge_type": 6, "monetaryunit": "￥", @@ -655,6 +694,7 @@ }, { "id": "drawcard_pack2", + "pid": 40, "editionid": "debug", "recharge_type": 5, "monetaryunit": "￥", @@ -669,6 +709,7 @@ }, { "id": "drawcard_pack3", + "pid": 41, "editionid": "debug", "recharge_type": 5, "monetaryunit": "￥", @@ -683,6 +724,7 @@ }, { "id": "drawcard_pack4", + "pid": 42, "editionid": "debug", "recharge_type": 5, "monetaryunit": "￥", @@ -697,6 +739,7 @@ }, { "id": "passcheckPro_4", + "pid": 43, "editionid": "debug", "recharge_type": 4, "monetaryunit": "￥", @@ -723,6 +766,7 @@ }, { "id": "passcheckMid_4", + "pid": 44, "editionid": "debug", "recharge_type": 4, "monetaryunit": "￥", @@ -749,6 +793,7 @@ }, { "id": "push_gift_1", + "pid": 45, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -763,6 +808,7 @@ }, { "id": "push_gift_2", + "pid": 46, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -777,6 +823,7 @@ }, { "id": "push_gift_3", + "pid": 47, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -791,6 +838,7 @@ }, { "id": "push_gift_4", + "pid": 48, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -805,6 +853,7 @@ }, { "id": "push_gift_5", + "pid": 49, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -819,6 +868,7 @@ }, { "id": "push_gift_6", + "pid": 50, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -833,6 +883,7 @@ }, { "id": "push_gift_7", + "pid": 51, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -847,6 +898,7 @@ }, { "id": "push_gift_8", + "pid": 52, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -861,6 +913,7 @@ }, { "id": "push_gift_9", + "pid": 53, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -875,6 +928,7 @@ }, { "id": "push_gift_10", + "pid": 54, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -889,6 +943,7 @@ }, { "id": "push_gift_11", + "pid": 55, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", @@ -903,6 +958,7 @@ }, { "id": "push_gift_12", + "pid": 56, "editionid": "debug", "recharge_type": 7, "monetaryunit": "￥", diff --git a/modules/guildgve/api_info.go b/modules/guildgve/api_info.go index 76405a47c..e5ca44341 100644 --- a/modules/guildgve/api_info.go +++ b/modules/guildgve/api_info.go @@ -71,6 +71,6 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.GuildGveInfoReq) (e } return } - session.SendMsg(string(this.module.GetType()), "info", &pb.GuildGveInfoResp{Info: info, Boosticket: member.Boosticket, Records: roulette.Roulette}) + session.SendMsg(string(this.module.GetType()), "info", &pb.GuildGveInfoResp{Info: info, Useheros: member.Useheros, Boosticket: member.Boosticket, Records: roulette.Roulette}) return } diff --git a/modules/pay/module.go b/modules/pay/module.go index 83e56e5e6..38123461e 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -200,8 +200,11 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery return } } + go func() { + this.ModuleHero.RechargeMoney(args.Uid, args.Price) + this.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype229, 1, conf.Pid)) + }() - go this.ModuleHero.RechargeMoney(args.Uid, args.Price) return } diff --git a/pb/comm.pb.go b/pb/comm.pb.go index 7a9c1964b..ba5f60cb1 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -164,6 +164,54 @@ func (x *ErrorData) GetMessage() string { return "" } +//集合包 +type MessagePackage struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Messages []*UserMessage `protobuf:"bytes,1,rep,name=messages,proto3" json:"messages"` +} + +func (x *MessagePackage) Reset() { + *x = MessagePackage{} + if protoimpl.UnsafeEnabled { + mi := &file_comm_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MessagePackage) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MessagePackage) ProtoMessage() {} + +func (x *MessagePackage) ProtoReflect() protoreflect.Message { + mi := &file_comm_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use MessagePackage.ProtoReflect.Descriptor instead. +func (*MessagePackage) Descriptor() ([]byte, []int) { + return file_comm_proto_rawDescGZIP(), []int{1} +} + +func (x *MessagePackage) GetMessages() []*UserMessage { + if x != nil { + return x.Messages + } + return nil +} + //用户消息流结构1 type UserMessage struct { state protoimpl.MessageState @@ -182,7 +230,7 @@ type UserMessage struct { func (x *UserMessage) Reset() { *x = UserMessage{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[1] + mi := &file_comm_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -195,7 +243,7 @@ func (x *UserMessage) String() string { func (*UserMessage) ProtoMessage() {} func (x *UserMessage) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[1] + mi := &file_comm_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -208,7 +256,7 @@ func (x *UserMessage) ProtoReflect() protoreflect.Message { // Deprecated: Use UserMessage.ProtoReflect.Descriptor instead. func (*UserMessage) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{1} + return file_comm_proto_rawDescGZIP(), []int{2} } func (x *UserMessage) GetMsgId() uint32 { @@ -272,7 +320,7 @@ type AgentMessage struct { func (x *AgentMessage) Reset() { *x = AgentMessage{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[2] + mi := &file_comm_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -285,7 +333,7 @@ func (x *AgentMessage) String() string { func (*AgentMessage) ProtoMessage() {} func (x *AgentMessage) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[2] + mi := &file_comm_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -298,7 +346,7 @@ func (x *AgentMessage) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentMessage.ProtoReflect.Descriptor instead. func (*AgentMessage) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{2} + return file_comm_proto_rawDescGZIP(), []int{3} } func (x *AgentMessage) GetIp() string { @@ -370,7 +418,7 @@ type RPCMessageReply struct { func (x *RPCMessageReply) Reset() { *x = RPCMessageReply{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[3] + mi := &file_comm_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -383,7 +431,7 @@ func (x *RPCMessageReply) String() string { func (*RPCMessageReply) ProtoMessage() {} func (x *RPCMessageReply) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[3] + mi := &file_comm_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -396,7 +444,7 @@ func (x *RPCMessageReply) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCMessageReply.ProtoReflect.Descriptor instead. func (*RPCMessageReply) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{3} + return file_comm_proto_rawDescGZIP(), []int{4} } func (x *RPCMessageReply) GetErrorData() *ErrorData { @@ -427,7 +475,7 @@ type AgentBuildReq struct { func (x *AgentBuildReq) Reset() { *x = AgentBuildReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[4] + mi := &file_comm_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -440,7 +488,7 @@ func (x *AgentBuildReq) String() string { func (*AgentBuildReq) ProtoMessage() {} func (x *AgentBuildReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[4] + mi := &file_comm_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -453,7 +501,7 @@ func (x *AgentBuildReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentBuildReq.ProtoReflect.Descriptor instead. func (*AgentBuildReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{4} + return file_comm_proto_rawDescGZIP(), []int{5} } func (x *AgentBuildReq) GetUserSessionId() string { @@ -489,7 +537,7 @@ type AgentUnBuildReq struct { func (x *AgentUnBuildReq) Reset() { *x = AgentUnBuildReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[5] + mi := &file_comm_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -502,7 +550,7 @@ func (x *AgentUnBuildReq) String() string { func (*AgentUnBuildReq) ProtoMessage() {} func (x *AgentUnBuildReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[5] + mi := &file_comm_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -515,7 +563,7 @@ func (x *AgentUnBuildReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentUnBuildReq.ProtoReflect.Descriptor instead. func (*AgentUnBuildReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{5} + return file_comm_proto_rawDescGZIP(), []int{6} } func (x *AgentUnBuildReq) GetUserSessionId() string { @@ -538,7 +586,7 @@ type AgentSendMessageReq struct { func (x *AgentSendMessageReq) Reset() { *x = AgentSendMessageReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[6] + mi := &file_comm_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -551,7 +599,7 @@ func (x *AgentSendMessageReq) String() string { func (*AgentSendMessageReq) ProtoMessage() {} func (x *AgentSendMessageReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[6] + mi := &file_comm_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -564,7 +612,7 @@ func (x *AgentSendMessageReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentSendMessageReq.ProtoReflect.Descriptor instead. func (*AgentSendMessageReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{6} + return file_comm_proto_rawDescGZIP(), []int{7} } func (x *AgentSendMessageReq) GetUserSessionId() string { @@ -596,7 +644,7 @@ type BatchMessageReq struct { func (x *BatchMessageReq) Reset() { *x = BatchMessageReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[7] + mi := &file_comm_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -609,7 +657,7 @@ func (x *BatchMessageReq) String() string { func (*BatchMessageReq) ProtoMessage() {} func (x *BatchMessageReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[7] + mi := &file_comm_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -622,7 +670,7 @@ func (x *BatchMessageReq) ProtoReflect() protoreflect.Message { // Deprecated: Use BatchMessageReq.ProtoReflect.Descriptor instead. func (*BatchMessageReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{7} + return file_comm_proto_rawDescGZIP(), []int{8} } func (x *BatchMessageReq) GetUserSessionIds() []string { @@ -667,7 +715,7 @@ type BroadCastMessageReq struct { func (x *BroadCastMessageReq) Reset() { *x = BroadCastMessageReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[8] + mi := &file_comm_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -680,7 +728,7 @@ func (x *BroadCastMessageReq) String() string { func (*BroadCastMessageReq) ProtoMessage() {} func (x *BroadCastMessageReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[8] + mi := &file_comm_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -693,7 +741,7 @@ func (x *BroadCastMessageReq) ProtoReflect() protoreflect.Message { // Deprecated: Use BroadCastMessageReq.ProtoReflect.Descriptor instead. func (*BroadCastMessageReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{8} + return file_comm_proto_rawDescGZIP(), []int{9} } func (x *BroadCastMessageReq) GetMainType() string { @@ -729,7 +777,7 @@ type AgentCloseeReq struct { func (x *AgentCloseeReq) Reset() { *x = AgentCloseeReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[9] + mi := &file_comm_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -742,7 +790,7 @@ func (x *AgentCloseeReq) String() string { func (*AgentCloseeReq) ProtoMessage() {} func (x *AgentCloseeReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[9] + mi := &file_comm_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -755,7 +803,7 @@ func (x *AgentCloseeReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentCloseeReq.ProtoReflect.Descriptor instead. func (*AgentCloseeReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{9} + return file_comm_proto_rawDescGZIP(), []int{10} } func (x *AgentCloseeReq) GetUserSessionId() string { @@ -781,7 +829,7 @@ type NoticeUserLoginReq struct { func (x *NoticeUserLoginReq) Reset() { *x = NoticeUserLoginReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[10] + mi := &file_comm_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -794,7 +842,7 @@ func (x *NoticeUserLoginReq) String() string { func (*NoticeUserLoginReq) ProtoMessage() {} func (x *NoticeUserLoginReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[10] + mi := &file_comm_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -807,7 +855,7 @@ func (x *NoticeUserLoginReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NoticeUserLoginReq.ProtoReflect.Descriptor instead. func (*NoticeUserLoginReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{10} + return file_comm_proto_rawDescGZIP(), []int{11} } func (x *NoticeUserLoginReq) GetIp() string { @@ -861,7 +909,7 @@ type NoticeUserCreateReq struct { func (x *NoticeUserCreateReq) Reset() { *x = NoticeUserCreateReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[11] + mi := &file_comm_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -874,7 +922,7 @@ func (x *NoticeUserCreateReq) String() string { func (*NoticeUserCreateReq) ProtoMessage() {} func (x *NoticeUserCreateReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[11] + mi := &file_comm_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -887,7 +935,7 @@ func (x *NoticeUserCreateReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NoticeUserCreateReq.ProtoReflect.Descriptor instead. func (*NoticeUserCreateReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{11} + return file_comm_proto_rawDescGZIP(), []int{12} } func (x *NoticeUserCreateReq) GetIp() string { @@ -941,7 +989,7 @@ type NoticeUserCloseReq struct { func (x *NoticeUserCloseReq) Reset() { *x = NoticeUserCloseReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[12] + mi := &file_comm_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -954,7 +1002,7 @@ func (x *NoticeUserCloseReq) String() string { func (*NoticeUserCloseReq) ProtoMessage() {} func (x *NoticeUserCloseReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[12] + mi := &file_comm_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -967,7 +1015,7 @@ func (x *NoticeUserCloseReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NoticeUserCloseReq.ProtoReflect.Descriptor instead. func (*NoticeUserCloseReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{12} + return file_comm_proto_rawDescGZIP(), []int{13} } func (x *NoticeUserCloseReq) GetIp() string { @@ -1017,7 +1065,7 @@ type SkillData struct { func (x *SkillData) Reset() { *x = SkillData{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[13] + mi := &file_comm_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1030,7 +1078,7 @@ func (x *SkillData) String() string { func (*SkillData) ProtoMessage() {} func (x *SkillData) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[13] + mi := &file_comm_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1043,7 +1091,7 @@ func (x *SkillData) ProtoReflect() protoreflect.Message { // Deprecated: Use SkillData.ProtoReflect.Descriptor instead. func (*SkillData) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{13} + return file_comm_proto_rawDescGZIP(), []int{14} } func (x *SkillData) GetSkillID() int32 { @@ -1074,7 +1122,7 @@ type UserAssets struct { func (x *UserAssets) Reset() { *x = UserAssets{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[14] + mi := &file_comm_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1087,7 +1135,7 @@ func (x *UserAssets) String() string { func (*UserAssets) ProtoMessage() {} func (x *UserAssets) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[14] + mi := &file_comm_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1100,7 +1148,7 @@ func (x *UserAssets) ProtoReflect() protoreflect.Message { // Deprecated: Use UserAssets.ProtoReflect.Descriptor instead. func (*UserAssets) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{14} + return file_comm_proto_rawDescGZIP(), []int{15} } func (x *UserAssets) GetA() string { @@ -1139,7 +1187,7 @@ type UserAtno struct { func (x *UserAtno) Reset() { *x = UserAtno{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[15] + mi := &file_comm_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1152,7 +1200,7 @@ func (x *UserAtno) String() string { func (*UserAtno) ProtoMessage() {} func (x *UserAtno) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[15] + mi := &file_comm_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1165,7 +1213,7 @@ func (x *UserAtno) ProtoReflect() protoreflect.Message { // Deprecated: Use UserAtno.ProtoReflect.Descriptor instead. func (*UserAtno) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{15} + return file_comm_proto_rawDescGZIP(), []int{16} } func (x *UserAtno) GetA() string { @@ -1208,7 +1256,7 @@ type TaskParam struct { func (x *TaskParam) Reset() { *x = TaskParam{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[16] + mi := &file_comm_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1221,7 +1269,7 @@ func (x *TaskParam) String() string { func (*TaskParam) ProtoMessage() {} func (x *TaskParam) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[16] + mi := &file_comm_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1234,7 +1282,7 @@ func (x *TaskParam) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskParam.ProtoReflect.Descriptor instead. func (*TaskParam) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{16} + return file_comm_proto_rawDescGZIP(), []int{17} } func (x *TaskParam) GetFirst() int32 { @@ -1264,7 +1312,7 @@ type RtaskParam struct { func (x *RtaskParam) Reset() { *x = RtaskParam{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[17] + mi := &file_comm_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1277,7 +1325,7 @@ func (x *RtaskParam) String() string { func (*RtaskParam) ProtoMessage() {} func (x *RtaskParam) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[17] + mi := &file_comm_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1290,7 +1338,7 @@ func (x *RtaskParam) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskParam.ProtoReflect.Descriptor instead. func (*RtaskParam) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{17} + return file_comm_proto_rawDescGZIP(), []int{18} } func (x *RtaskParam) GetParam1() int32 { @@ -1325,7 +1373,7 @@ type UIdReq struct { func (x *UIdReq) Reset() { *x = UIdReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[18] + mi := &file_comm_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1338,7 +1386,7 @@ func (x *UIdReq) String() string { func (*UIdReq) ProtoMessage() {} func (x *UIdReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[18] + mi := &file_comm_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1351,7 +1399,7 @@ func (x *UIdReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UIdReq.ProtoReflect.Descriptor instead. func (*UIdReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{18} + return file_comm_proto_rawDescGZIP(), []int{19} } func (x *UIdReq) GetUid() string { @@ -1372,7 +1420,7 @@ type NameReq struct { func (x *NameReq) Reset() { *x = NameReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[19] + mi := &file_comm_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1385,7 +1433,7 @@ func (x *NameReq) String() string { func (*NameReq) ProtoMessage() {} func (x *NameReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[19] + mi := &file_comm_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1398,7 +1446,7 @@ func (x *NameReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NameReq.ProtoReflect.Descriptor instead. func (*NameReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{19} + return file_comm_proto_rawDescGZIP(), []int{20} } func (x *NameReq) GetName() string { @@ -1417,7 +1465,7 @@ type EmptyReq struct { func (x *EmptyReq) Reset() { *x = EmptyReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[20] + mi := &file_comm_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1430,7 +1478,7 @@ func (x *EmptyReq) String() string { func (*EmptyReq) ProtoMessage() {} func (x *EmptyReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[20] + mi := &file_comm_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1443,7 +1491,7 @@ func (x *EmptyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use EmptyReq.ProtoReflect.Descriptor instead. func (*EmptyReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{20} + return file_comm_proto_rawDescGZIP(), []int{21} } type EmptyResp struct { @@ -1455,7 +1503,7 @@ type EmptyResp struct { func (x *EmptyResp) Reset() { *x = EmptyResp{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[21] + mi := &file_comm_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1468,7 +1516,7 @@ func (x *EmptyResp) String() string { func (*EmptyResp) ProtoMessage() {} func (x *EmptyResp) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[21] + mi := &file_comm_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1481,7 +1529,7 @@ func (x *EmptyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use EmptyResp.ProtoReflect.Descriptor instead. func (*EmptyResp) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{21} + return file_comm_proto_rawDescGZIP(), []int{22} } // rpc 通用请求消息 1 @@ -1496,7 +1544,7 @@ type RPCGeneralReqA1 struct { func (x *RPCGeneralReqA1) Reset() { *x = RPCGeneralReqA1{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[22] + mi := &file_comm_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1509,7 +1557,7 @@ func (x *RPCGeneralReqA1) String() string { func (*RPCGeneralReqA1) ProtoMessage() {} func (x *RPCGeneralReqA1) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[22] + mi := &file_comm_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1522,7 +1570,7 @@ func (x *RPCGeneralReqA1) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCGeneralReqA1.ProtoReflect.Descriptor instead. func (*RPCGeneralReqA1) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{22} + return file_comm_proto_rawDescGZIP(), []int{23} } func (x *RPCGeneralReqA1) GetParam1() string { @@ -1545,7 +1593,7 @@ type RPCGeneralReqA2 struct { func (x *RPCGeneralReqA2) Reset() { *x = RPCGeneralReqA2{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[23] + mi := &file_comm_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1558,7 +1606,7 @@ func (x *RPCGeneralReqA2) String() string { func (*RPCGeneralReqA2) ProtoMessage() {} func (x *RPCGeneralReqA2) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[23] + mi := &file_comm_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1571,7 +1619,7 @@ func (x *RPCGeneralReqA2) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCGeneralReqA2.ProtoReflect.Descriptor instead. func (*RPCGeneralReqA2) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{23} + return file_comm_proto_rawDescGZIP(), []int{24} } func (x *RPCGeneralReqA2) GetParam1() string { @@ -1602,7 +1650,7 @@ type RPCGeneralReqA3 struct { func (x *RPCGeneralReqA3) Reset() { *x = RPCGeneralReqA3{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[24] + mi := &file_comm_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1615,7 +1663,7 @@ func (x *RPCGeneralReqA3) String() string { func (*RPCGeneralReqA3) ProtoMessage() {} func (x *RPCGeneralReqA3) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[24] + mi := &file_comm_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1628,7 +1676,7 @@ func (x *RPCGeneralReqA3) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCGeneralReqA3.ProtoReflect.Descriptor instead. func (*RPCGeneralReqA3) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{24} + return file_comm_proto_rawDescGZIP(), []int{25} } func (x *RPCGeneralReqA3) GetParam1() string { @@ -1667,7 +1715,7 @@ type RPCGeneralReqA4 struct { func (x *RPCGeneralReqA4) Reset() { *x = RPCGeneralReqA4{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[25] + mi := &file_comm_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1680,7 +1728,7 @@ func (x *RPCGeneralReqA4) String() string { func (*RPCGeneralReqA4) ProtoMessage() {} func (x *RPCGeneralReqA4) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[25] + mi := &file_comm_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1693,7 +1741,7 @@ func (x *RPCGeneralReqA4) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCGeneralReqA4.ProtoReflect.Descriptor instead. func (*RPCGeneralReqA4) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{25} + return file_comm_proto_rawDescGZIP(), []int{26} } func (x *RPCGeneralReqA4) GetParam1() string { @@ -1738,7 +1786,7 @@ type RPCRTaskReq struct { func (x *RPCRTaskReq) Reset() { *x = RPCRTaskReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[26] + mi := &file_comm_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1751,7 +1799,7 @@ func (x *RPCRTaskReq) String() string { func (*RPCRTaskReq) ProtoMessage() {} func (x *RPCRTaskReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[26] + mi := &file_comm_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1764,7 +1812,7 @@ func (x *RPCRTaskReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCRTaskReq.ProtoReflect.Descriptor instead. func (*RPCRTaskReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{26} + return file_comm_proto_rawDescGZIP(), []int{27} } func (x *RPCRTaskReq) GetUid() string { @@ -1812,7 +1860,7 @@ type ServiceDBInfo struct { func (x *ServiceDBInfo) Reset() { *x = ServiceDBInfo{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[27] + mi := &file_comm_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1825,7 +1873,7 @@ func (x *ServiceDBInfo) String() string { func (*ServiceDBInfo) ProtoMessage() {} func (x *ServiceDBInfo) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[27] + mi := &file_comm_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1838,7 +1886,7 @@ func (x *ServiceDBInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use ServiceDBInfo.ProtoReflect.Descriptor instead. func (*ServiceDBInfo) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{27} + return file_comm_proto_rawDescGZIP(), []int{28} } func (x *ServiceDBInfo) GetServerid() string { @@ -1950,194 +1998,198 @@ var file_comm_proto_rawDesc = []byte{ 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, - 0xb7, 0x01, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, - 0x14, 0x0a, 0x05, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, - 0x4d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x28, 0x0a, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, - 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x63, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x63, 0x22, 0x8e, 0x02, 0x0a, 0x0c, 0x41, 0x67, - 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, - 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x4d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, - 0x79, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x5f, 0x0a, 0x0f, 0x52, 0x50, - 0x43, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x28, 0x0a, - 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x45, 0x72, - 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x69, 0x0a, 0x0d, 0x41, - 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, - 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x57, 0x6f, - 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x57, 0x6f, - 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x22, 0x37, 0x0a, 0x0f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, - 0x6e, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, - 0x5f, 0x0a, 0x13, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, - 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x05, - 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, - 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, - 0x22, 0x99, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x52, 0x65, 0x71, 0x12, 0x26, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, - 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, - 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, - 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x75, 0x0a, 0x13, - 0x42, 0x72, 0x6f, 0x61, 0x64, 0x43, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, - 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, - 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, - 0x61, 0x74, 0x61, 0x22, 0x36, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, - 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, + 0x3a, 0x0a, 0x0e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, + 0x65, 0x12, 0x28, 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x52, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x22, 0xb7, 0x01, 0x0a, 0x0b, + 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x4d, + 0x73, 0x67, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x4d, 0x73, 0x67, 0x49, + 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x63, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x73, 0x65, 0x63, 0x22, 0x8e, 0x02, 0x0a, 0x0c, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, + 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, + 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, + 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, + 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, + 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, + 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x5f, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x4d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x28, 0x0a, 0x09, 0x45, 0x72, 0x72, + 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, + 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x69, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, + 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, + 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, + 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, + 0x49, 0x64, 0x22, 0x37, 0x0a, 0x0f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x42, 0x75, 0x69, + 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, - 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, - 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, - 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, - 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, - 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, - 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, - 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, - 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xaf, 0x01, 0x0a, - 0x13, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, - 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, - 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, - 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xae, - 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x6f, - 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, - 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, - 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, - 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, - 0x3f, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, - 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, - 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, - 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, - 0x22, 0x36, 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, - 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, - 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, - 0x41, 0x74, 0x6e, 0x6f, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, - 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x12, 0x0c, - 0x0a, 0x01, 0x4f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0x39, 0x0a, 0x09, - 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, - 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x12, - 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, - 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, - 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, - 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x1a, 0x0a, - 0x06, 0x55, 0x49, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, 0x61, 0x6d, - 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73, - 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, - 0x65, 0x71, 0x41, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, 0x0a, 0x0f, - 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x32, 0x12, - 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, - 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, - 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, - 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, 0x52, 0x50, - 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, 0x16, 0x0a, - 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, - 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, - 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, - 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x51, 0x0a, - 0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, - 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x22, 0xa1, 0x03, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x42, 0x49, 0x6e, - 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1e, - 0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, - 0x77, 0x6e, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, - 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x6f, - 0x73, 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, - 0x72, 0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67, - 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, - 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, - 0x74, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, - 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x72, 0x65, - 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, - 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x72, 0x65, - 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x6f, - 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, - 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, - 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0d, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, - 0x62, 0x61, 0x73, 0x65, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, - 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, - 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, - 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5f, 0x0a, 0x13, 0x41, + 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, + 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, + 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x99, 0x01, 0x0a, + 0x0f, 0x42, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, + 0x12, 0x26, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, + 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, + 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, + 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, + 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x75, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x61, + 0x64, 0x43, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, + 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, + 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, + 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, + 0x36, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x65, 0x52, 0x65, + 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, + 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, + 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, + 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, + 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xaf, 0x01, 0x0a, 0x13, 0x4e, 0x6f, 0x74, + 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, + 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, + 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, + 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, + 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, + 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, + 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65, + 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, + 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, + 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, + 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, + 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x09, 0x53, + 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, + 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, + 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a, 0x0a, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x01, 0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, + 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, + 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, + 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x12, 0x0c, 0x0a, 0x01, 0x4f, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, + 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, + 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, + 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, + 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, + 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, + 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, + 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, + 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, + 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, + 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, + 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16, + 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, + 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, + 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x50, 0x43, + 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, + 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, + 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xa1, 0x03, 0x0a, + 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x42, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, + 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, + 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, + 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, + 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49, + 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, + 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, + 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, + 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, + 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x69, + 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, + 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, + 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, + 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, + 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, + 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, + 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, + 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, + 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, + 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, + 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, + 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2153,55 +2205,57 @@ func file_comm_proto_rawDescGZIP() []byte { } var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 28) +var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 29) var file_comm_proto_goTypes = []interface{}{ (HeroAttributesType)(0), // 0: HeroAttributesType (*ErrorData)(nil), // 1: ErrorData - (*UserMessage)(nil), // 2: UserMessage - (*AgentMessage)(nil), // 3: AgentMessage - (*RPCMessageReply)(nil), // 4: RPCMessageReply - (*AgentBuildReq)(nil), // 5: AgentBuildReq - (*AgentUnBuildReq)(nil), // 6: AgentUnBuildReq - (*AgentSendMessageReq)(nil), // 7: AgentSendMessageReq - (*BatchMessageReq)(nil), // 8: BatchMessageReq - (*BroadCastMessageReq)(nil), // 9: BroadCastMessageReq - (*AgentCloseeReq)(nil), // 10: AgentCloseeReq - (*NoticeUserLoginReq)(nil), // 11: NoticeUserLoginReq - (*NoticeUserCreateReq)(nil), // 12: NoticeUserCreateReq - (*NoticeUserCloseReq)(nil), // 13: NoticeUserCloseReq - (*SkillData)(nil), // 14: SkillData - (*UserAssets)(nil), // 15: UserAssets - (*UserAtno)(nil), // 16: UserAtno - (*TaskParam)(nil), // 17: TaskParam - (*RtaskParam)(nil), // 18: RtaskParam - (*UIdReq)(nil), // 19: UIdReq - (*NameReq)(nil), // 20: NameReq - (*EmptyReq)(nil), // 21: EmptyReq - (*EmptyResp)(nil), // 22: EmptyResp - (*RPCGeneralReqA1)(nil), // 23: RPCGeneralReqA1 - (*RPCGeneralReqA2)(nil), // 24: RPCGeneralReqA2 - (*RPCGeneralReqA3)(nil), // 25: RPCGeneralReqA3 - (*RPCGeneralReqA4)(nil), // 26: RPCGeneralReqA4 - (*RPCRTaskReq)(nil), // 27: RPCRTaskReq - (*ServiceDBInfo)(nil), // 28: ServiceDBInfo - (ErrorCode)(0), // 29: ErrorCode - (*anypb.Any)(nil), // 30: google.protobuf.Any + (*MessagePackage)(nil), // 2: MessagePackage + (*UserMessage)(nil), // 3: UserMessage + (*AgentMessage)(nil), // 4: AgentMessage + (*RPCMessageReply)(nil), // 5: RPCMessageReply + (*AgentBuildReq)(nil), // 6: AgentBuildReq + (*AgentUnBuildReq)(nil), // 7: AgentUnBuildReq + (*AgentSendMessageReq)(nil), // 8: AgentSendMessageReq + (*BatchMessageReq)(nil), // 9: BatchMessageReq + (*BroadCastMessageReq)(nil), // 10: BroadCastMessageReq + (*AgentCloseeReq)(nil), // 11: AgentCloseeReq + (*NoticeUserLoginReq)(nil), // 12: NoticeUserLoginReq + (*NoticeUserCreateReq)(nil), // 13: NoticeUserCreateReq + (*NoticeUserCloseReq)(nil), // 14: NoticeUserCloseReq + (*SkillData)(nil), // 15: SkillData + (*UserAssets)(nil), // 16: UserAssets + (*UserAtno)(nil), // 17: UserAtno + (*TaskParam)(nil), // 18: TaskParam + (*RtaskParam)(nil), // 19: RtaskParam + (*UIdReq)(nil), // 20: UIdReq + (*NameReq)(nil), // 21: NameReq + (*EmptyReq)(nil), // 22: EmptyReq + (*EmptyResp)(nil), // 23: EmptyResp + (*RPCGeneralReqA1)(nil), // 24: RPCGeneralReqA1 + (*RPCGeneralReqA2)(nil), // 25: RPCGeneralReqA2 + (*RPCGeneralReqA3)(nil), // 26: RPCGeneralReqA3 + (*RPCGeneralReqA4)(nil), // 27: RPCGeneralReqA4 + (*RPCRTaskReq)(nil), // 28: RPCRTaskReq + (*ServiceDBInfo)(nil), // 29: ServiceDBInfo + (ErrorCode)(0), // 30: ErrorCode + (*anypb.Any)(nil), // 31: google.protobuf.Any } var file_comm_proto_depIdxs = []int32{ - 29, // 0: ErrorData.code:type_name -> ErrorCode - 15, // 1: ErrorData.atn:type_name -> UserAssets - 30, // 2: UserMessage.data:type_name -> google.protobuf.Any - 30, // 3: AgentMessage.Message:type_name -> google.protobuf.Any - 1, // 4: RPCMessageReply.ErrorData:type_name -> ErrorData - 2, // 5: RPCMessageReply.Reply:type_name -> UserMessage - 2, // 6: AgentSendMessageReq.Reply:type_name -> UserMessage - 30, // 7: BatchMessageReq.Data:type_name -> google.protobuf.Any - 30, // 8: BroadCastMessageReq.Data:type_name -> google.protobuf.Any - 9, // [9:9] is the sub-list for method output_type - 9, // [9:9] is the sub-list for method input_type - 9, // [9:9] is the sub-list for extension type_name - 9, // [9:9] is the sub-list for extension extendee - 0, // [0:9] is the sub-list for field type_name + 30, // 0: ErrorData.code:type_name -> ErrorCode + 16, // 1: ErrorData.atn:type_name -> UserAssets + 3, // 2: MessagePackage.messages:type_name -> UserMessage + 31, // 3: UserMessage.data:type_name -> google.protobuf.Any + 31, // 4: AgentMessage.Message:type_name -> google.protobuf.Any + 1, // 5: RPCMessageReply.ErrorData:type_name -> ErrorData + 3, // 6: RPCMessageReply.Reply:type_name -> UserMessage + 3, // 7: AgentSendMessageReq.Reply:type_name -> UserMessage + 31, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any + 31, // 9: BroadCastMessageReq.Data:type_name -> google.protobuf.Any + 10, // [10:10] is the sub-list for method output_type + 10, // [10:10] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_comm_proto_init() } @@ -2224,7 +2278,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserMessage); i { + switch v := v.(*MessagePackage); i { case 0: return &v.state case 1: @@ -2236,7 +2290,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentMessage); i { + switch v := v.(*UserMessage); i { case 0: return &v.state case 1: @@ -2248,7 +2302,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCMessageReply); i { + switch v := v.(*AgentMessage); i { case 0: return &v.state case 1: @@ -2260,7 +2314,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentBuildReq); i { + switch v := v.(*RPCMessageReply); i { case 0: return &v.state case 1: @@ -2272,7 +2326,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentUnBuildReq); i { + switch v := v.(*AgentBuildReq); i { case 0: return &v.state case 1: @@ -2284,7 +2338,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentSendMessageReq); i { + switch v := v.(*AgentUnBuildReq); i { case 0: return &v.state case 1: @@ -2296,7 +2350,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BatchMessageReq); i { + switch v := v.(*AgentSendMessageReq); i { case 0: return &v.state case 1: @@ -2308,7 +2362,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BroadCastMessageReq); i { + switch v := v.(*BatchMessageReq); i { case 0: return &v.state case 1: @@ -2320,7 +2374,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentCloseeReq); i { + switch v := v.(*BroadCastMessageReq); i { case 0: return &v.state case 1: @@ -2332,7 +2386,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NoticeUserLoginReq); i { + switch v := v.(*AgentCloseeReq); i { case 0: return &v.state case 1: @@ -2344,7 +2398,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NoticeUserCreateReq); i { + switch v := v.(*NoticeUserLoginReq); i { case 0: return &v.state case 1: @@ -2356,7 +2410,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NoticeUserCloseReq); i { + switch v := v.(*NoticeUserCreateReq); i { case 0: return &v.state case 1: @@ -2368,7 +2422,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SkillData); i { + switch v := v.(*NoticeUserCloseReq); i { case 0: return &v.state case 1: @@ -2380,7 +2434,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserAssets); i { + switch v := v.(*SkillData); i { case 0: return &v.state case 1: @@ -2392,7 +2446,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserAtno); i { + switch v := v.(*UserAssets); i { case 0: return &v.state case 1: @@ -2404,7 +2458,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskParam); i { + switch v := v.(*UserAtno); i { case 0: return &v.state case 1: @@ -2416,7 +2470,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskParam); i { + switch v := v.(*TaskParam); i { case 0: return &v.state case 1: @@ -2428,7 +2482,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UIdReq); i { + switch v := v.(*RtaskParam); i { case 0: return &v.state case 1: @@ -2440,7 +2494,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NameReq); i { + switch v := v.(*UIdReq); i { case 0: return &v.state case 1: @@ -2452,7 +2506,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmptyReq); i { + switch v := v.(*NameReq); i { case 0: return &v.state case 1: @@ -2464,7 +2518,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmptyResp); i { + switch v := v.(*EmptyReq); i { case 0: return &v.state case 1: @@ -2476,7 +2530,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCGeneralReqA1); i { + switch v := v.(*EmptyResp); i { case 0: return &v.state case 1: @@ -2488,7 +2542,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCGeneralReqA2); i { + switch v := v.(*RPCGeneralReqA1); i { case 0: return &v.state case 1: @@ -2500,7 +2554,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCGeneralReqA3); i { + switch v := v.(*RPCGeneralReqA2); i { case 0: return &v.state case 1: @@ -2512,7 +2566,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCGeneralReqA4); i { + switch v := v.(*RPCGeneralReqA3); i { case 0: return &v.state case 1: @@ -2524,7 +2578,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCRTaskReq); i { + switch v := v.(*RPCGeneralReqA4); i { case 0: return &v.state case 1: @@ -2536,6 +2590,18 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RPCRTaskReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_comm_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ServiceDBInfo); i { case 0: return &v.state @@ -2554,7 +2620,7 @@ func file_comm_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_comm_proto_rawDesc, NumEnums: 1, - NumMessages: 28, + NumMessages: 29, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/guildgve_msg.pb.go b/pb/guildgve_msg.pb.go index 8a7946236..cfc0a8015 100644 --- a/pb/guildgve_msg.pb.go +++ b/pb/guildgve_msg.pb.go @@ -75,7 +75,8 @@ type GuildGveInfoResp struct { Info *DBGuildGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` Boosticket int32 `protobuf:"varint,2,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票 - Records []*DBGveRouletteRecord `protobuf:"bytes,3,rep,name=records,proto3" json:"records"` //转盘记录 + Useheros []string `protobuf:"bytes,3,rep,name=useheros,proto3" json:"useheros"` //工会战已使用英雄 + Records []*DBGveRouletteRecord `protobuf:"bytes,4,rep,name=records,proto3" json:"records"` //转盘记录 } func (x *GuildGveInfoResp) Reset() { @@ -124,6 +125,13 @@ func (x *GuildGveInfoResp) GetBoosticket() int32 { return 0 } +func (x *GuildGveInfoResp) GetUseheros() []string { + if x != nil { + return x.Useheros + } + return nil +} + func (x *GuildGveInfoResp) GetRecords() []*DBGveRouletteRecord { if x != nil { return x.Records @@ -1141,115 +1149,116 @@ var file_guildgve_guildgve_msg_proto_rawDesc = []byte{ 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2b, 0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x83, 0x01, 0x0a, 0x10, + 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x9f, 0x01, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, - 0x74, 0x12, 0x2e, 0x0a, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, - 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x73, 0x22, 0x5e, 0x0a, 0x12, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, - 0x46, 0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, - 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, - 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, - 0x65, 0x22, 0x15, 0x0a, 0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, - 0x46, 0x69, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, - 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, - 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, - 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0xaa, 0x01, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, - 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, - 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, - 0x6c, 0x64, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, - 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x09, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, - 0x73, 0x74, 0x4b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x4b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x12, - 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, - 0x6e, 0x6b, 0x22, 0x39, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, - 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, - 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, - 0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, - 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x4b, - 0x0a, 0x14, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, - 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, - 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, - 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x72, 0x0a, 0x14, 0x47, - 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, + 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x03, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x2e, 0x0a, + 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, + 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x22, 0x5e, 0x0a, + 0x12, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46, 0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, - 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, - 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, - 0x8a, 0x01, 0x0a, 0x15, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, - 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, - 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, - 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, - 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, - 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x75, 0x0a, 0x1a, + 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x22, 0x15, 0x0a, + 0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46, 0x69, 0x72, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, + 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, + 0x64, 0x22, 0xaa, 0x01, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, + 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, + 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x69, 0x6c, 0x6c, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6b, 0x69, 0x6c, + 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x4b, 0x69, + 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x6c, 0x61, + 0x73, 0x74, 0x4b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, + 0x6e, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x39, + 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x11, 0x2e, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x49, + 0x74, 0x65, 0x6d, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x13, 0x47, 0x75, 0x69, + 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x71, + 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x14, 0x47, 0x75, + 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x63, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, + 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x72, 0x0a, 0x14, 0x47, 0x75, 0x69, 0x6c, 0x64, + 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, + 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, + 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, + 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x8a, 0x01, 0x0a, 0x15, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, - 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, - 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, - 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, - 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x22, 0xd6, 0x01, 0x0a, 0x1b, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, - 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, - 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, - 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x02, 0x68, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, - 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x66, 0x66, 0x69, - 0x63, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66, - 0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, - 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x39, 0x0a, 0x16, - 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, - 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x17, 0x47, 0x75, 0x69, 0x6c, 0x64, - 0x47, 0x76, 0x65, 0x53, 0x74, 0x61, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, + 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, + 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, + 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x75, 0x0a, 0x1a, 0x47, 0x75, 0x69, 0x6c, + 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, + 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, + 0xd6, 0x01, 0x0a, 0x1b, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, + 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, + 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, + 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, + 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, + 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65, 0x6e, + 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65, + 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, + 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, + 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x39, 0x0a, 0x16, 0x47, 0x75, 0x69, 0x6c, + 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, - 0x6e, 0x66, 0x6f, 0x22, 0x39, 0x0a, 0x16, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42, - 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, - 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4a, - 0x0a, 0x1a, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, - 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2c, 0x0a, 0x06, - 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, - 0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x6a, 0x0a, 0x18, 0x47, 0x75, - 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1c, - 0x0a, 0x09, 0x71, 0x75, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x71, 0x75, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, - 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x59, 0x0a, 0x19, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, + 0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x17, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, + 0x74, 0x61, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, + 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, + 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, + 0x39, 0x0a, 0x16, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, + 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4a, 0x0a, 0x1a, 0x47, 0x75, + 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x43, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2c, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, + 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, + 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x6a, 0x0a, 0x18, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x06, 0x72, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, - 0x47, 0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x71, 0x75, + 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x71, + 0x75, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x73, 0x22, 0x59, 0x0a, 0x19, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/sys/configure/structs/Game.RechargeData.go b/sys/configure/structs/Game.RechargeData.go index 5655fda4d..6593ceb09 100644 --- a/sys/configure/structs/Game.RechargeData.go +++ b/sys/configure/structs/Game.RechargeData.go @@ -12,6 +12,7 @@ import "errors" type GameRechargeData struct { Id string + Pid int32 Editionid string RechargeType int32 Monetaryunit string @@ -33,6 +34,7 @@ func (*GameRechargeData) GetTypeId() int32 { func (_v *GameRechargeData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pid"].(float64); !_ok_ { err = errors.New("pid error"); return }; _v.Pid = int32(_tempNum_) } { var _ok_ bool; if _v.Editionid, _ok_ = _buf["editionid"].(string); !_ok_ { err = errors.New("editionid error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recharge_type"].(float64); !_ok_ { err = errors.New("recharge_type error"); return }; _v.RechargeType = int32(_tempNum_) } { var _ok_ bool; if _v.Monetaryunit, _ok_ = _buf["monetaryunit"].(string); !_ok_ { err = errors.New("monetaryunit error"); return } }