diff --git a/bin/json/game_comatn.json b/bin/json/game_comatn.json deleted file mode 100644 index 73f5c7c13..000000000 --- a/bin/json/game_comatn.json +++ /dev/null @@ -1,62 +0,0 @@ -[ - { - "index": "hero_reset", - "var": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "index": "hero_name", - "var": [ - { - "a": "attr", - "t": "gold", - "n": 20 - } - ] - }, - { - "index": "friend_peize", - "var": [ - { - "a": "attr", - "t": "friend", - "n": 100 - } - ] - }, - { - "index": "equip_wash", - "var": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "index": "talent_reset", - "var": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "index": "unified_reward", - "var": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - } -] \ No newline at end of file diff --git a/bin/json/game_heroresonance.json b/bin/json/game_heroresonance.json deleted file mode 100644 index b8be56d6d..000000000 --- a/bin/json/game_heroresonance.json +++ /dev/null @@ -1,2345 +0,0 @@ -[ - { - "hid": "13001", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "13001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 736, - "atkscale": 90, - "defscale": 174, - "maxnum": 6 - }, - { - "hid": "13002", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "13002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 106, - "atkscale": 50, - "defscale": 844, - "maxnum": 6 - }, - { - "hid": "13003", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "13003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 255, - "atkscale": 140, - "defscale": 605, - "maxnum": 6 - }, - { - "hid": "13004", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "13004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "13005", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "13005", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "14001", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "14001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "14002", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "14002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "14003", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "14003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "14004", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "14004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "14005", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "14005", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "14006", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "14006", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "14007", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "14007", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "15001", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "15001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "15002", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "15002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "15003", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "15003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "15004", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "15004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "23001", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "23001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "23002", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "23002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "23003", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "23003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "23004", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "23004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "24001", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "24001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "24002", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "24002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "24003", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "24003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "24004", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "24004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "24005", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "24005", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "24006", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "24006", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "24007", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "24007", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "24008", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "24008", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "24009", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "24009", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "25001", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "25001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "25002", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "25002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "25003", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "25003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "25004", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "25004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "33001", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "33001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "33002", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "33002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "33003", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "33003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "33004", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "33004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "33005", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "33005", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "33006", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "33006", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "34001", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "34001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "34002", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "34002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "34003", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "34003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "34004", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "34004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "34005", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "34005", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "34006", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "34006", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "34007", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "34007", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "34008", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "34008", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "35001", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "35001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "35002", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "35002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "35003", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "35003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "35004", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "35004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "35005", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "35005", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "35006", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "35006", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "43001", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "43001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "43002", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "43002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "43003", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "43003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "43004", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "43004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "43005", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "43005", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "43006", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "43006", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "43007", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "43007", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "44001", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "44001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "44002", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "44002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "44003", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "44003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "44004", - "star": 4, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43902", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "44004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "44006", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "44006", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "45001", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "45001", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "45002", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "45002", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "45003", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "45003", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "45004", - "star": 5, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43903", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "45004", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "44005", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "44005", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - }, - { - "hid": "15005", - "star": 3, - "energy": 6, - "prize": [ - { - "a": "hero", - "t": "43901", - "n": 1 - } - ], - "heroneed": [ - { - "a": "hero", - "t": "15005", - "n": 1 - } - ], - "need": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "hppro": 10, - "atkpro": 10, - "defpro": 10, - "hpscale": 105, - "atkscale": 750, - "defscale": 145, - "maxnum": 6 - } -] \ No newline at end of file diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 1b6bc19d9..80a2b1149 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -67,12 +67,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero) _hero.JuexProperty = map[string]int32{} chanegCard = append(chanegCard, newHero) - _heroMap["isOverlying"] = false + _heroMap["sameCount"] = 1 _heroMap["horoscopeProperty"] = _hero.HoroscopeProperty } _hero.SameCount = 1 - _hero.IsOverlying = false // 加属性 awakenData if len(awakenData.Phasebonus) != 2 { code = pb.ErrorCode_ConfigNoFound diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 4c2b5b99e..086390902 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -20,23 +20,22 @@ func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCa //抽卡 func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data proto.Message) { var ( - szCards []string // 最终抽到的卡牌 - drawCount int32 // 抽卡次数 - szStar []int32 //星级 - costRes []*cfg.Gameatn // 消耗 - star4Max int32 // 10连抽最大4星数量 - star5Max int32 // 10连抽最大5星数量 - cfgDraw *cfg.GameGlobalData - costAtn *cfg.Gameatn - heroRecord *pb.DBHeroRecord - pool string // 当前抽对应的卡池 - _mapAddHero map[string]int32 - strPool []string // 10连跨多个卡池情况 - update map[string]interface{} - normalDraw bool // 是否是普通抽 + szCards []string // 最终抽到的卡牌 + drawCount int32 // 抽卡次数 + szStar []int32 //星级 + costRes []*cfg.Gameatn // 消耗 + star4Max int32 // 10连抽最大4星数量 + star5Max int32 // 10连抽最大5星数量 + cfgDraw *cfg.GameGlobalData + costAtn *cfg.Gameatn + heroRecord *pb.DBHeroRecord + pool string // 当前抽对应的卡池 + + strPool []string // 10连跨多个卡池情况 + update map[string]interface{} + normalDraw bool // 是否是普通抽 ) update = make(map[string]interface{}) - _mapAddHero = make(map[string]int32, 0) cfgDraw = this.module.configure.GetGlobalConf() // 读取抽卡配置文件 if cfgDraw == nil { return @@ -326,35 +325,30 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq update["totalcount"] = heroRecord.Totalcount update["daycount"] = heroRecord.Daycount this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update) - szNewCards := make([]*cfg.Gameatn, 0) + rsp := &pb.HeroDrawCardResp{ + Data: []*pb.AtnoData{}, + } for _, heroId := range szCards { - bFind := false - _mapAddHero[heroId]++ - for _, v := range szNewCards { - if v.T == heroId { - v.N++ - bFind = true - break + + res := &cfg.Gameatn{ + A: "hero", + T: heroId, + N: 1, + } + if code, atno := this.module.DispenseAtno(session, []*cfg.Gameatn{res}, true); code == pb.ErrorCode_Success { + var list *pb.AtnoData + list.Atno = atno + rsp.Data = append(rsp.Data, list) + for _, v := range atno { + if v.A == "hero" { + if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { // 广播 首次获得英雄 + this.chat.SendSysChatToWorld(comm.ChatSystem13, nil, 0, 0, user.Name, v.T) + } + } } } - if !bFind { - res := &cfg.Gameatn{ - A: "hero", - T: heroId, - N: 1, - } - szNewCards = append(szNewCards, res) - } } - // 获得新卡 - - if code = this.module.DispenseRes(session, szNewCards, true); code != pb.ErrorCode_Success { - - this.module.Errorf("err:%v,create heros:%v,uid,%s", code, szNewCards, session.GetUserId()) - code = pb.ErrorCode_HeroCreate // 创建新英雄失败 - } - ///英雄招募 【玩家名称】在招募中获得了【英雄名称】！ - this.module.SendChatMsg(session, _mapAddHero, szCards) + session.SendMsg(string(this.module.GetType()), DrawCard, rsp) // 任务统计 this.module.SendTaskMsg(session, szStar, req.DrawCount, normalDraw) diff --git a/modules/hero/api_specified.go b/modules/hero/api_specified.go index 301ef9462..244967a6c 100644 --- a/modules/hero/api_specified.go +++ b/modules/hero/api_specified.go @@ -32,9 +32,8 @@ func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpec hero.Lv = req.Lv hero.Star = req.Star _heroMap := map[string]interface{}{ - "lv": hero.Lv, - "star": hero.Star, - "isOverlying": false, + "lv": hero.Lv, + "star": hero.Star, } // 保存数据 err1 := this.module.modelHero.ChangeList(session.GetUserId(), hero.Id, _heroMap) diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index d49e8ff80..4e0a7928a 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -13,26 +13,24 @@ import ( ) const ( - equip_suit = "game_equipsuit.json" //装备套装表 - new_hero = "game_hero.json" //英雄 - hero_stargrow = "game_herostargrow.json" //英雄品质系数 - hero_levelgrow = "game_herolevelgrow.json" //英雄成长系数 - hero_starup = "game_herostarup.json" // 升星 - hero_levelup = "game_herolevelup.json" //英雄等级基础属性 - hero_exp = "game_heroexp.json" // 升级 - hero_skillup = "game_heroskilllevel.json" // 英雄技能升级 - game_skillatk = "game_skillatk.json" // 英雄技能 - //hero_resonance = "game_heroresonance.json" // 英雄共鸣 - //hero_comatn = "game_comatn.json" // 英雄共鸣重置 - hero_awaken = "game_heroawaken.json" // 英雄觉醒 - hero_drawcard = "game_drawcard.json" // 抽卡 - hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整 - hero_drawcost = "game_drawcost.json" // 抽卡消耗 - hero_fusion = "game_herofusion.json" // 卡牌融合 - hero_starupsp = "game_herostarupsp.json" // 精灵升星 - hero_talentskill = "game_talentskill.json" // 天赋 - hero_talent = "game_herotalent.json" // 天赋详细数据 - hero_itembox = "game_itembox.json" // 天赋详细数据 + equip_suit = "game_equipsuit.json" //装备套装表 + new_hero = "game_hero.json" //英雄 + hero_stargrow = "game_herostargrow.json" //英雄品质系数 + hero_levelgrow = "game_herolevelgrow.json" //英雄成长系数 + hero_starup = "game_herostarup.json" // 升星 + hero_levelup = "game_herolevelup.json" //英雄等级基础属性 + hero_exp = "game_heroexp.json" // 升级 + hero_skillup = "game_heroskilllevel.json" // 英雄技能升级 + game_skillatk = "game_skillatk.json" // 英雄技能 + hero_awaken = "game_heroawaken.json" // 英雄觉醒 + hero_drawcard = "game_drawcard.json" // 抽卡 + hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整 + hero_drawcost = "game_drawcost.json" // 抽卡消耗 + hero_fusion = "game_herofusion.json" // 卡牌融合 + hero_starupsp = "game_herostarupsp.json" // 精灵升星 + hero_talentskill = "game_talentskill.json" // 天赋 + hero_talent = "game_herotalent.json" // 天赋详细数据 + hero_itembox = "game_itembox.json" // 天赋详细数据 game_shopitem = "game_shopitem.json" hero_skill = "game_heroskill.json" ) @@ -54,15 +52,14 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*Hero) err = this.LoadMultiConfigure(map[string]interface{}{ - equip_suit: cfg.NewGameEquipSuit, - new_hero: cfg.NewGameHero, - hero_stargrow: cfg.NewGameHeroStargrow, - hero_levelgrow: cfg.NewGameHeroLevelgrow, - hero_levelup: cfg.NewGameHeroLevelup, - hero_exp: cfg.NewGameHeroExp, - hero_skillup: cfg.NewGameHeroSkillLevel, - game_skillatk: cfg.NewGameSkillAtk, - //hero_comatn: cfg.NewGameComAtn, + equip_suit: cfg.NewGameEquipSuit, + new_hero: cfg.NewGameHero, + hero_stargrow: cfg.NewGameHeroStargrow, + hero_levelgrow: cfg.NewGameHeroLevelgrow, + hero_levelup: cfg.NewGameHeroLevelup, + hero_exp: cfg.NewGameHeroExp, + hero_skillup: cfg.NewGameHeroSkillLevel, + game_skillatk: cfg.NewGameSkillAtk, hero_drawcard: cfg.NewGameDrawCard, hero_fusion: cfg.NewGameHerofusion, hero_starupsp: cfg.NewGameHeroStarupSp, diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 5c7180e66..cc2a08d80 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -50,7 +50,6 @@ func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero { HeroID: heroCfg.Hid, Star: heroCfg.Star, //初始星级 Lv: 1, //初始等级 - IsOverlying: true, //是否允许叠加, Block: false, //未锁定 CardType: heroCfg.Type, //卡片类型 Skins: []int32{}, @@ -340,7 +339,7 @@ func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DB suite2Star := hero.Suite2Star suite1Lv := hero.Suite1Lv suite2Lv := hero.Suite2Lv - if hero.IsOverlying && hero.SameCount > 1 { + if hero.SameCount > 1 { // 克隆一个新的 hero.SameCount -= 1 hero.Suite1Star = 0 @@ -353,8 +352,6 @@ func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DB newHero = this.CloneNewHero(uid, hero) hero.EquipID = make([]string, 8) hero.SameCount = 1 - hero.IsOverlying = false - update["isoverlying"] = false update["sameCount"] = 1 update["horoscopeProperty"] = hero.HoroscopeProperty } @@ -549,12 +546,10 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex this.moduleHero.Debugf("add hero exp :old lv:%d,old exp:%d,new lv:%d,new exp:%d,addexp:%d", hero.Lv, hero.Exp, curLv, curExp, exp) update["lv"] = curLv update["exp"] = curExp - update["isOverlying"] = false update["sameCount"] = 1 update["horoscopeProperty"] = hero.HoroscopeProperty hero.Lv = curLv hero.Exp = curExp - hero.IsOverlying = false hero.SameCount = 1 if err := this.ChangeList(session.GetUserId(), hero.Id, update); err != nil { @@ -667,7 +662,6 @@ func (this *ModelHero) InitMonsterHero(heroCfgId string, star, lv int32) *pb.DBH HeroID: heroCfg.Hid, Star: star, //初始星级 Lv: lv, //初始等级 - IsOverlying: true, //是否允许叠加, Block: false, //未锁定 CardType: heroCfg.Type, //卡片类型 Skins: []int32{}, @@ -848,11 +842,12 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c // 转碎片处理 if count > 0 { + heroCfg := this.moduleHero.configure.GetHeroConfig(heroCfgId) // 如果技能是满级 则转成其他道具 if this.checkHeroAllSkillMax(hero) { list := this.moduleHero.configure.GetGlobalConf().Moonshopmoney if list != nil { - heroCfg := this.moduleHero.configure.GetHeroConfig(heroCfgId) + for pos, v := range list { if int32(pos)+3 == heroCfg.Star && v > 0 { res := make([]*cfg.Gameatn, 0) @@ -889,6 +884,38 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c this.moduleHero.DispenseRes(session, res, true) } } + + // expitem 获得 + if rst, err := this.moduleHero.ModuleUser.GetUserExpand(session.GetUserId()); err == nil { // 统计主线进度 + _mp := rst.Expitem + bAdd := false + if v, ok := _mp[hero.HeroID]; ok { + if v < heroCfg.Expitemnum { + _mp[hero.HeroID] += 1 + bAdd = true + } + } else { + _mp[hero.HeroID] = 1 + bAdd = true + } + if bAdd { + this.moduleHero.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ + "expitem": _mp, + }) + res := make([]*cfg.Gameatn, 0) + for i := 0; i < int(count); i++ { + res = append(res, heroCfg.Expitem...) + for _, v := range heroCfg.Herofrag { + atno = append(atno, &pb.UserAtno{ + A: v.A, + T: v.T, + N: v.N, + }) + } + } + this.moduleHero.DispenseRes(session, res, true) + } + } } return } diff --git a/modules/hero/module.go b/modules/hero/module.go index 3c595cd8c..265f776f5 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -233,10 +233,9 @@ func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string, hero.Star = star hero.SameCount = amount _heroMap := map[string]interface{}{ - "lv": hero.Lv, - "star": hero.Star, - "isOverlying": false, - "sameCount": amount, + "lv": hero.Lv, + "star": hero.Star, + "sameCount": amount, } // 保存数据 err = this.modelHero.ChangeList(session.GetUserId(), hero.Id, _heroMap) @@ -352,7 +351,6 @@ func (this *Hero) KungFuHero(session comm.IUserSession, heroObjID string, bKongf } _heroMap := map[string]interface{}{ "status": pb.HeroType_HeroTypeKongFu, - "isOverlying": false, "sameCount": 1, "horoscopeProperty": _hero.HoroscopeProperty, } @@ -417,9 +415,7 @@ func (this *Hero) QueryCrossHeroinfo(oid string) (hero *pb.DBHero, err error) { func (this *Hero) GetHeroListByUse(uid string) []*pb.DBHero { tmp := make([]*pb.DBHero, 0) for _, v := range this.modelHero.getHeroList(uid) { - if !v.IsOverlying { - tmp = append(tmp, v) - } + tmp = append(tmp, v) } return tmp } @@ -667,7 +663,6 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) { "lv": hero.Lv, "star": hero.Star, "juexingLv": hero.JuexingLv, - "isOverlying": false, "sameCount": 1, "normalSkill": hero.NormalSkill, "talentProperty": hero.TalentProperty, @@ -690,21 +685,6 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) { return } -func (this *Hero) SendChatMsg(session comm.IUserSession, _mapAddHero map[string]int32, cards []string) { - rsp := &pb.HeroDrawCardResp{} - ///英雄招募 【玩家名称】在招募中获得了【英雄名称】！ - for hid := range _mapAddHero { - if user := this.ModuleUser.GetUser(session.GetUserId()); user != nil { - - this.chat.SendSysChatToWorld(comm.ChatSystem13, nil, 0, 0, user.Name, hid) - } else { - this.Errorf("no found userdata uid:%s", session.GetUserId()) - } - } - rsp.Heroes = cards - session.SendMsg(string(this.GetType()), DrawCard, rsp) -} - func (this *Hero) SendTaskMsg(session comm.IUserSession, szStar []int32, drawCount int32, itype bool) { // 任务统计 if itype { //普通招募 diff --git a/modules/horoscope/modelhoroscope.go b/modules/horoscope/modelhoroscope.go index cf98d2a9a..f6d8a15dd 100644 --- a/modules/horoscope/modelhoroscope.go +++ b/modules/horoscope/modelhoroscope.go @@ -88,9 +88,7 @@ func (this *modelHoroscope) computeHeroNumeric(uid string, hero ...*pb.DBHero) ( //计算属性 func (this *modelHoroscope) compute(info *pb.DBHoroscope, hero *pb.DBHero) (err error) { - if hero.IsOverlying { - return - } + var ( heroconf *cfg.GameHeroData node *cfg.GameHoroscopeData diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index f39d7f3f0..66aa7d5a7 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -50,9 +50,16 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) return } sale := RandomProps(prop) - if code = this.module.ModuleHero.GetSpecifiedHero(session, sale.Prize[0].T, sale.Star, 1, int32(req.Amount)); code != pb.ErrorCode_Success { + var res []*cfg.Gameatn + res = append(res, &cfg.Gameatn{ + A: "hero", + T: sale.Prize[0].T, + N: int32(req.Amount), + }) + if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { return } + //随机任务 this.module.ModuleRtask.SendToRtask(session, comm.Rtype22, 1) this.module.ModuleRtask.SendToRtask(session, comm.Rtype22, utils.ToInt32(sale.Prize[0].T)) diff --git a/modules/mline/api_challengeover.go b/modules/mline/api_challengeover.go index 3dc3cbc0c..6cbca2010 100644 --- a/modules/mline/api_challengeover.go +++ b/modules/mline/api_challengeover.go @@ -134,19 +134,13 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall if first { // 发奖 if rst, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()); err == nil { // 统计主线进度 _mp := rst.Mline - if _mp == nil { - _mp = make(map[int32]int32, 1) - _mp[curChapter.CType] = req.StageId - } else { - if v, ok := _mp[curChapter.CType]; ok { - if v <= req.StageId { - _mp[curChapter.CType] = req.StageId - } - } else { + if v, ok := _mp[curChapter.CType]; ok { + if v <= req.StageId { _mp[curChapter.CType] = req.StageId } + } else { + _mp[curChapter.CType] = req.StageId } - this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ "mline": _mp, }) @@ -162,7 +156,6 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall N: v.N, }) } - } else { if code = this.module.DispenseRes(session, stageConf.Commonaward, true); code != pb.ErrorCode_Success { this.module.Debugf("Mline Commonaward DispenseRes err:+%v", stageConf.Commonaward) diff --git a/modules/user/api_create.go b/modules/user/api_create.go index 53ce17861..43292a705 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -85,6 +85,8 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (c initUpdate := map[string]interface{}{ "modifynameCount": 1, //修改名称1次 "sociatyTicket": globalConf.GuildBossInitialNum, //公会BOSS挑战券 + "expitem": make(map[string]int32, 0), // 初始化 + "mline": make(map[string]int32, 0), } if err := this.module.modelExpand.ChangeUserExpand(session.GetUserId(), initUpdate); err != nil { code = pb.ErrorCode_DBError diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index b6009d80b..934378650 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -90,7 +90,6 @@ type DBHero struct { SameCount int32 `protobuf:"varint,20,opt,name=sameCount,proto3" json:"sameCount" bson:"sameCount"` // 卡片叠加数量 SuiteId int32 `protobuf:"varint,21,opt,name=suiteId,proto3" json:"suiteId" bson:"suiteId"` // 套装Id SuiteExtId int32 `protobuf:"varint,22,opt,name=suiteExtId,proto3" json:"suiteExtId"` // go_tags(`bson:"suiteExtId"`) 扩展套装Id - IsOverlying bool `protobuf:"varint,23,opt,name=isOverlying,proto3" json:"isOverlying"` // go_tags(`bson:"isOverlying"`) 是否允许叠加 默认true JuexProperty map[string]int32 `protobuf:"bytes,25,rep,name=juexProperty,proto3" json:"juexProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"juexProperty"` ////hp Status HeroType `protobuf:"varint,26,opt,name=status,proto3,enum=HeroType" json:"status" bson:"status"` //状态 (1 练功) Suite1Star int32 `protobuf:"varint,27,opt,name=suite1Star,proto3" json:"suite1Star" bson:"suite1Star"` @@ -267,13 +266,6 @@ func (x *DBHero) GetSuiteExtId() int32 { return 0 } -func (x *DBHero) GetIsOverlying() bool { - if x != nil { - return x.IsOverlying - } - return false -} - func (x *DBHero) GetJuexProperty() map[string]int32 { if x != nil { return x.JuexProperty @@ -566,7 +558,7 @@ var File_hero_hero_db_proto protoreflect.FileDescriptor var file_hero_hero_db_proto_rawDesc = []byte{ 0x0a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0xad, 0x0a, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x22, 0x8b, 0x0a, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, @@ -600,106 +592,104 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x45, 0x78, 0x74, 0x49, 0x64, 0x18, 0x16, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x45, 0x78, 0x74, 0x49, 0x64, 0x12, 0x20, - 0x0a, 0x0b, 0x69, 0x73, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x18, 0x17, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x79, 0x69, 0x6e, 0x67, - 0x12, 0x3d, 0x0a, 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, - 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, - 0x21, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x09, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, 0x61, 0x72, - 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, - 0x61, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, 0x61, 0x72, - 0x18, 0x1c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, - 0x61, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x18, 0x1d, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x12, 0x1a, - 0x0a, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x12, 0x43, 0x0a, 0x0e, 0x74, 0x61, - 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x1f, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x54, 0x61, 0x6c, 0x65, - 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, - 0x2a, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x20, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, - 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x4c, 0x0a, 0x11, 0x68, - 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x18, 0x21, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, - 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, - 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, - 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, + 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x45, 0x78, 0x74, 0x49, 0x64, 0x12, 0x3d, + 0x0a, 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x19, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x4a, 0x75, + 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x21, 0x0a, + 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, + 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, 0x61, 0x72, 0x18, 0x1b, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, 0x61, 0x72, + 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, 0x61, 0x72, 0x18, 0x1c, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, 0x61, 0x72, + 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x18, 0x1d, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x12, 0x1a, 0x0a, 0x08, + 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x12, 0x43, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x1f, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x2a, 0x0a, + 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x20, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0a, 0x65, + 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x4c, 0x0a, 0x11, 0x68, 0x6f, 0x72, + 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x21, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0xb2, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, - 0x72, 0x35, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, - 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, - 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, - 0x3a, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, - 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, - 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, - 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, - 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, - 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, - 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, - 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, - 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, - 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 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, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, - 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72, 0x6f, + 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x2f, - 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, - 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, - 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb2, + 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, + 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, + 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, + 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, + 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, + 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, + 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, + 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, + 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, + 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, + 0x65, 0x6e, 0x62, 0x75, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, + 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, + 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, + 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, + 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, + 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x2f, 0x0a, 0x08, + 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, + 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, + 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index b575e0b05..12dc5ea1a 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -576,53 +576,6 @@ func (x *HeroStrengthenUpSkillResp) GetHero() *DBHero { return nil } -type HeroResonanceUseEnergyResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 -} - -func (x *HeroResonanceUseEnergyResp) Reset() { - *x = HeroResonanceUseEnergyResp{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HeroResonanceUseEnergyResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HeroResonanceUseEnergyResp) ProtoMessage() {} - -func (x *HeroResonanceUseEnergyResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[11] - 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 HeroResonanceUseEnergyResp.ProtoReflect.Descriptor instead. -func (*HeroResonanceUseEnergyResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{11} -} - -func (x *HeroResonanceUseEnergyResp) GetHero() *DBHero { - if x != nil { - return x.Hero - } - return nil -} - // 觉醒 type HeroAwakenReq struct { state protoimpl.MessageState @@ -635,7 +588,7 @@ type HeroAwakenReq struct { func (x *HeroAwakenReq) Reset() { *x = HeroAwakenReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[12] + mi := &file_hero_hero_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -648,7 +601,7 @@ func (x *HeroAwakenReq) String() string { func (*HeroAwakenReq) ProtoMessage() {} func (x *HeroAwakenReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[12] + mi := &file_hero_hero_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -661,7 +614,7 @@ func (x *HeroAwakenReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroAwakenReq.ProtoReflect.Descriptor instead. func (*HeroAwakenReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{12} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{11} } func (x *HeroAwakenReq) GetHeroObjID() string { @@ -683,7 +636,7 @@ type HeroAwakenResp struct { func (x *HeroAwakenResp) Reset() { *x = HeroAwakenResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[13] + mi := &file_hero_hero_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -696,7 +649,7 @@ func (x *HeroAwakenResp) String() string { func (*HeroAwakenResp) ProtoMessage() {} func (x *HeroAwakenResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[13] + mi := &file_hero_hero_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -709,7 +662,7 @@ func (x *HeroAwakenResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroAwakenResp.ProtoReflect.Descriptor instead. func (*HeroAwakenResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{13} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{12} } func (x *HeroAwakenResp) GetHero() *DBHero { @@ -733,7 +686,7 @@ type HeroPropertyPush struct { func (x *HeroPropertyPush) Reset() { *x = HeroPropertyPush{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[14] + mi := &file_hero_hero_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -746,7 +699,7 @@ func (x *HeroPropertyPush) String() string { func (*HeroPropertyPush) ProtoMessage() {} func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[14] + mi := &file_hero_hero_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -759,7 +712,7 @@ func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroPropertyPush.ProtoReflect.Descriptor instead. func (*HeroPropertyPush) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{14} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{13} } func (x *HeroPropertyPush) GetHeroId() string { @@ -795,7 +748,7 @@ type HeroLockReq struct { func (x *HeroLockReq) Reset() { *x = HeroLockReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[15] + mi := &file_hero_hero_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -808,7 +761,7 @@ func (x *HeroLockReq) String() string { func (*HeroLockReq) ProtoMessage() {} func (x *HeroLockReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[15] + mi := &file_hero_hero_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -821,7 +774,7 @@ func (x *HeroLockReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroLockReq.ProtoReflect.Descriptor instead. func (*HeroLockReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{15} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{14} } func (x *HeroLockReq) GetHeroid() string { @@ -843,7 +796,7 @@ type HeroLockResp struct { func (x *HeroLockResp) Reset() { *x = HeroLockResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[16] + mi := &file_hero_hero_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -856,7 +809,7 @@ func (x *HeroLockResp) String() string { func (*HeroLockResp) ProtoMessage() {} func (x *HeroLockResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[16] + mi := &file_hero_hero_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -869,7 +822,7 @@ func (x *HeroLockResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroLockResp.ProtoReflect.Descriptor instead. func (*HeroLockResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{16} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{15} } func (x *HeroLockResp) GetHero() *DBHero { @@ -894,7 +847,7 @@ type HeroGetSpecifiedReq struct { func (x *HeroGetSpecifiedReq) Reset() { *x = HeroGetSpecifiedReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[17] + mi := &file_hero_hero_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -907,7 +860,7 @@ func (x *HeroGetSpecifiedReq) String() string { func (*HeroGetSpecifiedReq) ProtoMessage() {} func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[17] + mi := &file_hero_hero_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -920,7 +873,7 @@ func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroGetSpecifiedReq.ProtoReflect.Descriptor instead. func (*HeroGetSpecifiedReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{17} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{16} } func (x *HeroGetSpecifiedReq) GetHeroCoinfigID() string { @@ -962,7 +915,7 @@ type HeroGetSpecifiedResp struct { func (x *HeroGetSpecifiedResp) Reset() { *x = HeroGetSpecifiedResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[18] + mi := &file_hero_hero_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -975,7 +928,7 @@ func (x *HeroGetSpecifiedResp) String() string { func (*HeroGetSpecifiedResp) ProtoMessage() {} func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[18] + mi := &file_hero_hero_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -988,7 +941,7 @@ func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroGetSpecifiedResp.ProtoReflect.Descriptor instead. func (*HeroGetSpecifiedResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{18} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{17} } func (x *HeroGetSpecifiedResp) GetHero() *DBHero { @@ -1011,7 +964,7 @@ type HeroDrawCardReq struct { func (x *HeroDrawCardReq) Reset() { *x = HeroDrawCardReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[19] + mi := &file_hero_hero_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1024,7 +977,7 @@ func (x *HeroDrawCardReq) String() string { func (*HeroDrawCardReq) ProtoMessage() {} func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[19] + mi := &file_hero_hero_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1037,7 +990,7 @@ func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroDrawCardReq.ProtoReflect.Descriptor instead. func (*HeroDrawCardReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{19} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{18} } func (x *HeroDrawCardReq) GetDrawType() int32 { @@ -1054,12 +1007,59 @@ func (x *HeroDrawCardReq) GetDrawCount() int32 { return 0 } +type AtnoData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Atno []*UserAtno `protobuf:"bytes,1,rep,name=atno,proto3" json:"atno"` +} + +func (x *AtnoData) Reset() { + *x = AtnoData{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AtnoData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AtnoData) ProtoMessage() {} + +func (x *AtnoData) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[19] + 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 AtnoData.ProtoReflect.Descriptor instead. +func (*AtnoData) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *AtnoData) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + type HeroDrawCardResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Heroes []string `protobuf:"bytes,1,rep,name=heroes,proto3" json:"heroes"` // 返回英雄的configID + Data []*AtnoData `protobuf:"bytes,1,rep,name=data,proto3" json:"data"` } func (x *HeroDrawCardResp) Reset() { @@ -1094,9 +1094,9 @@ func (*HeroDrawCardResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{20} } -func (x *HeroDrawCardResp) GetHeroes() []string { +func (x *HeroDrawCardResp) GetData() []*AtnoData { if x != nil { - return x.Heroes + return x.Data } return nil } @@ -1833,164 +1833,164 @@ var File_hero_hero_msg_proto protoreflect.FileDescriptor var file_hero_hero_msg_proto_rawDesc = []byte{ 0x0a, 0x13, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, - 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x37, 0x0a, 0x0b, 0x48, 0x65, 0x72, - 0x6f, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, - 0x72, 0x6f, 0x49, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x62, 0x61, 0x73, - 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, - 0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, - 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x38, 0x0a, - 0x0e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, - 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xa4, 0x01, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, + 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x37, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x66, + 0x6f, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x22, 0x3d, + 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, + 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, + 0x12, 0x1b, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, + 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x22, 0x0d, 0x0a, + 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x2b, 0x0a, 0x0c, + 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, + 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x38, 0x0a, 0x0e, 0x4d, 0x61, 0x70, + 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x10, 0x0a, 0x03, 0x4b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, + 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x22, 0xa4, 0x01, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, + 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, + 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x34, 0x0a, 0x04, 0x69, + 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, - 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, - 0x34, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, - 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, - 0x6c, 0x76, 0x52, 0x65, 0x71, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x04, 0x69, 0x74, 0x65, 0x6d, 0x1a, 0x37, 0x0a, 0x09, 0x49, 0x74, 0x65, 0x6d, 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, 0x35, - 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, - 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x37, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, - 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, - 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x37, - 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, - 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, - 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4c, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, - 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, - 0x44, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x04, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x38, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, - 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, - 0x39, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, - 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, - 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, - 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, - 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, - 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, - 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0xaa, 0x02, 0x0a, 0x10, 0x48, 0x65, 0x72, - 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, - 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, - 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x12, 0x44, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, - 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 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, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, - 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x0c, - 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, + 0x71, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x69, 0x74, 0x65, + 0x6d, 0x1a, 0x37, 0x0a, 0x09, 0x49, 0x74, 0x65, 0x6d, 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, 0x35, 0x0a, 0x16, 0x48, 0x65, + 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, + 0x6f, 0x22, 0x37, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, + 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, + 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x37, 0x0a, 0x18, 0x48, 0x65, + 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, + 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x22, 0x4c, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, + 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, + 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x12, 0x0a, + 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x69, 0x74, 0x65, + 0x6d, 0x22, 0x38, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, + 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, + 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, + 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, + 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, + 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, + 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, - 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x77, 0x0a, 0x13, 0x48, 0x65, 0x72, - 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x71, - 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, - 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, - 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, - 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, - 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, - 0x6c, 0x76, 0x22, 0x33, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, - 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, - 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4b, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, - 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, - 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, - 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, - 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, - 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, - 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, - 0x16, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, - 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x22, 0x73, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x44, - 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x16, 0x0a, 0x06, - 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, - 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, 0x92, 0x01, 0x0a, - 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x16, + 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0xaa, 0x02, 0x0a, 0x10, 0x48, 0x65, + 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0x28, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x48, - 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, - 0x22, 0x3b, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, - 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x5e, 0x0a, - 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, - 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, - 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x58, 0x0a, - 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x74, - 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, - 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x22, 0x2a, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, - 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, - 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x62, - 0x6a, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, - 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, - 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, - 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, - 0x74, 0x22, 0x42, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, - 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x79, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, - 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, - 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, 0x2a, 0x0a, 0x10, - 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x72, 0x73, 0x74, 0x47, 0x65, 0x74, 0x50, 0x75, 0x73, 0x68, - 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x50, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x12, 0x44, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x41, 0x64, 0x64, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, + 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, + 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2b, 0x0a, + 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, + 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, + 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x77, 0x0a, 0x13, 0x48, 0x65, + 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, + 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, + 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, + 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x02, 0x6c, 0x76, 0x22, 0x33, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, + 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, + 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4b, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, + 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, + 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, + 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x29, 0x0a, 0x08, 0x41, 0x74, 0x6e, 0x6f, 0x44, 0x61, 0x74, + 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, + 0x22, 0x31, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x41, 0x74, 0x6e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, + 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, + 0x73, 0x74, 0x22, 0x16, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, + 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x22, 0x73, 0x0a, 0x15, 0x48, 0x65, + 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, + 0x72, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, + 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, + 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, + 0x92, 0x01, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, + 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x68, 0x65, 0x72, + 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, + 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x73, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x48, 0x65, + 0x72, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x28, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, + 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x13, + 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x65, 0x71, 0x22, 0x3b, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, + 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, + 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, + 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, + 0x22, 0x5e, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, + 0x61, 0x72, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, + 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, + 0x22, 0x58, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, + 0x61, 0x72, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, + 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, + 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x12, 0x1a, + 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x22, 0x2a, 0x0a, 0x12, 0x48, 0x65, + 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, + 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, + 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, + 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, + 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x42, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, + 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, + 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, + 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x12, + 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, + 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, + 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x72, 0x73, 0x74, 0x47, 0x65, 0x74, 0x50, + 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2007,47 +2007,48 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 39) var file_hero_hero_msg_proto_goTypes = []interface{}{ - (*HeroInfoReq)(nil), // 0: HeroInfoReq - (*HeroInfoResp)(nil), // 1: HeroInfoResp - (*HeroListReq)(nil), // 2: HeroListReq - (*HeroListResp)(nil), // 3: HeroListResp - (*MapStringInt32)(nil), // 4: MapStringInt32 - (*HeroStrengthenUplvReq)(nil), // 5: HeroStrengthenUplvReq - (*HeroStrengthenUplvResp)(nil), // 6: HeroStrengthenUplvResp - (*HeroStrengthenUpStarReq)(nil), // 7: HeroStrengthenUpStarReq - (*HeroStrengthenUpStarResp)(nil), // 8: HeroStrengthenUpStarResp - (*HeroStrengthenUpSkillReq)(nil), // 9: HeroStrengthenUpSkillReq - (*HeroStrengthenUpSkillResp)(nil), // 10: HeroStrengthenUpSkillResp - (*HeroResonanceUseEnergyResp)(nil), // 11: HeroResonanceUseEnergyResp - (*HeroAwakenReq)(nil), // 12: HeroAwakenReq - (*HeroAwakenResp)(nil), // 13: HeroAwakenResp - (*HeroPropertyPush)(nil), // 14: HeroPropertyPush - (*HeroLockReq)(nil), // 15: HeroLockReq - (*HeroLockResp)(nil), // 16: HeroLockResp - (*HeroGetSpecifiedReq)(nil), // 17: HeroGetSpecifiedReq - (*HeroGetSpecifiedResp)(nil), // 18: HeroGetSpecifiedResp - (*HeroDrawCardReq)(nil), // 19: HeroDrawCardReq - (*HeroDrawCardResp)(nil), // 20: HeroDrawCardResp - (*HeroChangePush)(nil), // 21: HeroChangePush - (*HeroDrawCardFloorReq)(nil), // 22: HeroDrawCardFloorReq - (*HeroDrawCardFloorResp)(nil), // 23: HeroDrawCardFloorResp - (*HeroFusionReq)(nil), // 24: HeroFusionReq - (*HeroFusionResp)(nil), // 25: HeroFusionResp - (*HeroTalentListReq)(nil), // 26: HeroTalentListReq - (*HeroTalentListResp)(nil), // 27: HeroTalentListResp - (*HeroTalentLearnReq)(nil), // 28: HeroTalentLearnReq - (*HeroTalentLearnResp)(nil), // 29: HeroTalentLearnResp - (*HeroTalentResetReq)(nil), // 30: HeroTalentResetReq - (*HeroTalentResetResp)(nil), // 31: HeroTalentResetResp - (*HeroBuyReq)(nil), // 32: HeroBuyReq - (*HeroBuyResp)(nil), // 33: HeroBuyResp - (*HeroFirstGetPush)(nil), // 34: HeroFirstGetPush - nil, // 35: HeroStrengthenUplvReq.ItemEntry - nil, // 36: HeroPropertyPush.PropertyEntry - nil, // 37: HeroPropertyPush.AddPropertyEntry - nil, // 38: HeroFusionReq.HerosEntry - (*DBHero)(nil), // 39: DBHero - (*DBHeroTalent)(nil), // 40: DBHeroTalent + (*HeroInfoReq)(nil), // 0: HeroInfoReq + (*HeroInfoResp)(nil), // 1: HeroInfoResp + (*HeroListReq)(nil), // 2: HeroListReq + (*HeroListResp)(nil), // 3: HeroListResp + (*MapStringInt32)(nil), // 4: MapStringInt32 + (*HeroStrengthenUplvReq)(nil), // 5: HeroStrengthenUplvReq + (*HeroStrengthenUplvResp)(nil), // 6: HeroStrengthenUplvResp + (*HeroStrengthenUpStarReq)(nil), // 7: HeroStrengthenUpStarReq + (*HeroStrengthenUpStarResp)(nil), // 8: HeroStrengthenUpStarResp + (*HeroStrengthenUpSkillReq)(nil), // 9: HeroStrengthenUpSkillReq + (*HeroStrengthenUpSkillResp)(nil), // 10: HeroStrengthenUpSkillResp + (*HeroAwakenReq)(nil), // 11: HeroAwakenReq + (*HeroAwakenResp)(nil), // 12: HeroAwakenResp + (*HeroPropertyPush)(nil), // 13: HeroPropertyPush + (*HeroLockReq)(nil), // 14: HeroLockReq + (*HeroLockResp)(nil), // 15: HeroLockResp + (*HeroGetSpecifiedReq)(nil), // 16: HeroGetSpecifiedReq + (*HeroGetSpecifiedResp)(nil), // 17: HeroGetSpecifiedResp + (*HeroDrawCardReq)(nil), // 18: HeroDrawCardReq + (*AtnoData)(nil), // 19: AtnoData + (*HeroDrawCardResp)(nil), // 20: HeroDrawCardResp + (*HeroChangePush)(nil), // 21: HeroChangePush + (*HeroDrawCardFloorReq)(nil), // 22: HeroDrawCardFloorReq + (*HeroDrawCardFloorResp)(nil), // 23: HeroDrawCardFloorResp + (*HeroFusionReq)(nil), // 24: HeroFusionReq + (*HeroFusionResp)(nil), // 25: HeroFusionResp + (*HeroTalentListReq)(nil), // 26: HeroTalentListReq + (*HeroTalentListResp)(nil), // 27: HeroTalentListResp + (*HeroTalentLearnReq)(nil), // 28: HeroTalentLearnReq + (*HeroTalentLearnResp)(nil), // 29: HeroTalentLearnResp + (*HeroTalentResetReq)(nil), // 30: HeroTalentResetReq + (*HeroTalentResetResp)(nil), // 31: HeroTalentResetResp + (*HeroBuyReq)(nil), // 32: HeroBuyReq + (*HeroBuyResp)(nil), // 33: HeroBuyResp + (*HeroFirstGetPush)(nil), // 34: HeroFirstGetPush + nil, // 35: HeroStrengthenUplvReq.ItemEntry + nil, // 36: HeroPropertyPush.PropertyEntry + nil, // 37: HeroPropertyPush.AddPropertyEntry + nil, // 38: HeroFusionReq.HerosEntry + (*DBHero)(nil), // 39: DBHero + (*UserAtno)(nil), // 40: UserAtno + (*DBHeroTalent)(nil), // 41: DBHeroTalent } var file_hero_hero_msg_proto_depIdxs = []int32{ 39, // 0: HeroInfoResp.base:type_name -> DBHero @@ -2056,22 +2057,23 @@ var file_hero_hero_msg_proto_depIdxs = []int32{ 39, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero 39, // 4: HeroStrengthenUpStarResp.hero:type_name -> DBHero 39, // 5: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 39, // 6: HeroResonanceUseEnergyResp.hero:type_name -> DBHero - 39, // 7: HeroAwakenResp.hero:type_name -> DBHero - 36, // 8: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry - 37, // 9: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 39, // 10: HeroLockResp.hero:type_name -> DBHero - 39, // 11: HeroGetSpecifiedResp.hero:type_name -> DBHero - 39, // 12: HeroChangePush.list:type_name -> DBHero - 38, // 13: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry - 40, // 14: HeroTalentListResp.telnet:type_name -> DBHeroTalent - 40, // 15: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent - 40, // 16: HeroTalentResetResp.telnet:type_name -> DBHeroTalent - 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 + 39, // 6: HeroAwakenResp.hero:type_name -> DBHero + 36, // 7: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry + 37, // 8: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry + 39, // 9: HeroLockResp.hero:type_name -> DBHero + 39, // 10: HeroGetSpecifiedResp.hero:type_name -> DBHero + 40, // 11: AtnoData.atno:type_name -> UserAtno + 19, // 12: HeroDrawCardResp.data:type_name -> AtnoData + 39, // 13: HeroChangePush.list:type_name -> DBHero + 38, // 14: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry + 41, // 15: HeroTalentListResp.telnet:type_name -> DBHeroTalent + 41, // 16: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent + 41, // 17: HeroTalentResetResp.telnet:type_name -> DBHeroTalent + 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 } func init() { file_hero_hero_msg_proto_init() } @@ -2080,6 +2082,7 @@ func file_hero_hero_msg_proto_init() { return } file_hero_hero_db_proto_init() + file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_hero_hero_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroInfoReq); i { @@ -2214,18 +2217,6 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroResonanceUseEnergyResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroAwakenReq); i { case 0: return &v.state @@ -2237,7 +2228,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroAwakenResp); i { case 0: return &v.state @@ -2249,7 +2240,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroPropertyPush); i { case 0: return &v.state @@ -2261,7 +2252,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroLockReq); i { case 0: return &v.state @@ -2273,7 +2264,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroLockResp); i { case 0: return &v.state @@ -2285,7 +2276,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroGetSpecifiedReq); i { case 0: return &v.state @@ -2297,7 +2288,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroGetSpecifiedResp); i { case 0: return &v.state @@ -2309,7 +2300,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroDrawCardReq); i { case 0: return &v.state @@ -2321,6 +2312,18 @@ func file_hero_hero_msg_proto_init() { return nil } } + file_hero_hero_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AtnoData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } file_hero_hero_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroDrawCardResp); i { case 0: diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index aaa69f7c9..9b64e4c8d 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -26,36 +26,36 @@ type DBUserExpand struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id - Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间 - LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间 - InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数 - Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道 - ModifynameCount int32 `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"` //修改昵称次数 - //map tujian = 8; //图鉴 - Activeday int32 `protobuf:"varint,11,opt,name=activeday,proto3" json:"activeday"` //日活跃度 - Activeweek int32 `protobuf:"varint,12,opt,name=activeweek,proto3" json:"activeweek"` //周活跃度 - Sign string `protobuf:"bytes,13,opt,name=sign,proto3" json:"sign"` //用户签名 - FriendPoint int32 `protobuf:"varint,14,opt,name=friendPoint,proto3" json:"friendPoint" bson:"friendPoint"` //友情点 - FriendPointID int32 `protobuf:"varint,15,opt,name=friendPointID,proto3" json:"friendPointID" bson:"friendPointID"` //每日获赠友情点 - FriendPointOD int32 `protobuf:"varint,16,opt,name=friendPointOD,proto3" json:"friendPointOD" bson:"friendPointOD"` //每日送出友情点 - LoginAddCount int32 `protobuf:"varint,19,opt,name=loginAddCount,proto3" json:"loginAddCount"` //@go_tasgs(`bson:"loginAddCount"`) 累计登录天数 - LoginContinueCount int32 `protobuf:"varint,20,opt,name=loginContinueCount,proto3" json:"loginContinueCount"` //@go_tasgs(`bson:"loginContinueCount"`) 连续登录天数 - RtaskId int32 `protobuf:"varint,21,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"` // 当前完成的随机任务ID - TeamHeroIds []string `protobuf:"bytes,22,rep,name=teamHeroIds,proto3" json:"teamHeroIds" bson:"teamHeroIds"` //阵容英雄IDs - SociatyId string `protobuf:"bytes,23,opt,name=sociatyId,proto3" json:"sociatyId" bson:"sociatyId"` //公会ID - SociatyCd int64 `protobuf:"varint,24,opt,name=sociatyCd,proto3" json:"sociatyCd" bson:"sociatyCd"` //主动退出CD - Guildcoin int32 `protobuf:"varint,25,opt,name=guildcoin,proto3" json:"guildcoin" bson:"guildcoin"` //公会币 - Arenacoin int32 `protobuf:"varint,26,opt,name=arenacoin,proto3" json:"arenacoin" bson:"arenacoin"` //竞技场币 - Physicalbuynum int32 `protobuf:"varint,27,opt,name=physicalbuynum,proto3" json:"physicalbuynum"` //@go_tags(`bson:"physicalbuynum"`)体力购买次数 - PhysicalbuyLasttime int64 `protobuf:"varint,28,opt,name=physicalbuyLasttime,proto3" json:"physicalbuyLasttime"` //@go_tags(`bson:"physicalbuyLasttime"`)最后购买体力事件 - Buyunifiedticket int32 `protobuf:"varint,29,opt,name=buyunifiedticket,proto3" json:"buyunifiedticket"` //@go_tags(`bson:"buyunifiedticket"`)购买统一入场门票次数 - Lasttimeunifiedticket int64 `protobuf:"varint,30,opt,name=lasttimeunifiedticket,proto3" json:"lasttimeunifiedticket"` //@go_tags(`bson:"lasttimeunifiedticket"`)最后购买统一入场门票时间 - Recovertimeunifiedticket int64 `protobuf:"varint,31,opt,name=recovertimeunifiedticket,proto3" json:"recovertimeunifiedticket"` //@go_tags(`bson:"recovertimeunifiedticket"`)同意门票恢复时间 - SociatyTicketBuyNum int32 `protobuf:"varint,32,opt,name=sociatyTicketBuyNum,proto3" json:"sociatyTicketBuyNum" bson:"sociatyTicketBuyNum"` //公会boss挑战券购买次数 - SociatyTicket int32 `protobuf:"varint,33,opt,name=sociatyTicket,proto3" json:"sociatyTicket" bson:"sociatyTicket"` //公会boss挑战券数量 - Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id + Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间 + LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间 + InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数 + Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道 + ModifynameCount int32 `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"` //修改昵称次数 + Expitem map[string]int32 `protobuf:"bytes,8,rep,name=expitem,proto3" json:"expitem" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //该英雄重复获取后所获得的升星道具 + Activeday int32 `protobuf:"varint,11,opt,name=activeday,proto3" json:"activeday"` //日活跃度 + Activeweek int32 `protobuf:"varint,12,opt,name=activeweek,proto3" json:"activeweek"` //周活跃度 + Sign string `protobuf:"bytes,13,opt,name=sign,proto3" json:"sign"` //用户签名 + FriendPoint int32 `protobuf:"varint,14,opt,name=friendPoint,proto3" json:"friendPoint" bson:"friendPoint"` //友情点 + FriendPointID int32 `protobuf:"varint,15,opt,name=friendPointID,proto3" json:"friendPointID" bson:"friendPointID"` //每日获赠友情点 + FriendPointOD int32 `protobuf:"varint,16,opt,name=friendPointOD,proto3" json:"friendPointOD" bson:"friendPointOD"` //每日送出友情点 + LoginAddCount int32 `protobuf:"varint,19,opt,name=loginAddCount,proto3" json:"loginAddCount"` //@go_tasgs(`bson:"loginAddCount"`) 累计登录天数 + LoginContinueCount int32 `protobuf:"varint,20,opt,name=loginContinueCount,proto3" json:"loginContinueCount"` //@go_tasgs(`bson:"loginContinueCount"`) 连续登录天数 + RtaskId int32 `protobuf:"varint,21,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"` // 当前完成的随机任务ID + TeamHeroIds []string `protobuf:"bytes,22,rep,name=teamHeroIds,proto3" json:"teamHeroIds" bson:"teamHeroIds"` //阵容英雄IDs + SociatyId string `protobuf:"bytes,23,opt,name=sociatyId,proto3" json:"sociatyId" bson:"sociatyId"` //公会ID + SociatyCd int64 `protobuf:"varint,24,opt,name=sociatyCd,proto3" json:"sociatyCd" bson:"sociatyCd"` //主动退出CD + Guildcoin int32 `protobuf:"varint,25,opt,name=guildcoin,proto3" json:"guildcoin" bson:"guildcoin"` //公会币 + Arenacoin int32 `protobuf:"varint,26,opt,name=arenacoin,proto3" json:"arenacoin" bson:"arenacoin"` //竞技场币 + Physicalbuynum int32 `protobuf:"varint,27,opt,name=physicalbuynum,proto3" json:"physicalbuynum"` //@go_tags(`bson:"physicalbuynum"`)体力购买次数 + PhysicalbuyLasttime int64 `protobuf:"varint,28,opt,name=physicalbuyLasttime,proto3" json:"physicalbuyLasttime"` //@go_tags(`bson:"physicalbuyLasttime"`)最后购买体力事件 + Buyunifiedticket int32 `protobuf:"varint,29,opt,name=buyunifiedticket,proto3" json:"buyunifiedticket"` //@go_tags(`bson:"buyunifiedticket"`)购买统一入场门票次数 + Lasttimeunifiedticket int64 `protobuf:"varint,30,opt,name=lasttimeunifiedticket,proto3" json:"lasttimeunifiedticket"` //@go_tags(`bson:"lasttimeunifiedticket"`)最后购买统一入场门票时间 + Recovertimeunifiedticket int64 `protobuf:"varint,31,opt,name=recovertimeunifiedticket,proto3" json:"recovertimeunifiedticket"` //@go_tags(`bson:"recovertimeunifiedticket"`)同意门票恢复时间 + SociatyTicketBuyNum int32 `protobuf:"varint,32,opt,name=sociatyTicketBuyNum,proto3" json:"sociatyTicketBuyNum" bson:"sociatyTicketBuyNum"` //公会boss挑战券购买次数 + SociatyTicket int32 `protobuf:"varint,33,opt,name=sociatyTicket,proto3" json:"sociatyTicket" bson:"sociatyTicket"` //公会boss挑战券数量 + Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID } func (x *DBUserExpand) Reset() { @@ -139,6 +139,13 @@ func (x *DBUserExpand) GetModifynameCount() int32 { return 0 } +func (x *DBUserExpand) GetExpitem() map[string]int32 { + if x != nil { + return x.Expitem + } + return nil +} + func (x *DBUserExpand) GetActiveday() int32 { if x != nil { return x.Activeday @@ -297,7 +304,7 @@ var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x80, 0x09, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, + 0x74, 0x6f, 0x22, 0xf2, 0x09, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, @@ -313,64 +320,71 @@ var file_userexpand_proto_rawDesc = []byte{ 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x64, 0x61, 0x79, 0x18, 0x0b, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x64, 0x61, 0x79, 0x12, - 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x77, 0x65, 0x65, 0x6b, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x77, 0x65, 0x65, 0x6b, 0x12, - 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, - 0x69, 0x67, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, - 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, - 0x6f, 0x69, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x66, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4f, 0x44, 0x18, 0x10, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4f, - 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x41, - 0x64, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, - 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x14, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, - 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, - 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, - 0x18, 0x16, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, - 0x49, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, - 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, - 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x64, 0x18, 0x18, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x64, 0x12, - 0x1c, 0x0a, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x19, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x1c, 0x0a, - 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x70, - 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x1b, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0e, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, - 0x6e, 0x75, 0x6d, 0x12, 0x30, 0x0a, 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, - 0x75, 0x79, 0x4c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x4c, 0x61, 0x73, - 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x69, 0x66, - 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x10, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, - 0x74, 0x12, 0x34, 0x0a, 0x15, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, - 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x15, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, - 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x3a, 0x0a, 0x18, 0x72, 0x65, 0x63, 0x6f, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, - 0x6b, 0x65, 0x74, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x18, 0x72, 0x65, 0x63, 0x6f, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, - 0x6b, 0x65, 0x74, 0x12, 0x30, 0x0a, 0x13, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, - 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x20, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x13, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, - 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x21, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x73, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x2e, 0x0a, 0x05, 0x6d, - 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x55, - 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6d, 0x6c, 0x69, 0x6e, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x4d, - 0x6c, 0x69, 0x6e, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x12, 0x34, 0x0a, 0x07, 0x65, 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x08, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x2e, 0x45, 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, + 0x65, 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x65, 0x64, 0x61, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x65, 0x64, 0x61, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x77, + 0x65, 0x65, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x65, 0x77, 0x65, 0x65, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x0d, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x66, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x0f, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x49, + 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, + 0x4f, 0x44, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4f, 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, + 0x41, 0x64, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, + 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, + 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, + 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, + 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, + 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x65, + 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x43, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x43, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, + 0x69, 0x6e, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, + 0x6f, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, + 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, + 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, + 0x6e, 0x75, 0x6d, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x70, 0x68, 0x79, 0x73, 0x69, + 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x30, 0x0a, 0x13, 0x70, 0x68, 0x79, + 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x4c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, + 0x18, 0x1c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, + 0x62, 0x75, 0x79, 0x4c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x62, + 0x75, 0x79, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, + 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, + 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x34, 0x0a, 0x15, 0x6c, 0x61, 0x73, 0x74, 0x74, + 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, + 0x18, 0x1e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x15, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, + 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x3a, 0x0a, + 0x18, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, + 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x18, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, + 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x30, 0x0a, 0x13, 0x73, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, + 0x18, 0x20, 0x20, 0x01, 0x28, 0x05, 0x52, 0x13, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, + 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x73, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x21, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0d, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, + 0x74, 0x12, 0x2e, 0x0a, 0x05, 0x6d, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x18, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, + 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6d, 0x6c, 0x69, 0x6e, + 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, + 0x0a, 0x4d, 0x6c, 0x69, 0x6e, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -385,18 +399,20 @@ func file_userexpand_proto_rawDescGZIP() []byte { return file_userexpand_proto_rawDescData } -var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_userexpand_proto_goTypes = []interface{}{ (*DBUserExpand)(nil), // 0: DBUserExpand - nil, // 1: DBUserExpand.MlineEntry + nil, // 1: DBUserExpand.ExpitemEntry + nil, // 2: DBUserExpand.MlineEntry } var file_userexpand_proto_depIdxs = []int32{ - 1, // 0: DBUserExpand.mline:type_name -> DBUserExpand.MlineEntry - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 1, // 0: DBUserExpand.expitem:type_name -> DBUserExpand.ExpitemEntry + 2, // 1: DBUserExpand.mline:type_name -> DBUserExpand.MlineEntry + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name } func init() { file_userexpand_proto_init() } @@ -424,7 +440,7 @@ func file_userexpand_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_userexpand_proto_rawDesc, NumEnums: 0, - NumMessages: 2, + NumMessages: 3, NumExtensions: 0, NumServices: 0, },