From 382c058422cf77d7e6d40589ae8c92b5345ce9fb Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 5 Feb 2024 16:22:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E7=BA=BF=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 10 +- bin/json/game_equipattribute.json | 112 +- bin/json/game_equipintensify.json | 360 +++--- bin/json/game_global.json | 2 +- bin/json/game_mainstage.json | 197 ++- bin/json/game_opencond.json | 2 +- bin/json/game_skillproperty.json | 1074 ++++++++++------- bin/json/game_worldtask.json | 10 +- modules/mainline/api_challengeover.go | 20 +- modules/mainline/api_levelpass.go | 21 +- modules/mainline/api_setpolts.go | 49 + modules/mainline/model_mainline.go | 9 +- modules/mainline/module.go | 4 +- pb/battle_struct.pb.go | 164 ++- pb/comm.pb.go | 130 +- pb/mainline_db.pb.go | 270 ++--- pb/mainline_msg.pb.go | 467 ++++--- .../structs/Game.SkillPropertyData.go | 68 +- 18 files changed, 1849 insertions(+), 1120 deletions(-) create mode 100644 modules/mainline/api_setpolts.go diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index d5b12e2aa..54ad9ffba 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -13119,7 +13119,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": 60629, + "NPC": 60631, "tipstxt": { "key": "", "text": "" @@ -13149,7 +13149,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": 60639, + "NPC": 60641, "tipstxt": { "key": "", "text": "" @@ -13179,7 +13179,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": 60649, + "NPC": 60651, "tipstxt": { "key": "", "text": "" @@ -13209,7 +13209,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": 60659, + "NPC": 60661, "tipstxt": { "key": "", "text": "" @@ -13239,7 +13239,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": 60669, + "NPC": 60671, "tipstxt": { "key": "", "text": "" diff --git a/bin/json/game_equipattribute.json b/bin/json/game_equipattribute.json index 8f3e64423..fb4f67a64 100644 --- a/bin/json/game_equipattribute.json +++ b/bin/json/game_equipattribute.json @@ -4,7 +4,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_1", - "text": "对感观之林属性守护者伤害增加{0}" + "text": "对感观之林属性守护者伤害增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_1", @@ -24,7 +24,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_2", - "text": "对热情之火属性守护者伤害增加{0}" + "text": "对热情之火属性守护者伤害增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_2", @@ -44,7 +44,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_3", - "text": "对包容之水属性守护者伤害增加{0}" + "text": "对包容之水属性守护者伤害增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_3", @@ -64,7 +64,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_4", - "text": "对荣耀之光属性守护者伤害增加{0}" + "text": "对荣耀之光属性守护者伤害增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_4", @@ -84,7 +84,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_5", - "text": "减少受到的感观之林属性守护者伤害{0}" + "text": "减少受到的感观之林属性守护者伤害[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_5", @@ -104,7 +104,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_6", - "text": "减少受到的热情之火属性守护者伤害{0}" + "text": "减少受到的热情之火属性守护者伤害[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_6", @@ -124,7 +124,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_7", - "text": "减少受到的包容之水属性守护者伤害{0}" + "text": "减少受到的包容之水属性守护者伤害[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_7", @@ -144,7 +144,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_8", - "text": "减少受到的荣耀之光属性守护者伤害{0}" + "text": "减少受到的荣耀之光属性守护者伤害[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_8", @@ -164,11 +164,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_9", - "text": "提升自身已损失生命值{0}的攻击" + "text": "提升自身已损失生命值[color=#2bb496]{0}[/color]的攻击" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_9", - "text": "提升自身失去生命值百分比*系数的攻击" + "text": "提升攻击以自身已损失生命值" }, "skill_parameter": [ "1%", @@ -184,11 +184,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_10", - "text": "提升自身已损失生命值{0}的防御" + "text": "提升自身已损失生命值[color=#2bb496]{0}[/color]的防御" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_10", - "text": "提升自身失去生命值百分比*系数的防御" + "text": "提升防御以自身已损失生命值" }, "skill_parameter": [ "1%", @@ -204,11 +204,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_11", - "text": "提升自身已损失生命值{0}的速度" + "text": "提升自身已损失生命值[color=#2bb496]{0}[/color]的速度" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_11", - "text": "提升自身失去生命值百分比*系数的速度" + "text": "提升速度以自身已损失生命值" }, "skill_parameter": [ "1%", @@ -224,11 +224,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_12", - "text": "提升自身已损失生命值{0}的暴击" + "text": "提升自身已损失生命值[color=#2bb496]{0}[/color]的暴击" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_12", - "text": "提升自身失去生命值百分比*系数的暴击" + "text": "提升暴击以自身已损失生命值" }, "skill_parameter": [ "1%", @@ -244,11 +244,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_13", - "text": "提升自身已损失生命值{0}的暴击伤害" + "text": "提升自身已损失生命值[color=#2bb496]{0}[/color]的暴击伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_13", - "text": "提升自身失去生命值百分比*系数的暴击伤害" + "text": "提升暴击伤害以自身已损失生命值" }, "skill_parameter": [ "1%", @@ -264,11 +264,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_14", - "text": "提升自身已损失生命值{0}的效果命中" + "text": "提升自身已损失生命值[color=#2bb496]{0}[/color]的效果命中" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_14", - "text": "提升自身失去生命值百分比*系数的命中" + "text": "提升效果命中以自身已损失生命值" }, "skill_parameter": [ "1%", @@ -284,11 +284,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_15", - "text": "提升自身已损失生命值{0}效果抵抗" + "text": "提升自身已损失生命值[color=#2bb496]{0}[/color]的效果抵抗" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_15", - "text": "提升自身失去生命值百分比*系数的效果抵抗" + "text": "提升效果抵抗以自身已损失生命值" }, "skill_parameter": [ "1%", @@ -304,11 +304,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_16", - "text": "攻击敌人时，增加敌人已损失生命值{0}的暴击伤害" + "text": "攻击敌人时，增加敌人已损失生命值[color=#2bb496]{0}[/color]的暴击伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_16", - "text": "攻击敌人时，增加敌人失去生命值比例*系数的暴击伤害" + "text": "攻击敌人时，增加暴击伤害以敌人已损失生命值" }, "skill_parameter": [ "1%", @@ -324,11 +324,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_17", - "text": "攻击敌人时，增加敌人已损失生命值{0}的暴击伤害" + "text": "攻击敌人时，增加敌人总生命值[color=#2bb496]{0}[/color]的暴击伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_17", - "text": "攻击敌人时，增加敌人拥有生命值比例*系数的暴击伤害" + "text": "攻击敌人时，增加暴击伤害以总生命值" }, "skill_parameter": [ "1%", @@ -344,11 +344,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_18", - "text": "增加相当于{0}攻击的追加伤害" + "text": "增加相当于[color=#2bb496]{0}[/color]攻击的追加伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_18", - "text": "增加相当于A%攻击的追加伤害" + "text": "增加追加伤害以自身攻击" }, "skill_parameter": [ "1%", @@ -364,11 +364,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_19", - "text": "增加相当于{0}防御的追加伤害" + "text": "增加相当于[color=#2bb496]{0}[/color]防御的追加伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_19", - "text": "增加相当于A%防御的追加伤害" + "text": "增加追加伤害以自身防御" }, "skill_parameter": [ "1%", @@ -384,11 +384,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_20", - "text": "增加相当于{0}生命的追加伤害" + "text": "增加相当于[color=#2bb496]{0}[/color]生命的追加伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_20", - "text": "增加相当于A%生命的追加伤害" + "text": "增加追加伤害以自身生命" }, "skill_parameter": [ "1%", @@ -404,11 +404,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_21", - "text": "增加相当于{0}速度的追加伤害" + "text": "增加相当于[color=#2bb496]{0}[/color]速度的追加伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_21", - "text": "增加相当于A%速度的追加伤害" + "text": "增加追加伤害以自身速度" }, "skill_parameter": [ "1%", @@ -424,7 +424,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_22", - "text": "攻击强化效果增加{0}" + "text": "攻击强化效果增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_22", @@ -444,7 +444,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_23", - "text": "反击造成的伤害增加{0}" + "text": "反击造成的伤害增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_23", @@ -464,7 +464,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_24", - "text": "复活时行动值增加{0}" + "text": "复活时行动值增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_24", @@ -484,7 +484,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_25", - "text": "复活时体力值增加{0}" + "text": "复活时体力值增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_25", @@ -504,7 +504,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_26", - "text": "吸血量增加{0}" + "text": "吸血量增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_26", @@ -524,7 +524,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_27", - "text": "出血造成的伤害增加{0}" + "text": "出血造成的伤害增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_27", @@ -544,7 +544,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_28", - "text": "中毒造成的伤害增加{0}" + "text": "中毒造成的伤害增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_28", @@ -564,11 +564,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_29", - "text": "被暴击时减少{0}的伤害" + "text": "被暴击时减少[color=#2bb496]{0}[/color]的伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_29", - "text": "被暴击时减少A%的伤害" + "text": "被暴击时减少伤害" }, "skill_parameter": [ "1%", @@ -584,7 +584,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_30", - "text": "[1号技能]的回复量提升{0}" + "text": "[1号技能]的回复量提升[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_30", @@ -604,7 +604,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_31", - "text": "[1号技能]的暴击伤害提升{0}" + "text": "[1号技能]的暴击伤害提升[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_31", @@ -624,7 +624,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_32", - "text": "[1号技能]的命中提升{0}" + "text": "[1号技能]的命中提升[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_32", @@ -644,7 +644,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_33", - "text": "[2号技能]的回复量提升{0}" + "text": "[2号技能]的回复量提升[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_33", @@ -664,7 +664,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_34", - "text": "[2号技能]的暴击伤害提升{0}" + "text": "[2号技能]的暴击伤害提升[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_34", @@ -684,7 +684,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_35", - "text": "[2号技能]的命中提升{0}" + "text": "[2号技能]的命中提升[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_35", @@ -704,7 +704,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_36", - "text": "[3号技能]的回复量提升{0}" + "text": "[3号技能]的回复量提升[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_36", @@ -724,7 +724,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_37", - "text": "[3号技能]的暴击伤害提升{0}" + "text": "[3号技能]的暴击伤害提升[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_37", @@ -744,7 +744,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_38", - "text": "[3号技能]的命中提升{0}" + "text": "[3号技能]的命中提升[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_38", @@ -764,7 +764,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_39", - "text": "速度提升的效果增加{0}" + "text": "速度提升的效果增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_39", @@ -784,7 +784,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_40", - "text": "暴击提升的效果增加{0}" + "text": "暴击提升的效果增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_40", @@ -804,11 +804,11 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_41", - "text": "暴击伤害提升的效果增加{0}" + "text": "暴击伤害提升的效果增加[color=#2bb496]{0}[/color]" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_41", - "text": "爆伤提升的效果增加" + "text": "暴击伤害提升的效果增加" }, "skill_parameter": [ "1%", diff --git a/bin/json/game_equipintensify.json b/bin/json/game_equipintensify.json index 4685d51d1..9898779d6 100644 --- a/bin/json/game_equipintensify.json +++ b/bin/json/game_equipintensify.json @@ -1097,7 +1097,7 @@ "n": 16851 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -1114,7 +1114,7 @@ "n": 21064 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -1131,7 +1131,7 @@ "n": 23936 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -1148,7 +1148,7 @@ "n": 24681 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -1165,7 +1165,7 @@ "n": 25319 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -1182,7 +1182,7 @@ "n": 25532 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -1199,7 +1199,7 @@ "n": 32699 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -1216,7 +1216,7 @@ "n": 34516 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -1233,7 +1233,7 @@ "n": 36560 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -1250,7 +1250,7 @@ "n": 40874 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -1267,7 +1267,7 @@ "n": 43372 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -1284,7 +1284,7 @@ "n": 48879 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -1301,7 +1301,7 @@ "n": 56453 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -1318,7 +1318,7 @@ "n": 59520 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -1335,7 +1335,7 @@ "n": 62225 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -1363,7 +1363,7 @@ "n": 13480 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -1380,7 +1380,7 @@ "n": 16850 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -1397,7 +1397,7 @@ "n": 19149 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -1414,7 +1414,7 @@ "n": 19744 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -1431,7 +1431,7 @@ "n": 20255 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -1448,7 +1448,7 @@ "n": 20425 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -1465,7 +1465,7 @@ "n": 26159 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -1482,7 +1482,7 @@ "n": 27613 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -1499,7 +1499,7 @@ "n": 29248 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -1516,7 +1516,7 @@ "n": 32699 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -1533,7 +1533,7 @@ "n": 34698 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -1550,7 +1550,7 @@ "n": 39103 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -1567,7 +1567,7 @@ "n": 45163 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -1584,7 +1584,7 @@ "n": 47616 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -1601,7 +1601,7 @@ "n": 49780 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -1629,7 +1629,7 @@ "n": 10784 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -1646,7 +1646,7 @@ "n": 13480 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -1663,7 +1663,7 @@ "n": 15318 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -1680,7 +1680,7 @@ "n": 15795 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -1697,7 +1697,7 @@ "n": 16203 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -1714,7 +1714,7 @@ "n": 16340 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -1731,7 +1731,7 @@ "n": 20927 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -1748,7 +1748,7 @@ "n": 22090 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -1765,7 +1765,7 @@ "n": 23398 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -1782,7 +1782,7 @@ "n": 26159 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -1799,7 +1799,7 @@ "n": 27758 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -1816,7 +1816,7 @@ "n": 31282 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -1833,7 +1833,7 @@ "n": 36130 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -1850,7 +1850,7 @@ "n": 38092 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -1867,7 +1867,7 @@ "n": 39824 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -1895,7 +1895,7 @@ "n": 8626 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -1912,7 +1912,7 @@ "n": 10783 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -1929,7 +1929,7 @@ "n": 12254 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -1946,7 +1946,7 @@ "n": 12636 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -1963,7 +1963,7 @@ "n": 12962 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -1980,7 +1980,7 @@ "n": 13072 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -1997,7 +1997,7 @@ "n": 16742 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -2014,7 +2014,7 @@ "n": 17672 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -2031,7 +2031,7 @@ "n": 18718 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -2048,7 +2048,7 @@ "n": 20927 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -2065,7 +2065,7 @@ "n": 22206 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -2082,7 +2082,7 @@ "n": 25026 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -2099,7 +2099,7 @@ "n": 28904 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -2116,7 +2116,7 @@ "n": 30474 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -2133,7 +2133,7 @@ "n": 31859 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -2161,7 +2161,7 @@ "n": 6900 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -2178,7 +2178,7 @@ "n": 8626 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -2195,7 +2195,7 @@ "n": 9802 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -2212,7 +2212,7 @@ "n": 10108 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -2229,7 +2229,7 @@ "n": 10369 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -2246,7 +2246,7 @@ "n": 10457 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -2263,7 +2263,7 @@ "n": 13393 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -2280,7 +2280,7 @@ "n": 14137 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -2297,7 +2297,7 @@ "n": 14974 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -2314,7 +2314,7 @@ "n": 16742 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -2331,7 +2331,7 @@ "n": 17764 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -2348,7 +2348,7 @@ "n": 20020 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -2365,7 +2365,7 @@ "n": 23123 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -2382,7 +2382,7 @@ "n": 24379 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -2399,7 +2399,7 @@ "n": 25487 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -2427,7 +2427,7 @@ "n": 5520 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -2444,7 +2444,7 @@ "n": 6901 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -2461,7 +2461,7 @@ "n": 7841 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -2478,7 +2478,7 @@ "n": 8086 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -2495,7 +2495,7 @@ "n": 8295 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -2512,7 +2512,7 @@ "n": 8365 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -2529,7 +2529,7 @@ "n": 10714 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -2546,7 +2546,7 @@ "n": 11310 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -2563,7 +2563,7 @@ "n": 11979 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -2580,7 +2580,7 @@ "n": 13393 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -2597,7 +2597,7 @@ "n": 14211 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -2614,7 +2614,7 @@ "n": 16016 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -2631,7 +2631,7 @@ "n": 18498 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -2648,7 +2648,7 @@ "n": 19503 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -2665,7 +2665,7 @@ "n": 20389 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -2693,7 +2693,7 @@ "n": 16851 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -2710,7 +2710,7 @@ "n": 21064 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -2727,7 +2727,7 @@ "n": 23936 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -2744,7 +2744,7 @@ "n": 24681 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -2761,7 +2761,7 @@ "n": 25319 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -2778,7 +2778,7 @@ "n": 25532 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -2795,7 +2795,7 @@ "n": 32699 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -2812,7 +2812,7 @@ "n": 34516 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -2829,7 +2829,7 @@ "n": 36560 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -2846,7 +2846,7 @@ "n": 40874 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -2863,7 +2863,7 @@ "n": 43372 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -2880,7 +2880,7 @@ "n": 48879 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -2897,7 +2897,7 @@ "n": 56453 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -2914,7 +2914,7 @@ "n": 59520 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -2931,7 +2931,7 @@ "n": 62225 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -2959,7 +2959,7 @@ "n": 13480 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -2976,7 +2976,7 @@ "n": 16850 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -2993,7 +2993,7 @@ "n": 19149 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -3010,7 +3010,7 @@ "n": 19744 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -3027,7 +3027,7 @@ "n": 20255 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -3044,7 +3044,7 @@ "n": 20425 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -3061,7 +3061,7 @@ "n": 26159 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -3078,7 +3078,7 @@ "n": 27613 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -3095,7 +3095,7 @@ "n": 29248 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -3112,7 +3112,7 @@ "n": 32699 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -3129,7 +3129,7 @@ "n": 34698 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -3146,7 +3146,7 @@ "n": 39103 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -3163,7 +3163,7 @@ "n": 45163 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -3180,7 +3180,7 @@ "n": 47616 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -3197,7 +3197,7 @@ "n": 49780 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -3225,7 +3225,7 @@ "n": 10784 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -3242,7 +3242,7 @@ "n": 13480 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -3259,7 +3259,7 @@ "n": 15318 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -3276,7 +3276,7 @@ "n": 15795 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -3293,7 +3293,7 @@ "n": 16203 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -3310,7 +3310,7 @@ "n": 16340 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -3327,7 +3327,7 @@ "n": 20927 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -3344,7 +3344,7 @@ "n": 22090 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -3361,7 +3361,7 @@ "n": 23398 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -3378,7 +3378,7 @@ "n": 26159 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -3395,7 +3395,7 @@ "n": 27758 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -3412,7 +3412,7 @@ "n": 31282 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -3429,7 +3429,7 @@ "n": 36130 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -3446,7 +3446,7 @@ "n": 38092 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -3463,7 +3463,7 @@ "n": 39824 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -3491,7 +3491,7 @@ "n": 8626 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -3508,7 +3508,7 @@ "n": 10783 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -3525,7 +3525,7 @@ "n": 12254 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -3542,7 +3542,7 @@ "n": 12636 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -3559,7 +3559,7 @@ "n": 12962 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -3576,7 +3576,7 @@ "n": 13072 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -3593,7 +3593,7 @@ "n": 16742 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -3610,7 +3610,7 @@ "n": 17672 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -3627,7 +3627,7 @@ "n": 18718 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -3644,7 +3644,7 @@ "n": 20927 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -3661,7 +3661,7 @@ "n": 22206 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -3678,7 +3678,7 @@ "n": 25026 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -3695,7 +3695,7 @@ "n": 28904 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -3712,7 +3712,7 @@ "n": 30474 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -3729,7 +3729,7 @@ "n": 31859 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -3757,7 +3757,7 @@ "n": 6900 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -3774,7 +3774,7 @@ "n": 8626 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -3791,7 +3791,7 @@ "n": 9802 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -3808,7 +3808,7 @@ "n": 10108 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -3825,7 +3825,7 @@ "n": 10369 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -3842,7 +3842,7 @@ "n": 10457 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -3859,7 +3859,7 @@ "n": 13393 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -3876,7 +3876,7 @@ "n": 14137 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -3893,7 +3893,7 @@ "n": 14974 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -3910,7 +3910,7 @@ "n": 16742 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -3927,7 +3927,7 @@ "n": 17764 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -3944,7 +3944,7 @@ "n": 20020 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -3961,7 +3961,7 @@ "n": 23123 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -3978,7 +3978,7 @@ "n": 24379 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -3995,7 +3995,7 @@ "n": 25487 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 @@ -4023,7 +4023,7 @@ "n": 5520 } ], - "bonus": 0, + "bonus": 333, "activation": false, "probability": 1000, "num": 1 @@ -4040,7 +4040,7 @@ "n": 6901 } ], - "bonus": 300, + "bonus": 666, "activation": false, "probability": 900, "num": 2 @@ -4057,7 +4057,7 @@ "n": 7841 } ], - "bonus": 600, + "bonus": 1000, "activation": true, "probability": 900, "num": 3 @@ -4074,7 +4074,7 @@ "n": 8086 } ], - "bonus": 900, + "bonus": 1333, "activation": false, "probability": 800, "num": 4 @@ -4091,7 +4091,7 @@ "n": 8295 } ], - "bonus": 1200, + "bonus": 1666, "activation": false, "probability": 700, "num": 5 @@ -4108,7 +4108,7 @@ "n": 8365 } ], - "bonus": 1500, + "bonus": 2000, "activation": true, "probability": 600, "num": 6 @@ -4125,7 +4125,7 @@ "n": 10714 } ], - "bonus": 1800, + "bonus": 2333, "activation": false, "probability": 400, "num": 7 @@ -4142,7 +4142,7 @@ "n": 11310 } ], - "bonus": 2100, + "bonus": 2666, "activation": false, "probability": 400, "num": 8 @@ -4159,7 +4159,7 @@ "n": 11979 } ], - "bonus": 2400, + "bonus": 3000, "activation": true, "probability": 400, "num": 9 @@ -4176,7 +4176,7 @@ "n": 13393 } ], - "bonus": 2700, + "bonus": 3333, "activation": false, "probability": 400, "num": 10 @@ -4193,7 +4193,7 @@ "n": 14211 } ], - "bonus": 3000, + "bonus": 3666, "activation": false, "probability": 400, "num": 11 @@ -4210,7 +4210,7 @@ "n": 16016 } ], - "bonus": 3300, + "bonus": 4000, "activation": true, "probability": 300, "num": 12 @@ -4227,7 +4227,7 @@ "n": 18498 } ], - "bonus": 3600, + "bonus": 4333, "activation": false, "probability": 200, "num": 13 @@ -4244,7 +4244,7 @@ "n": 19503 } ], - "bonus": 3900, + "bonus": 4666, "activation": false, "probability": 200, "num": 14 @@ -4261,7 +4261,7 @@ "n": 20389 } ], - "bonus": 4200, + "bonus": 5666, "activation": true, "probability": 150, "num": 15 diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 2f7452c51..d585e7299 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -775,7 +775,7 @@ "stonehenge_guideStage": 88, "story_waittime": 0.8, "sx_ranknum": 200, - "IntegralBoss_challenge_num": 3, + "IntegralBoss_challenge_num": 9999, "friend_help_hero_refresh_num": 5, "td_mainstage_challenge_num": 2, "td_mainstage_challenge_num_max": 10, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index ef4bb5136..285ab14ed 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -14008,6 +14008,11 @@ "a": "equi", "t": "10134", "n": 1 + }, + { + "a": "item", + "t": "24012207", + "n": 1 } ], "lotteryward": 17110110, @@ -15040,6 +15045,11 @@ "a": "equi", "t": "10134", "n": 1 + }, + { + "a": "item", + "t": "24012208", + "n": 1 } ], "lotteryward": 17110110, @@ -18130,7 +18140,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18223,7 +18233,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18347,7 +18357,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18440,7 +18450,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18533,7 +18543,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18626,7 +18636,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18707,7 +18717,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18788,7 +18798,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18869,7 +18879,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18978,9 +18988,21 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "24012209", + "n": 1 + } + ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24012209", + "n": 1 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -22114,6 +22136,11 @@ "a": "equi", "t": "11614", "n": 1 + }, + { + "a": "item", + "t": "24012301", + "n": 1 } ], "lotteryward": 17111610, @@ -23146,6 +23173,11 @@ "a": "equi", "t": "11614", "n": 1 + }, + { + "a": "item", + "t": "24012302", + "n": 1 } ], "lotteryward": 17111610, @@ -23673,7 +23705,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "24012309", + "n": 1 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -24078,7 +24116,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "24012308", + "n": 1 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -24321,7 +24365,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "24012303", + "n": 1 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -24564,7 +24614,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "24012304", + "n": 1 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -24855,7 +24911,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "24012305", + "n": 1 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -25146,7 +25208,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "24012306", + "n": 1 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -25437,7 +25505,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "24012307", + "n": 1 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -25617,6 +25691,93 @@ "star_value": [], "challengeward": 0 }, + { + "id": 1103063, + "chapterid": 11003, + "group_id": 100343, + "previous_group_id": [ + 100312 + ], + "previoustage": 0, + "buried_type": 2, + "buried": 10, + "grouptype": [], + "Episodetype": 7, + "stage_param": 0, + "inherit": false, + "battle_fail": false, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "scene_effect": [], + "scene_effectfilter": "", + "is_near": false, + "openlevel": 1, + "EditorStage": 0, + "herocolor": 2, + "heroimg": "zxgq_qp_icon_gth", + "bubbletext": { + "key": "", + "text": "" + }, + "animation": [], + "prewarbubbletext": { + "key": "", + "text": "" + }, + "hide": false, + "destroy": true, + "progress": 0, + "timelineplayer": false, + "stroyshow": false, + "frontstoryid": 0, + "afterstoryid": 0, + "maingroupName": { + "key": "", + "text": "" + }, + "maingroupIcon": "", + "mainlineName": { + "key": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "exp": 0, + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [ + { + "a": "item", + "t": "10000001", + "n": 10 + } + ], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], + "helphero": [], + "banhero": [], + "star": [], + "star_type": [], + "star_value": [], + "challengeward": 0 + }, { "id": 1104000, "chapterid": 11004, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 12818f223..b7f0402aa 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -306,7 +306,7 @@ "text": "活动" }, "opencondi": [ - 18000013 + 18000022 ], "wkqbx": 2, "img": "icon_sytj", diff --git a/bin/json/game_skillproperty.json b/bin/json/game_skillproperty.json index ccadd6a84..ea24f84ee 100644 --- a/bin/json/game_skillproperty.json +++ b/bin/json/game_skillproperty.json @@ -6,10 +6,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 1, @@ -18,10 +18,10 @@ "LimitValue": 1, "MinValue": 1, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 2, @@ -30,10 +30,18 @@ "LimitValue": 1, "MinValue": 1, "MaxValue": 0, - "BaseTerms": 37, - "ExtraTerms": 45, - "PerTerms": 21, - "FixTerms": 29 + "BaseTerms": [ + 37 + ], + "ExtraTerms": [ + 45 + ], + "PerTerms": [ + 21 + ], + "FixTerms": [ + 29 + ] }, { "ProType": 3, @@ -42,10 +50,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 4, @@ -54,10 +62,18 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 38, - "ExtraTerms": 46, - "PerTerms": 22, - "FixTerms": 30 + "BaseTerms": [ + 38 + ], + "ExtraTerms": [ + 46 + ], + "PerTerms": [ + 22 + ], + "FixTerms": [ + 30 + ] }, { "ProType": 5, @@ -66,10 +82,18 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 39, - "ExtraTerms": 47, - "PerTerms": 23, - "FixTerms": 31 + "BaseTerms": [ + 39 + ], + "ExtraTerms": [ + 47 + ], + "PerTerms": [ + 23 + ], + "FixTerms": [ + 31 + ] }, { "ProType": 6, @@ -78,10 +102,18 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 40, - "ExtraTerms": 48, - "PerTerms": 87, - "FixTerms": 32 + "BaseTerms": [ + 40 + ], + "ExtraTerms": [ + 48 + ], + "PerTerms": [ + 87 + ], + "FixTerms": [ + 32 + ] }, { "ProType": 7, @@ -90,10 +122,18 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 1000, - "BaseTerms": 41, - "ExtraTerms": 49, - "PerTerms": 90, - "FixTerms": 33 + "BaseTerms": [ + 41 + ], + "ExtraTerms": [ + 49 + ], + "PerTerms": [ + 90 + ], + "FixTerms": [ + 33 + ] }, { "ProType": 8, @@ -102,10 +142,18 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 42, - "ExtraTerms": 50, - "PerTerms": 93, - "FixTerms": 34 + "BaseTerms": [ + 42 + ], + "ExtraTerms": [ + 50 + ], + "PerTerms": [ + 93 + ], + "FixTerms": [ + 34 + ] }, { "ProType": 9, @@ -114,10 +162,18 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 1000, - "BaseTerms": 43, - "ExtraTerms": 51, - "PerTerms": 96, - "FixTerms": 35 + "BaseTerms": [ + 43 + ], + "ExtraTerms": [ + 51 + ], + "PerTerms": [ + 96 + ], + "FixTerms": [ + 35 + ] }, { "ProType": 10, @@ -126,10 +182,18 @@ "LimitValue": 1, "MinValue": 200, "MaxValue": 1000, - "BaseTerms": 44, - "ExtraTerms": 52, - "PerTerms": 28, - "FixTerms": 36 + "BaseTerms": [ + 44 + ], + "ExtraTerms": [ + 52 + ], + "PerTerms": [ + 28 + ], + "FixTerms": [ + 36 + ] }, { "ProType": 11, @@ -138,10 +202,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 1000, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 12, @@ -150,10 +214,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 1000, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 13, @@ -162,10 +226,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 14, @@ -174,10 +238,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 15, @@ -186,10 +250,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 16, @@ -198,10 +262,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 17, @@ -210,10 +274,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 18, @@ -222,10 +286,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 19, @@ -234,10 +298,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 20, @@ -246,10 +310,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 21, @@ -258,10 +322,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 22, @@ -270,10 +334,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 23, @@ -282,10 +346,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 24, @@ -294,10 +358,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 25, @@ -306,10 +370,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 26, @@ -318,10 +382,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 27, @@ -330,10 +394,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 28, @@ -342,10 +406,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 29, @@ -354,10 +418,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 30, @@ -366,10 +430,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 31, @@ -378,10 +442,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 32, @@ -390,10 +454,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 33, @@ -402,10 +466,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 34, @@ -414,10 +478,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 35, @@ -426,10 +490,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 36, @@ -438,10 +502,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 37, @@ -450,10 +514,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 53, - "ExtraTerms": 0, - "PerTerms": 54, - "FixTerms": 55 + "BaseTerms": [ + 53 + ], + "ExtraTerms": [], + "PerTerms": [ + 54 + ], + "FixTerms": [ + 55 + ] }, { "ProType": 38, @@ -462,10 +532,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 56, - "ExtraTerms": 0, - "PerTerms": 57, - "FixTerms": 58 + "BaseTerms": [ + 56 + ], + "ExtraTerms": [], + "PerTerms": [ + 57 + ], + "FixTerms": [ + 58 + ] }, { "ProType": 39, @@ -474,10 +550,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 59, - "ExtraTerms": 0, - "PerTerms": 60, - "FixTerms": 61 + "BaseTerms": [ + 59 + ], + "ExtraTerms": [], + "PerTerms": [ + 60 + ], + "FixTerms": [ + 61 + ] }, { "ProType": 40, @@ -486,10 +568,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 62, - "ExtraTerms": 0, - "PerTerms": 63, - "FixTerms": 64 + "BaseTerms": [ + 62 + ], + "ExtraTerms": [], + "PerTerms": [ + 63 + ], + "FixTerms": [ + 64 + ] }, { "ProType": 41, @@ -498,10 +586,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 65, - "ExtraTerms": 0, - "PerTerms": 66, - "FixTerms": 67 + "BaseTerms": [ + 65 + ], + "ExtraTerms": [], + "PerTerms": [ + 66 + ], + "FixTerms": [ + 67 + ] }, { "ProType": 42, @@ -510,10 +604,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 68, - "ExtraTerms": 0, - "PerTerms": 69, - "FixTerms": 70 + "BaseTerms": [ + 68 + ], + "ExtraTerms": [], + "PerTerms": [ + 69 + ], + "FixTerms": [ + 70 + ] }, { "ProType": 43, @@ -522,10 +622,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 71, - "ExtraTerms": 0, - "PerTerms": 72, - "FixTerms": 73 + "BaseTerms": [ + 71 + ], + "ExtraTerms": [], + "PerTerms": [ + 72 + ], + "FixTerms": [ + 73 + ] }, { "ProType": 44, @@ -534,10 +640,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 74, - "ExtraTerms": 0, - "PerTerms": 75, - "FixTerms": 76 + "BaseTerms": [ + 74 + ], + "ExtraTerms": [], + "PerTerms": [ + 75 + ], + "FixTerms": [ + 76 + ] }, { "ProType": 45, @@ -546,10 +658,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 77, - "ExtraTerms": 0, - "PerTerms": 78, - "FixTerms": 79 + "BaseTerms": [ + 77 + ], + "ExtraTerms": [], + "PerTerms": [ + 78 + ], + "FixTerms": [ + 79 + ] }, { "ProType": 46, @@ -558,10 +676,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 80, - "ExtraTerms": 0, - "PerTerms": 81, - "FixTerms": 82 + "BaseTerms": [ + 80 + ], + "ExtraTerms": [], + "PerTerms": [ + 81 + ], + "FixTerms": [ + 82 + ] }, { "ProType": 47, @@ -570,10 +694,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 83, - "ExtraTerms": 0, - "PerTerms": 84, - "FixTerms": 85 + "BaseTerms": [ + 83 + ], + "ExtraTerms": [], + "PerTerms": [ + 84 + ], + "FixTerms": [ + 85 + ] }, { "ProType": 48, @@ -582,10 +712,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 86, - "ExtraTerms": 0, - "PerTerms": 87, - "FixTerms": 88 + "BaseTerms": [ + 86 + ], + "ExtraTerms": [], + "PerTerms": [ + 87 + ], + "FixTerms": [ + 88 + ] }, { "ProType": 49, @@ -594,10 +730,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 89, - "ExtraTerms": 0, - "PerTerms": 90, - "FixTerms": 91 + "BaseTerms": [ + 89 + ], + "ExtraTerms": [], + "PerTerms": [ + 90 + ], + "FixTerms": [ + 91 + ] }, { "ProType": 50, @@ -606,10 +748,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 92, - "ExtraTerms": 0, - "PerTerms": 93, - "FixTerms": 94 + "BaseTerms": [ + 92 + ], + "ExtraTerms": [], + "PerTerms": [ + 93 + ], + "FixTerms": [ + 94 + ] }, { "ProType": 51, @@ -618,10 +766,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 95, - "ExtraTerms": 0, - "PerTerms": 96, - "FixTerms": 97 + "BaseTerms": [ + 95 + ], + "ExtraTerms": [], + "PerTerms": [ + 96 + ], + "FixTerms": [ + 97 + ] }, { "ProType": 52, @@ -630,10 +784,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 98, - "ExtraTerms": 0, - "PerTerms": 99, - "FixTerms": 100 + "BaseTerms": [ + 98 + ], + "ExtraTerms": [], + "PerTerms": [ + 99 + ], + "FixTerms": [ + 100 + ] }, { "ProType": 53, @@ -642,10 +802,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 54, @@ -654,10 +814,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 55, @@ -666,10 +826,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 56, @@ -678,10 +838,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 57, @@ -690,10 +850,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 58, @@ -702,10 +862,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 59, @@ -714,10 +874,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 60, @@ -726,10 +886,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 61, @@ -738,10 +898,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 62, @@ -750,10 +910,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 63, @@ -762,10 +922,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 64, @@ -774,10 +934,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 65, @@ -786,10 +946,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 66, @@ -798,10 +958,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 67, @@ -810,10 +970,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 68, @@ -822,10 +982,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 69, @@ -834,10 +994,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 70, @@ -846,10 +1006,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 71, @@ -858,10 +1018,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 72, @@ -870,10 +1030,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 73, @@ -882,10 +1042,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 74, @@ -894,10 +1054,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 75, @@ -906,10 +1066,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 76, @@ -918,10 +1078,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 77, @@ -930,10 +1090,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 78, @@ -942,10 +1102,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 79, @@ -954,10 +1114,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 80, @@ -966,10 +1126,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 81, @@ -978,10 +1138,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 82, @@ -990,10 +1150,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 83, @@ -1002,10 +1162,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 84, @@ -1014,10 +1174,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 85, @@ -1026,10 +1186,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 86, @@ -1038,10 +1198,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 87, @@ -1050,10 +1210,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 88, @@ -1062,10 +1222,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 89, @@ -1074,10 +1234,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 90, @@ -1086,10 +1246,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 91, @@ -1098,10 +1258,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 92, @@ -1110,10 +1270,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 93, @@ -1122,10 +1282,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 94, @@ -1134,10 +1294,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 95, @@ -1146,10 +1306,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 96, @@ -1158,10 +1318,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 97, @@ -1170,10 +1330,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 98, @@ -1182,10 +1342,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 99, @@ -1194,10 +1354,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 100, @@ -1206,10 +1366,10 @@ "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 101, @@ -1218,10 +1378,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 102, @@ -1230,10 +1390,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 103, @@ -1242,10 +1402,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 104, @@ -1254,10 +1414,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 105, @@ -1266,10 +1426,14 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 107, - "ExtraTerms": 108, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [ + 107 + ], + "ExtraTerms": [ + 108 + ], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 106, @@ -1278,10 +1442,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 107, @@ -1290,10 +1454,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 108, @@ -1302,10 +1466,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 109, @@ -1314,10 +1478,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 110, @@ -1326,10 +1490,16 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 1, - "ExtraTerms": 0, - "PerTerms": 111, - "FixTerms": 112 + "BaseTerms": [ + 1 + ], + "ExtraTerms": [], + "PerTerms": [ + 111 + ], + "FixTerms": [ + 112 + ] }, { "ProType": 111, @@ -1338,10 +1508,10 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 112, @@ -1350,9 +1520,9 @@ "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index dbcacec15..2e9ddd2a1 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -11878,7 +11878,7 @@ "show_mode": 0, "npc": 60480, "completetask": [], - "deliver_npc": 60489, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": true, @@ -11960,7 +11960,7 @@ "show_mode": 0, "npc": 60500, "completetask": [], - "deliver_npc": 60509, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": true, @@ -12042,7 +12042,7 @@ "show_mode": 0, "npc": 60520, "completetask": [], - "deliver_npc": 60529, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": true, @@ -12124,7 +12124,7 @@ "show_mode": 0, "npc": 60540, "completetask": [], - "deliver_npc": 60549, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": true, @@ -12206,7 +12206,7 @@ "show_mode": 0, "npc": 60560, "completetask": [], - "deliver_npc": 60569, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": true, diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index 3aa56da2e..6e01c45d7 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -124,16 +124,16 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh if len(conf.Grouptype) == 2 { info.Stategroup[conf.Grouptype[0]] = conf.Grouptype[1] } - if !conf.Inherit { - info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ - Level: req.Level, - Pos: req.Pos, - } - } else { - info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ - Pos: req.Pos, - } - } + // if !conf.Inherit { + // info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ + // Level: req.Level, + // Pos: req.Pos, + // } + // } else { + // info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ + // Pos: req.Pos, + // } + // } this.module.modelMline.updateprogress(info) if first { // 发奖 diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go index 93600c1a7..fc395bf8b 100644 --- a/modules/mainline/api_levelpass.go +++ b/modules/mainline/api_levelpass.go @@ -50,6 +50,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } + return } if err = this.module.modelMline.checklevel(req.Level, info); err != nil { @@ -79,16 +80,16 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP if len(conf.Grouptype) == 2 { info.Stategroup[conf.Grouptype[0]] = conf.Grouptype[1] } - if !conf.Inherit { - info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ - Level: req.Level, - Pos: req.Pos, - } - } else { - info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ - Pos: req.Pos, - } - } + // if !conf.Inherit { + // info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ + // Level: req.Level, + // Pos: req.Pos, + // } + // } else { + // info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ + // Pos: req.Pos, + // } + // } this.module.modelMline.updateprogress(info) if first { // 发奖 diff --git a/modules/mainline/api_setpolts.go b/modules/mainline/api_setpolts.go new file mode 100644 index 000000000..6fba8082f --- /dev/null +++ b/modules/mainline/api_setpolts.go @@ -0,0 +1,49 @@ +package mainline + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +func (this *apiComp) LevelSetPolts(session comm.IUserSession, req *pb.MainlineSetPoltsReq) (errdata *pb.ErrorData) { + return +} + +// /挑战主线关卡 +func (this *apiComp) SetPolts(session comm.IUserSession, req *pb.MainlineSetPoltsReq) (errdata *pb.ErrorData) { + var ( + info *pb.DBMainline + err error + ) + if errdata = this.LevelSetPolts(session, req); errdata != nil { + return // 参数校验失败直接返回 + } + + if info, err = this.module.modelMline.getMainlineData(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + info.Plots[req.Pid] = req.State + + if err = this.module.modelMline.Change(session.GetUserId(), map[string]interface{}{ + "plots": info.Plots, + }); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + + session.SendMsg(string(this.module.GetType()), "setpolts", &pb.MainlineSetPoltsResp{ + Plots: info.Plots, + }) // 数据推送 + + return +} diff --git a/modules/mainline/model_mainline.go b/modules/mainline/model_mainline.go index 1ee2b2f58..78e6f88f4 100644 --- a/modules/mainline/model_mainline.go +++ b/modules/mainline/model_mainline.go @@ -41,9 +41,9 @@ func (this *ModelMline) getMainlineData(uid string) (results *pb.DBMainline, err if err == mgo.MongodbNil { err = nil results = &pb.DBMainline{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - Lastlevel: make(map[int32]*pb.DBMainlineLastLevel), + Id: primitive.NewObjectID().Hex(), + Uid: uid, + // Lastlevel: make(map[int32]*pb.DBMainlineLastLevel), Level: make(map[int32]int32), Chapteraward: make(map[int32]*pb.DBMainlineAward), Exploreaward: make(map[int32]*pb.DBMainlineAward), @@ -51,6 +51,7 @@ func (this *ModelMline) getMainlineData(uid string) (results *pb.DBMainline, err Ps: make(map[int32]int32), Chapterboos: make(map[int32]int32), Stategroup: make(map[int32]int32), + Plots: make(map[int32]bool), } err = this.Add(uid, results) } @@ -60,12 +61,12 @@ func (this *ModelMline) getMainlineData(uid string) (results *pb.DBMainline, err func (this *ModelMline) updateMainlineData(uid string, data *pb.DBMainline) (err error) { if err = this.Change(uid, map[string]interface{}{ "level": data.Level, - "lastlevel": data.Lastlevel, "chapteraward": data.Chapteraward, "exploreaward": data.Exploreaward, "groupaward": data.Groupaward, "ps": data.Ps, "stategroup": data.Stategroup, + "plots": data.Plots, }); err != nil { this.module.Error("更新用户任务数据 错误!", log.Field{Key: "err", Value: err.Error()}) return diff --git a/modules/mainline/module.go b/modules/mainline/module.go index 5bcc293f5..2dd6b82bc 100644 --- a/modules/mainline/module.go +++ b/modules/mainline/module.go @@ -127,13 +127,15 @@ func (this *Mainline) BingoJumpLevel(session comm.IUserSession, level int32) (er return } info.Level = make(map[int32]int32) - info.Lastlevel = make(map[int32]*pb.DBMainlineLastLevel) + // info.Lastlevel = make(map[int32]*pb.DBMainlineLastLevel) info.Chapteraward = make(map[int32]*pb.DBMainlineAward) info.Exploreaward = make(map[int32]*pb.DBMainlineAward) info.Groupaward = make(map[int32]*pb.DBMainlineAward) + info.Plots = make(map[int32]bool) for _, v := range confs { if v.Id <= level { info.Level[v.Id] = 7 + info.Plots[v.Id] = true aeward = append(aeward, v.Firstaward...) } } diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go index 3bf32cbb5..d67fdf61b 100644 --- a/pb/battle_struct.pb.go +++ b/pb/battle_struct.pb.go @@ -2443,6 +2443,78 @@ func (x *ComBuffSpecialEffect) GetAdd() bool { return false } +//血量变化 +type ComSyncProperty struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Rid int32 `protobuf:"varint,1,opt,name=rid,proto3" json:"rid"` + Hp float32 `protobuf:"fixed32,2,opt,name=hp,proto3" json:"hp"` + MaxHp int32 `protobuf:"varint,3,opt,name=maxHp,proto3" json:"maxHp"` + SealHp int32 `protobuf:"varint,4,opt,name=sealHp,proto3" json:"sealHp"` //被封印的血量 +} + +func (x *ComSyncProperty) Reset() { + *x = ComSyncProperty{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_struct_proto_msgTypes[35] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ComSyncProperty) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ComSyncProperty) ProtoMessage() {} + +func (x *ComSyncProperty) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_struct_proto_msgTypes[35] + 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 ComSyncProperty.ProtoReflect.Descriptor instead. +func (*ComSyncProperty) Descriptor() ([]byte, []int) { + return file_battle_battle_struct_proto_rawDescGZIP(), []int{35} +} + +func (x *ComSyncProperty) GetRid() int32 { + if x != nil { + return x.Rid + } + return 0 +} + +func (x *ComSyncProperty) GetHp() float32 { + if x != nil { + return x.Hp + } + return 0 +} + +func (x *ComSyncProperty) GetMaxHp() int32 { + if x != nil { + return x.MaxHp + } + return 0 +} + +func (x *ComSyncProperty) GetSealHp() int32 { + if x != nil { + return x.SealHp + } + return 0 +} + var File_battle_battle_struct_proto protoreflect.FileDescriptor var file_battle_battle_struct_proto_rawDesc = []byte{ @@ -2665,33 +2737,40 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x64, 0x64, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x61, 0x64, 0x64, 0x2a, 0x93, 0x03, 0x0a, 0x0e, 0x45, 0x66, - 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, - 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, - 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, - 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, - 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, - 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, - 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, - 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, - 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, - 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, - 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, - 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, - 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x65, - 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48, 0x6f, - 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, - 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69, 0x62, - 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61, 0x6c, - 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74, 0x44, - 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69, 0x72, - 0x74, 0x68, 0x10, 0x18, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x72, 0x6f, 0x69, 0x6c, 0x10, 0x19, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x61, 0x64, 0x64, 0x22, 0x61, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, + 0x53, 0x79, 0x6e, 0x63, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x0e, + 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x02, 0x68, 0x70, 0x12, 0x14, + 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x48, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, + 0x61, 0x78, 0x48, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x2a, 0x93, 0x03, 0x0a, + 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, + 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, + 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, + 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, + 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, + 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, + 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, + 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, + 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, + 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, + 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, + 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, + 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, + 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, + 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, + 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, + 0x08, 0x42, 0x65, 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, + 0x69, 0x73, 0x65, 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, + 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, + 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, + 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, + 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, + 0x66, 0x74, 0x44, 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, + 0x62, 0x69, 0x72, 0x74, 0x68, 0x10, 0x18, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x72, 0x6f, 0x69, 0x6c, + 0x10, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -2707,7 +2786,7 @@ func file_battle_battle_struct_proto_rawDescGZIP() []byte { } var file_battle_battle_struct_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 35) +var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 36) var file_battle_battle_struct_proto_goTypes = []interface{}{ (EffectTipsType)(0), // 0: EffectTipsType (*DBPlayerBattleFormt)(nil), // 1: DBPlayerBattleFormt @@ -2745,19 +2824,20 @@ var file_battle_battle_struct_proto_goTypes = []interface{}{ (*ComExtraStage)(nil), // 33: ComExtraStage (*ComInBattleMaxScore)(nil), // 34: ComInBattleMaxScore (*ComBuffSpecialEffect)(nil), // 35: ComBuffSpecialEffect - (*DBHero)(nil), // 36: DBHero - (*BattleRole)(nil), // 37: BattleRole - (*BattleCmd)(nil), // 38: BattleCmd + (*ComSyncProperty)(nil), // 36: ComSyncProperty + (*DBHero)(nil), // 37: DBHero + (*BattleRole)(nil), // 38: BattleRole + (*BattleCmd)(nil), // 39: BattleCmd } var file_battle_battle_struct_proto_depIdxs = []int32{ - 36, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero - 37, // 1: ComInitFight.roles:type_name -> BattleRole + 37, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero + 38, // 1: ComInitFight.roles:type_name -> BattleRole 7, // 2: ComStartAction.skillInfo:type_name -> ComSkillInfo 7, // 3: ComSkillCDAction.skillInfo:type_name -> ComSkillInfo 13, // 4: ComSkillAtk.comList:type_name -> ComSkillAfterAtk - 38, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd + 39, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd 0, // 6: ComModifyHealth.tips:type_name -> EffectTipsType - 37, // 7: ComCreateRoles.roles:type_name -> BattleRole + 38, // 7: ComCreateRoles.roles:type_name -> BattleRole 0, // 8: ComEffectTips.type:type_name -> EffectTipsType 7, // 9: ComReplaceSkill.skillInfo:type_name -> ComSkillInfo 10, // [10:10] is the sub-list for method output_type @@ -3196,6 +3276,18 @@ func file_battle_battle_struct_proto_init() { return nil } } + file_battle_battle_struct_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ComSyncProperty); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -3203,7 +3295,7 @@ func file_battle_battle_struct_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_battle_battle_struct_proto_rawDesc, NumEnums: 1, - NumMessages: 35, + NumMessages: 36, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/comm.pb.go b/pb/comm.pb.go index 8d5edd990..4263d7cd0 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -2507,6 +2507,78 @@ func (x *SweepResult) GetHeroexp() map[string]int32 { return nil } +//服务组数据 +type DBServiceGroup struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` + Group int32 `protobuf:"varint,2,opt,name=group,proto3" json:"group"` //分组 + Create int64 `protobuf:"varint,3,opt,name=create,proto3" json:"create"` //创建时间 + Playernum int32 `protobuf:"varint,4,opt,name=playernum,proto3" json:"playernum"` //玩家数量 +} + +func (x *DBServiceGroup) Reset() { + *x = DBServiceGroup{} + if protoimpl.UnsafeEnabled { + mi := &file_comm_proto_msgTypes[36] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBServiceGroup) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBServiceGroup) ProtoMessage() {} + +func (x *DBServiceGroup) ProtoReflect() protoreflect.Message { + mi := &file_comm_proto_msgTypes[36] + 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 DBServiceGroup.ProtoReflect.Descriptor instead. +func (*DBServiceGroup) Descriptor() ([]byte, []int) { + return file_comm_proto_rawDescGZIP(), []int{36} +} + +func (x *DBServiceGroup) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBServiceGroup) GetGroup() int32 { + if x != nil { + return x.Group + } + return 0 +} + +func (x *DBServiceGroup) GetCreate() int64 { + if x != nil { + return x.Create + } + return 0 +} + +func (x *DBServiceGroup) GetPlayernum() int32 { + if x != nil { + return x.Playernum + } + return 0 +} + var File_comm_proto protoreflect.FileDescriptor var file_comm_proto_rawDesc = []byte{ @@ -2769,13 +2841,20 @@ var file_comm_proto_rawDesc = []byte{ 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 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, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6c, + 0x0a, 0x0e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x1c, + 0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d, 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 ( @@ -2791,7 +2870,7 @@ func file_comm_proto_rawDescGZIP() []byte { } var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 37) +var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 38) var file_comm_proto_goTypes = []interface{}{ (HeroAttributesType)(0), // 0: HeroAttributesType (*ErrorData)(nil), // 1: ErrorData @@ -2830,25 +2909,26 @@ var file_comm_proto_goTypes = []interface{}{ (*ServiceDBInfo)(nil), // 34: ServiceDBInfo (*DBVector3)(nil), // 35: DBVector3 (*SweepResult)(nil), // 36: SweepResult - nil, // 37: SweepResult.HeroexpEntry - (ErrorCode)(0), // 38: ErrorCode - (*anypb.Any)(nil), // 39: google.protobuf.Any + (*DBServiceGroup)(nil), // 37: DBServiceGroup + nil, // 38: SweepResult.HeroexpEntry + (ErrorCode)(0), // 39: ErrorCode + (*anypb.Any)(nil), // 40: google.protobuf.Any } var file_comm_proto_depIdxs = []int32{ - 38, // 0: ErrorData.code:type_name -> ErrorCode + 39, // 0: ErrorData.code:type_name -> ErrorCode 18, // 1: ErrorData.atn:type_name -> UserAssets 3, // 2: MessagePackage.messages:type_name -> UserMessage - 39, // 3: UserMessage.data:type_name -> google.protobuf.Any - 39, // 4: AgentMessage.Message:type_name -> google.protobuf.Any + 40, // 3: UserMessage.data:type_name -> google.protobuf.Any + 40, // 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 - 39, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any - 39, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any - 39, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any + 40, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any + 40, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any + 40, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any 18, // 11: SweepResult.consume:type_name -> UserAssets 19, // 12: SweepResult.award:type_name -> UserAtno - 37, // 13: SweepResult.heroexp:type_name -> SweepResult.HeroexpEntry + 38, // 13: SweepResult.heroexp:type_name -> SweepResult.HeroexpEntry 14, // [14:14] is the sub-list for method output_type 14, // [14:14] is the sub-list for method input_type 14, // [14:14] is the sub-list for extension type_name @@ -3295,6 +3375,18 @@ func file_comm_proto_init() { return nil } } + file_comm_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBServiceGroup); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -3302,7 +3394,7 @@ func file_comm_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_comm_proto_rawDesc, NumEnums: 1, - NumMessages: 37, + NumMessages: 38, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/mainline_db.pb.go b/pb/mainline_db.pb.go index 0fe2e6ebb..5f6f4d66c 100644 --- a/pb/mainline_db.pb.go +++ b/pb/mainline_db.pb.go @@ -80,20 +80,21 @@ type DBMainline struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` - Lastlevel map[int32]*DBMainlineLastLevel `protobuf:"bytes,3,rep,name=lastlevel,proto3" json:"lastlevel" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //最后一次通关管卡 - Level map[int32]int32 `protobuf:"bytes,4,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //已通关管卡的星级 - Chapteraward map[int32]*DBMainlineAward `protobuf:"bytes,5,rep,name=chapteraward,proto3" json:"chapteraward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节进度奖励 - Exploreaward map[int32]*DBMainlineAward `protobuf:"bytes,6,rep,name=exploreaward,proto3" json:"exploreaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励 - Groupaward map[int32]*DBMainlineAward `protobuf:"bytes,7,rep,name=groupaward,proto3" json:"groupaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励 - Ps map[int32]int32 `protobuf:"bytes,8,rep,name=ps,proto3" json:"ps" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 预扣的体力 - Chapterboos map[int32]int32 `protobuf:"bytes,9,rep,name=chapterboos,proto3" json:"chapterboos" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //章节boos - Currbooschapter int32 `protobuf:"varint,10,opt,name=currbooschapter,proto3" json:"currbooschapter"` //当前boos章节 - Currboosmodel int32 `protobuf:"varint,11,opt,name=currboosmodel,proto3" json:"currboosmodel"` //boos形象 - Currbooschallengenum int32 `protobuf:"varint,12,opt,name=currbooschallengenum,proto3" json:"currbooschallengenum"` //当日boos挑战次数 - Lastboosrefresh int64 `protobuf:"varint,13,opt,name=lastboosrefresh,proto3" json:"lastboosrefresh"` //上一次boos刷新时间 - Stategroup map[int32]int32 `protobuf:"bytes,14,rep,name=stategroup,proto3" json:"stategroup" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //飞行状态组 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` + // map lastlevel = 3; //最后一次通关管卡 + Level map[int32]int32 `protobuf:"bytes,4,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //已通关管卡的星级 + Chapteraward map[int32]*DBMainlineAward `protobuf:"bytes,5,rep,name=chapteraward,proto3" json:"chapteraward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节进度奖励 + Exploreaward map[int32]*DBMainlineAward `protobuf:"bytes,6,rep,name=exploreaward,proto3" json:"exploreaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励 + Groupaward map[int32]*DBMainlineAward `protobuf:"bytes,7,rep,name=groupaward,proto3" json:"groupaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励 + Ps map[int32]int32 `protobuf:"bytes,8,rep,name=ps,proto3" json:"ps" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 预扣的体力 + Chapterboos map[int32]int32 `protobuf:"bytes,9,rep,name=chapterboos,proto3" json:"chapterboos" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //章节boos + Currbooschapter int32 `protobuf:"varint,10,opt,name=currbooschapter,proto3" json:"currbooschapter"` //当前boos章节 + Currboosmodel int32 `protobuf:"varint,11,opt,name=currboosmodel,proto3" json:"currboosmodel"` //boos形象 + Currbooschallengenum int32 `protobuf:"varint,12,opt,name=currbooschallengenum,proto3" json:"currbooschallengenum"` //当日boos挑战次数 + Lastboosrefresh int64 `protobuf:"varint,13,opt,name=lastboosrefresh,proto3" json:"lastboosrefresh"` //上一次boos刷新时间 + Stategroup map[int32]int32 `protobuf:"bytes,14,rep,name=stategroup,proto3" json:"stategroup" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //飞行状态组 + Plots map[int32]bool `protobuf:"bytes,15,rep,name=plots,proto3" json:"plots" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //剧情事件状态 } func (x *DBMainline) Reset() { @@ -142,13 +143,6 @@ func (x *DBMainline) GetUid() string { return "" } -func (x *DBMainline) GetLastlevel() map[int32]*DBMainlineLastLevel { - if x != nil { - return x.Lastlevel - } - return nil -} - func (x *DBMainline) GetLevel() map[int32]int32 { if x != nil { return x.Level @@ -226,6 +220,13 @@ func (x *DBMainline) GetStategroup() map[int32]int32 { return nil } +func (x *DBMainline) GetPlots() map[int32]bool { + if x != nil { + return x.Plots + } + return nil +} + type DBMainlineAward struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -434,55 +435,49 @@ var file_mainline_mainline_db_proto_rawDesc = []byte{ 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x33, 0x52, 0x03, - 0x70, 0x6f, 0x73, 0x22, 0xe4, 0x09, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, + 0x70, 0x6f, 0x73, 0x22, 0xbe, 0x09, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x75, 0x69, 0x64, 0x12, 0x38, 0x0a, 0x09, 0x6c, 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76, 0x65, - 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x4c, 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x09, 0x6c, 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x2c, - 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, - 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x41, 0x0a, 0x0c, - 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, - 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x0c, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, - 0x41, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, - 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x61, 0x77, 0x61, - 0x72, 0x64, 0x12, 0x3b, 0x0a, 0x0a, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, - 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x0a, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, - 0x23, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, - 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x02, 0x70, 0x73, 0x12, 0x3e, 0x0a, 0x0b, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, - 0x6f, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, - 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, - 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, - 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, - 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x63, - 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x24, - 0x0a, 0x0d, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, - 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x32, 0x0a, 0x14, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, - 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x14, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x6c, - 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, - 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, 0x66, 0x72, 0x65, - 0x73, 0x68, 0x12, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x1a, - 0x52, 0x0a, 0x0e, 0x4c, 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c, - 0x61, 0x73, 0x74, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, + 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x12, 0x41, 0x0a, 0x0c, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, 0x61, + 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, + 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, 0x61, + 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, + 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x65, 0x78, 0x70, 0x6c, + 0x6f, 0x72, 0x65, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3b, 0x0a, 0x0a, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, + 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x61, + 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x23, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x50, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x02, 0x70, 0x73, 0x12, 0x3e, 0x0a, 0x0b, 0x63, 0x68, + 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x43, 0x68, 0x61, + 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x63, + 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x75, + 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0f, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, + 0x70, 0x74, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x63, 0x75, 0x72, + 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x32, 0x0a, 0x14, 0x63, 0x75, + 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, + 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, + 0x6f, 0x73, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x28, + 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, + 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, + 0x73, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, + 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x67, + 0x72, 0x6f, 0x75, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x2c, 0x0a, 0x05, 0x70, 0x6c, 0x6f, 0x74, 0x73, 0x18, 0x0f, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, + 0x65, 0x2e, 0x50, 0x6c, 0x6f, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x70, 0x6c, + 0x6f, 0x74, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, @@ -512,51 +507,55 @@ var file_mainline_mainline_db_proto_rawDesc = []byte{ 0x74, 0x61, 0x74, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x0f, 0x44, - 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x31, - 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, - 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x2e, - 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, - 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0x96, 0x02, 0x0a, 0x0e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, - 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, - 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x33, - 0x0a, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, - 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, - 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x75, 0x6e, 0x6c, - 0x6f, 0x63, 0x6b, 0x1a, 0x3a, 0x0a, 0x0c, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, - 0x39, 0x0a, 0x0b, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x82, 0x02, 0x0a, 0x0a, 0x44, - 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x74, - 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x4d, - 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x4d, 0x61, - 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x38, 0x0a, 0x0a, 0x54, 0x61, - 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x6c, + 0x6f, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, + 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, + 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, + 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x96, 0x02, 0x0a, 0x0e, + 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, + 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, + 0x12, 0x36, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, + 0x6f, 0x70, 0x2e, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x75, 0x6e, 0x6c, 0x6f, + 0x63, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, + 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x1a, 0x3a, 0x0a, + 0x0c, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x55, 0x6e, 0x6c, + 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x82, 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, + 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, + 0x6b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, + 0x73, 0x6b, 0x73, 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, + 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x1a, 0x38, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, + 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -578,14 +577,14 @@ var file_mainline_mainline_db_proto_goTypes = []interface{}{ (*DBMainlineAward)(nil), // 2: DBMainlineAward (*DBMainlineShop)(nil), // 3: DBMainlineShop (*DBMainTask)(nil), // 4: DBMainTask - nil, // 5: DBMainline.LastlevelEntry - nil, // 6: DBMainline.LevelEntry - nil, // 7: DBMainline.ChapterawardEntry - nil, // 8: DBMainline.ExploreawardEntry - nil, // 9: DBMainline.GroupawardEntry - nil, // 10: DBMainline.PsEntry - nil, // 11: DBMainline.ChapterboosEntry - nil, // 12: DBMainline.StategroupEntry + nil, // 5: DBMainline.LevelEntry + nil, // 6: DBMainline.ChapterawardEntry + nil, // 7: DBMainline.ExploreawardEntry + nil, // 8: DBMainline.GroupawardEntry + nil, // 9: DBMainline.PsEntry + nil, // 10: DBMainline.ChapterboosEntry + nil, // 11: DBMainline.StategroupEntry + nil, // 12: DBMainline.PlotsEntry nil, // 13: DBMainlineAward.AwardEntry nil, // 14: DBMainlineShop.BuytimeEntry nil, // 15: DBMainlineShop.UnlockEntry @@ -595,28 +594,27 @@ var file_mainline_mainline_db_proto_goTypes = []interface{}{ } var file_mainline_mainline_db_proto_depIdxs = []int32{ 18, // 0: DBMainlineLastLevel.pos:type_name -> DBVector3 - 5, // 1: DBMainline.lastlevel:type_name -> DBMainline.LastlevelEntry - 6, // 2: DBMainline.level:type_name -> DBMainline.LevelEntry - 7, // 3: DBMainline.chapteraward:type_name -> DBMainline.ChapterawardEntry - 8, // 4: DBMainline.exploreaward:type_name -> DBMainline.ExploreawardEntry - 9, // 5: DBMainline.groupaward:type_name -> DBMainline.GroupawardEntry - 10, // 6: DBMainline.ps:type_name -> DBMainline.PsEntry - 11, // 7: DBMainline.chapterboos:type_name -> DBMainline.ChapterboosEntry - 12, // 8: DBMainline.stategroup:type_name -> DBMainline.StategroupEntry + 5, // 1: DBMainline.level:type_name -> DBMainline.LevelEntry + 6, // 2: DBMainline.chapteraward:type_name -> DBMainline.ChapterawardEntry + 7, // 3: DBMainline.exploreaward:type_name -> DBMainline.ExploreawardEntry + 8, // 4: DBMainline.groupaward:type_name -> DBMainline.GroupawardEntry + 9, // 5: DBMainline.ps:type_name -> DBMainline.PsEntry + 10, // 6: DBMainline.chapterboos:type_name -> DBMainline.ChapterboosEntry + 11, // 7: DBMainline.stategroup:type_name -> DBMainline.StategroupEntry + 12, // 8: DBMainline.plots:type_name -> DBMainline.PlotsEntry 13, // 9: DBMainlineAward.award:type_name -> DBMainlineAward.AwardEntry 14, // 10: DBMainlineShop.buytime:type_name -> DBMainlineShop.BuytimeEntry 15, // 11: DBMainlineShop.unlock:type_name -> DBMainlineShop.UnlockEntry 16, // 12: DBMainTask.tasks:type_name -> DBMainTask.TasksEntry 17, // 13: DBMainTask.reward:type_name -> DBMainTask.RewardEntry - 0, // 14: DBMainline.LastlevelEntry.value:type_name -> DBMainlineLastLevel - 2, // 15: DBMainline.ChapterawardEntry.value:type_name -> DBMainlineAward - 2, // 16: DBMainline.ExploreawardEntry.value:type_name -> DBMainlineAward - 2, // 17: DBMainline.GroupawardEntry.value:type_name -> DBMainlineAward - 18, // [18:18] is the sub-list for method output_type - 18, // [18:18] is the sub-list for method input_type - 18, // [18:18] is the sub-list for extension type_name - 18, // [18:18] is the sub-list for extension extendee - 0, // [0:18] is the sub-list for field type_name + 2, // 14: DBMainline.ChapterawardEntry.value:type_name -> DBMainlineAward + 2, // 15: DBMainline.ExploreawardEntry.value:type_name -> DBMainlineAward + 2, // 16: DBMainline.GroupawardEntry.value:type_name -> DBMainlineAward + 17, // [17:17] is the sub-list for method output_type + 17, // [17:17] is the sub-list for method input_type + 17, // [17:17] is the sub-list for extension type_name + 17, // [17:17] is the sub-list for extension extendee + 0, // [0:17] is the sub-list for field type_name } func init() { file_mainline_mainline_db_proto_init() } diff --git a/pb/mainline_msg.pb.go b/pb/mainline_msg.pb.go index d4d21bbf2..3e47e4398 100644 --- a/pb/mainline_msg.pb.go +++ b/pb/mainline_msg.pb.go @@ -226,7 +226,6 @@ type MainlineChallengeOverReq struct { Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` // 小关ID Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报 - Pos *DBVector3 `protobuf:"bytes,3,opt,name=pos,proto3" json:"pos"` } func (x *MainlineChallengeOverReq) Reset() { @@ -275,13 +274,6 @@ func (x *MainlineChallengeOverReq) GetReport() *BattleReport { return nil } -func (x *MainlineChallengeOverReq) GetPos() *DBVector3 { - if x != nil { - return x.Pos - } - return nil -} - type MainlineChallengeOverResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -367,8 +359,7 @@ type MainlineLevelPassReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` // 小关ID - Pos *DBVector3 `protobuf:"bytes,2,opt,name=pos,proto3" json:"pos"` + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` // 小关ID } func (x *MainlineLevelPassReq) Reset() { @@ -410,13 +401,6 @@ func (x *MainlineLevelPassReq) GetLevel() int32 { return 0 } -func (x *MainlineLevelPassReq) GetPos() *DBVector3 { - if x != nil { - return x.Pos - } - return nil -} - type MainlineLevelPassResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1297,7 +1281,6 @@ type MainlineBoosChallengeOverReq struct { Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"` Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报 - Pos *DBVector3 `protobuf:"bytes,3,opt,name=pos,proto3" json:"pos"` } func (x *MainlineBoosChallengeOverReq) Reset() { @@ -1346,13 +1329,6 @@ func (x *MainlineBoosChallengeOverReq) GetReport() *BattleReport { return nil } -func (x *MainlineBoosChallengeOverReq) GetPos() *DBVector3 { - if x != nil { - return x.Pos - } - return nil -} - type MainlineBoosChallengeOverResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1416,6 +1392,110 @@ func (x *MainlineBoosChallengeOverResp) GetHeroexp() map[string]int32 { return nil } +//设置剧情状态 +type MainlineSetPoltsReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Pid int32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid"` + State bool `protobuf:"varint,2,opt,name=state,proto3" json:"state"` +} + +func (x *MainlineSetPoltsReq) Reset() { + *x = MainlineSetPoltsReq{} + if protoimpl.UnsafeEnabled { + mi := &file_mainline_mainline_msg_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MainlineSetPoltsReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MainlineSetPoltsReq) ProtoMessage() {} + +func (x *MainlineSetPoltsReq) ProtoReflect() protoreflect.Message { + mi := &file_mainline_mainline_msg_proto_msgTypes[25] + 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 MainlineSetPoltsReq.ProtoReflect.Descriptor instead. +func (*MainlineSetPoltsReq) Descriptor() ([]byte, []int) { + return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{25} +} + +func (x *MainlineSetPoltsReq) GetPid() int32 { + if x != nil { + return x.Pid + } + return 0 +} + +func (x *MainlineSetPoltsReq) GetState() bool { + if x != nil { + return x.State + } + return false +} + +//设置剧情状态 +type MainlineSetPoltsResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Plots map[int32]bool `protobuf:"bytes,1,rep,name=plots,proto3" json:"plots" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //剧情事件状态 +} + +func (x *MainlineSetPoltsResp) Reset() { + *x = MainlineSetPoltsResp{} + if protoimpl.UnsafeEnabled { + mi := &file_mainline_mainline_msg_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MainlineSetPoltsResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MainlineSetPoltsResp) ProtoMessage() {} + +func (x *MainlineSetPoltsResp) ProtoReflect() protoreflect.Message { + mi := &file_mainline_mainline_msg_proto_msgTypes[26] + 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 MainlineSetPoltsResp.ProtoReflect.Descriptor instead. +func (*MainlineSetPoltsResp) Descriptor() ([]byte, []int) { + return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{26} +} + +func (x *MainlineSetPoltsResp) GetPlots() map[int32]bool { + if x != nil { + return x.Plots + } + return nil +} + var File_mainline_mainline_msg_proto protoreflect.FileDescriptor var file_mainline_mainline_msg_proto_rawDesc = []byte{ @@ -1439,133 +1519,140 @@ var file_mainline_mainline_msg_proto_rawDesc = []byte{ 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, - 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x75, + 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x57, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 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, 0x12, 0x1c, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x33, - 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x81, 0x02, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, + 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x81, 0x02, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, + 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, + 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x41, 0x0a, 0x07, + 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, + 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, + 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, + 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, + 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2c, 0x0a, 0x14, 0x4d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, + 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x98, 0x01, 0x0a, 0x15, 0x4d, 0x61, + 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x41, 0x0a, 0x07, 0x68, 0x65, - 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x4d, 0x61, - 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, - 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, - 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4a, 0x0a, 0x14, 0x4d, 0x61, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, - 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x33, - 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x98, 0x01, 0x0a, 0x15, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, - 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, - 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, - 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, - 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, - 0x22, 0x75, 0x0a, 0x17, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, - 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x22, 0x99, 0x01, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, - 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, - 0x70, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, - 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, - 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, - 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, - 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, - 0x26, 0x0a, 0x12, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x42, - 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x59, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, + 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, + 0x72, 0x6f, 0x45, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, + 0x6f, 0x45, 0x78, 0x70, 0x22, 0x75, 0x0a, 0x17, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, + 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, + 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x22, 0x99, 0x01, 0x0a, 0x18, + 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, + 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, + 0x0a, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, + 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, + 0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, + 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x4d, 0x61, 0x69, 0x6e, 0x6c, + 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x10, 0x4d, 0x61, + 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x04, 0x69, - 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x69, 0x74, - 0x65, 0x6d, 0x22, 0x2a, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, - 0x6f, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, - 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x15, - 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, - 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, - 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, - 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, - 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, - 0x22, 0x28, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, - 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x17, 0x4d, 0x61, - 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, - 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x39, 0x0a, 0x1b, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x69, - 0x64, 0x22, 0x60, 0x0a, 0x1c, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, - 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, - 0x73, 0x6b, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, - 0x61, 0x72, 0x64, 0x22, 0x5c, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, - 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 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, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x18, 0x02, 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, 0x54, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, - 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, - 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, - 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x22, 0x7b, 0x0a, 0x1c, 0x4d, 0x61, 0x69, 0x6e, 0x6c, + 0x6e, 0x66, 0x6f, 0x22, 0x26, 0x0a, 0x12, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, + 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x59, 0x0a, 0x13, 0x4d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, + 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, + 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x2a, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, + 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, + 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x63, + 0x69, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, + 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x14, 0x4d, 0x61, 0x69, + 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x21, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, + 0x61, 0x73, 0x6b, 0x73, 0x22, 0x28, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, + 0x0a, 0x17, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, + 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, + 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x39, 0x0a, 0x1b, 0x4d, 0x61, + 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, + 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, + 0x70, 0x74, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x61, + 0x70, 0x74, 0x65, 0x69, 0x64, 0x22, 0x60, 0x0a, 0x1c, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, + 0x65, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, + 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, + 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x5c, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, - 0x4f, 0x76, 0x65, 0x72, 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, - 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 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, 0x12, 0x1c, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x33, 0x52, - 0x03, 0x70, 0x6f, 0x73, 0x22, 0xdd, 0x01, 0x0a, 0x1d, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, - 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, - 0x65, 0x72, 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, 0x21, - 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x12, 0x45, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, - 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, - 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, - 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 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, 0x28, 0x0a, 0x06, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 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, 0x54, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, + 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, + 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x22, 0x5d, 0x0a, 0x1c, 0x4d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, + 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 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, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 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, 0xdd, 0x01, 0x0a, 0x1d, 0x4d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, + 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 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, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, + 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x45, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, + 0x78, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x4d, 0x61, 0x69, 0x6e, 0x6c, + 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, + 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, + 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3d, 0x0a, 0x13, 0x4d, 0x61, + 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x65, 0x74, 0x50, 0x6f, 0x6c, 0x74, 0x73, 0x52, 0x65, + 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x70, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x88, 0x01, 0x0a, 0x14, 0x4d, 0x61, + 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x65, 0x74, 0x50, 0x6f, 0x6c, 0x74, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x36, 0x0a, 0x05, 0x70, 0x6c, 0x6f, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x20, 0x2e, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x65, 0x74, 0x50, + 0x6f, 0x6c, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x50, 0x6c, 0x6f, 0x74, 0x73, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x05, 0x70, 0x6c, 0x6f, 0x74, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x6c, + 0x6f, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } @@ -1582,7 +1669,7 @@ func file_mainline_mainline_msg_proto_rawDescGZIP() []byte { return file_mainline_mainline_msg_proto_rawDescData } -var file_mainline_mainline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27) +var file_mainline_mainline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30) var file_mainline_mainline_msg_proto_goTypes = []interface{}{ (*MainlineInfoReq)(nil), // 0: MainlineInfoReq (*MainlineInfoResp)(nil), // 1: MainlineInfoResp @@ -1609,46 +1696,46 @@ var file_mainline_mainline_msg_proto_goTypes = []interface{}{ (*MainlineBoosChallengeResp)(nil), // 22: MainlineBoosChallengeResp (*MainlineBoosChallengeOverReq)(nil), // 23: MainlineBoosChallengeOverReq (*MainlineBoosChallengeOverResp)(nil), // 24: MainlineBoosChallengeOverResp - nil, // 25: MainlineChallengeOverResp.HeroexpEntry - nil, // 26: MainlineBoosChallengeOverResp.HeroexpEntry - (*DBMainline)(nil), // 27: DBMainline - (*BattleFormation)(nil), // 28: BattleFormation - (*BattleInfo)(nil), // 29: BattleInfo - (*BattleReport)(nil), // 30: BattleReport - (*DBVector3)(nil), // 31: DBVector3 - (*UserAtno)(nil), // 32: UserAtno - (*DBMainlineShop)(nil), // 33: DBMainlineShop - (*DBMainTask)(nil), // 34: DBMainTask + (*MainlineSetPoltsReq)(nil), // 25: MainlineSetPoltsReq + (*MainlineSetPoltsResp)(nil), // 26: MainlineSetPoltsResp + nil, // 27: MainlineChallengeOverResp.HeroexpEntry + nil, // 28: MainlineBoosChallengeOverResp.HeroexpEntry + nil, // 29: MainlineSetPoltsResp.PlotsEntry + (*DBMainline)(nil), // 30: DBMainline + (*BattleFormation)(nil), // 31: BattleFormation + (*BattleInfo)(nil), // 32: BattleInfo + (*BattleReport)(nil), // 33: BattleReport + (*UserAtno)(nil), // 34: UserAtno + (*DBMainlineShop)(nil), // 35: DBMainlineShop + (*DBMainTask)(nil), // 36: DBMainTask } var file_mainline_mainline_msg_proto_depIdxs = []int32{ - 27, // 0: MainlineInfoResp.info:type_name -> DBMainline - 28, // 1: MainlineChallengeReq.battle:type_name -> BattleFormation - 29, // 2: MainlineChallengeResp.info:type_name -> BattleInfo - 30, // 3: MainlineChallengeOverReq.report:type_name -> BattleReport - 31, // 4: MainlineChallengeOverReq.pos:type_name -> DBVector3 - 32, // 5: MainlineChallengeOverResp.reward:type_name -> UserAtno - 25, // 6: MainlineChallengeOverResp.heroexp:type_name -> MainlineChallengeOverResp.HeroexpEntry - 31, // 7: MainlineLevelPassReq.pos:type_name -> DBVector3 - 32, // 8: MainlineLevelPassResp.reward:type_name -> UserAtno - 32, // 9: MainlineReceiveAwardResp.reward:type_name -> UserAtno - 33, // 10: MainlineShopResp.info:type_name -> DBMainlineShop - 33, // 11: MainlineShopBuyResp.info:type_name -> DBMainlineShop - 32, // 12: MainlineShopBuyResp.item:type_name -> UserAtno - 34, // 13: MainlineTaskInfoResp.tasks:type_name -> DBMainTask - 32, // 14: MainlineTaskReceiveResp.award:type_name -> UserAtno - 34, // 15: MainlineTaskChapteRewardResp.task:type_name -> DBMainTask - 32, // 16: MainlineTaskChapteRewardResp.award:type_name -> UserAtno - 28, // 17: MainlineBoosChallengeReq.battle:type_name -> BattleFormation - 29, // 18: MainlineBoosChallengeResp.info:type_name -> BattleInfo - 30, // 19: MainlineBoosChallengeOverReq.report:type_name -> BattleReport - 31, // 20: MainlineBoosChallengeOverReq.pos:type_name -> DBVector3 - 32, // 21: MainlineBoosChallengeOverResp.reward:type_name -> UserAtno - 26, // 22: MainlineBoosChallengeOverResp.heroexp:type_name -> MainlineBoosChallengeOverResp.HeroexpEntry - 23, // [23:23] is the sub-list for method output_type - 23, // [23:23] is the sub-list for method input_type - 23, // [23:23] is the sub-list for extension type_name - 23, // [23:23] is the sub-list for extension extendee - 0, // [0:23] is the sub-list for field type_name + 30, // 0: MainlineInfoResp.info:type_name -> DBMainline + 31, // 1: MainlineChallengeReq.battle:type_name -> BattleFormation + 32, // 2: MainlineChallengeResp.info:type_name -> BattleInfo + 33, // 3: MainlineChallengeOverReq.report:type_name -> BattleReport + 34, // 4: MainlineChallengeOverResp.reward:type_name -> UserAtno + 27, // 5: MainlineChallengeOverResp.heroexp:type_name -> MainlineChallengeOverResp.HeroexpEntry + 34, // 6: MainlineLevelPassResp.reward:type_name -> UserAtno + 34, // 7: MainlineReceiveAwardResp.reward:type_name -> UserAtno + 35, // 8: MainlineShopResp.info:type_name -> DBMainlineShop + 35, // 9: MainlineShopBuyResp.info:type_name -> DBMainlineShop + 34, // 10: MainlineShopBuyResp.item:type_name -> UserAtno + 36, // 11: MainlineTaskInfoResp.tasks:type_name -> DBMainTask + 34, // 12: MainlineTaskReceiveResp.award:type_name -> UserAtno + 36, // 13: MainlineTaskChapteRewardResp.task:type_name -> DBMainTask + 34, // 14: MainlineTaskChapteRewardResp.award:type_name -> UserAtno + 31, // 15: MainlineBoosChallengeReq.battle:type_name -> BattleFormation + 32, // 16: MainlineBoosChallengeResp.info:type_name -> BattleInfo + 33, // 17: MainlineBoosChallengeOverReq.report:type_name -> BattleReport + 34, // 18: MainlineBoosChallengeOverResp.reward:type_name -> UserAtno + 28, // 19: MainlineBoosChallengeOverResp.heroexp:type_name -> MainlineBoosChallengeOverResp.HeroexpEntry + 29, // 20: MainlineSetPoltsResp.plots:type_name -> MainlineSetPoltsResp.PlotsEntry + 21, // [21:21] is the sub-list for method output_type + 21, // [21:21] is the sub-list for method input_type + 21, // [21:21] is the sub-list for extension type_name + 21, // [21:21] is the sub-list for extension extendee + 0, // [0:21] is the sub-list for field type_name } func init() { file_mainline_mainline_msg_proto_init() } @@ -1960,6 +2047,30 @@ func file_mainline_mainline_msg_proto_init() { return nil } } + file_mainline_mainline_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MainlineSetPoltsReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_mainline_mainline_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MainlineSetPoltsResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1967,7 +2078,7 @@ func file_mainline_mainline_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_mainline_mainline_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 27, + NumMessages: 30, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.SkillPropertyData.go b/sys/configure/structs/Game.SkillPropertyData.go index 328795960..578881f1c 100644 --- a/sys/configure/structs/Game.SkillPropertyData.go +++ b/sys/configure/structs/Game.SkillPropertyData.go @@ -17,10 +17,10 @@ type GameSkillPropertyData struct { LimitValue int32 MinValue int32 MaxValue int32 - BaseTerms int32 - ExtraTerms int32 - PerTerms int32 - FixTerms int32 + BaseTerms []int32 + ExtraTerms []int32 + PerTerms []int32 + FixTerms []int32 } const TypeId_GameSkillPropertyData = 880868628 @@ -36,10 +36,62 @@ func (_v *GameSkillPropertyData)Deserialize(_buf map[string]interface{}) (err er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LimitValue"].(float64); !_ok_ { err = errors.New("LimitValue error"); return }; _v.LimitValue = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MinValue"].(float64); !_ok_ { err = errors.New("MinValue error"); return }; _v.MinValue = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxValue"].(float64); !_ok_ { err = errors.New("MaxValue error"); return }; _v.MaxValue = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BaseTerms"].(float64); !_ok_ { err = errors.New("BaseTerms error"); return }; _v.BaseTerms = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ExtraTerms"].(float64); !_ok_ { err = errors.New("ExtraTerms error"); return }; _v.ExtraTerms = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PerTerms"].(float64); !_ok_ { err = errors.New("PerTerms error"); return }; _v.PerTerms = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["FixTerms"].(float64); !_ok_ { err = errors.New("FixTerms error"); return }; _v.FixTerms = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["BaseTerms"].([]interface{}); !_ok_ { err = errors.New("BaseTerms error"); return } + + _v.BaseTerms = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.BaseTerms = append(_v.BaseTerms, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ExtraTerms"].([]interface{}); !_ok_ { err = errors.New("ExtraTerms error"); return } + + _v.ExtraTerms = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.ExtraTerms = append(_v.ExtraTerms, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["PerTerms"].([]interface{}); !_ok_ { err = errors.New("PerTerms error"); return } + + _v.PerTerms = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.PerTerms = append(_v.PerTerms, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["FixTerms"].([]interface{}); !_ok_ { err = errors.New("FixTerms error"); return } + + _v.FixTerms = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.FixTerms = append(_v.FixTerms, _list_v_) + } + } + return }