diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index a43cc3374..ce3acf7b0 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -67,11 +67,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -150,11 +146,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -233,11 +225,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -316,11 +304,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -399,11 +383,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -482,11 +462,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -565,11 +541,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -648,11 +620,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -731,11 +699,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -814,11 +778,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -897,11 +857,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -980,11 +936,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1063,11 +1015,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1146,11 +1094,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1229,11 +1173,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1312,11 +1252,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1395,11 +1331,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1478,11 +1410,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1561,11 +1489,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1644,11 +1568,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1727,11 +1647,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1810,11 +1726,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1893,11 +1805,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -1976,11 +1884,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2059,11 +1963,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2142,11 +2042,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2225,11 +2121,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2308,11 +2200,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2391,11 +2279,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2474,11 +2358,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2557,11 +2437,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2640,11 +2516,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2723,11 +2595,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2806,11 +2674,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2889,11 +2753,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -2972,11 +2832,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3055,11 +2911,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3138,11 +2990,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3221,11 +3069,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3304,11 +3148,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3387,11 +3227,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3470,11 +3306,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3553,11 +3385,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3636,11 +3464,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3719,11 +3543,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3802,11 +3622,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3885,11 +3701,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -3968,11 +3780,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4051,11 +3859,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4134,11 +3938,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4217,11 +4017,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4300,11 +4096,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4383,11 +4175,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4466,11 +4254,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4549,11 +4333,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4632,11 +4412,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4715,11 +4491,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4798,11 +4570,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4881,11 +4649,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -4964,11 +4728,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5047,11 +4807,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5130,11 +4886,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5213,11 +4965,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5296,11 +5044,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5379,11 +5123,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5462,11 +5202,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5545,11 +5281,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5628,11 +5360,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5711,11 +5439,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5794,11 +5518,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5877,11 +5597,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -5960,11 +5676,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6043,11 +5755,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6126,11 +5834,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6209,11 +5913,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6292,11 +5992,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6375,11 +6071,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6458,11 +6150,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6541,11 +6229,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6624,11 +6308,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6707,11 +6387,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6790,11 +6466,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6873,11 +6545,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -6956,11 +6624,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7039,11 +6703,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7122,11 +6782,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7205,11 +6861,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7288,11 +6940,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7371,11 +7019,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7454,11 +7098,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7537,11 +7177,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7620,11 +7256,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7703,11 +7335,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7786,11 +7414,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7869,11 +7493,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -7952,11 +7572,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8035,11 +7651,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8118,11 +7730,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8201,11 +7809,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8284,11 +7888,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8367,11 +7967,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8450,11 +8046,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8533,11 +8125,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8616,11 +8204,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8699,11 +8283,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8782,11 +8362,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8865,11 +8441,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -8948,11 +8520,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9033,11 +8601,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9116,11 +8680,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9199,11 +8759,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9282,11 +8838,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9365,11 +8917,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9448,11 +8996,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9531,11 +9075,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9614,11 +9154,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9697,11 +9233,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9780,11 +9312,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9863,11 +9391,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -9946,11 +9470,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -10029,11 +9549,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { @@ -10112,11 +9628,7 @@ } ], "heroskillup": [ - { - "a": "item", - "t": "625001", - "n": 1 - } + "625001" ], "expitem": [ { diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index e2d588c2a..c6ddaa15b 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -75,18 +75,7 @@ "key": 4, "id": "13001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "glod", - "n": 10000 - }, - { - "a": "item", - "t": "625001", - "n": 1 - } - ], + "needrace": [], "starup": [] }, { diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index a7b103380..fbcaf9180 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -10,7 +10,7 @@ import ( //参数校验 func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode) { - if req.HeroObjID == "" || len(req.CostCardObj) == 0 { + if req.HeroObjID == "" || len(req.Item) == 0 { code = pb.ErrorCode_ReqParameterError return } @@ -21,17 +21,10 @@ func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.H /// 英雄技能升级 func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data proto.Message) { var ( - upSkillPos int32 // 升级的技能位置 - _hero *pb.DBHero // 操作的英雄 - ChangeList []*pb.DBHero // 推送 改变的英雄 - mapCostHero map[string]int32 // 消耗的技能卡 - mapCostObj map[string]*pb.DBHero // 消耗的技能卡对象 - costGold int64 // 金币消耗 - lvUpCount int32 // 技能升级的次数 + upSkillPos int32 // 升级的技能位置 + _hero *pb.DBHero // 操作的英雄 + costGold int64 // 金币消耗 ) - mapCostHero = make(map[string]int32, 0) - mapCostObj = make(map[string]*pb.DBHero, 0) - ChangeList = make([]*pb.DBHero, 0) code = this.StrengthenUpSkillCheck(session, req) // check if code != pb.ErrorCode_Success { @@ -48,6 +41,9 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt return } + for _, v := range heroCfg.Heroskillup { + if v.T == + } for _, v := range req.CostCardObj { // 数组转 map mapCostHero[v]++ } @@ -121,31 +117,6 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt return } - for k, v := range mapCostObj { - code = this.module.DelCard(session.GetUserId(), v, mapCostHero[k]) - if code != pb.ErrorCode_Success { - code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, int32(costGold), true) - return - } - ChangeList = append(ChangeList, v) - } - // 堆叠情况 - if _hero.SameCount > 1 { - _hero.SameCount -= 1 - sz := make([]*pb.SkillData, 0) - - for _, v := range _hero.NormalSkill { - sz = append(sz, &pb.SkillData{ - SkillID: v.SkillID, - SkillLv: v.SkillLv, - }) - v.SkillLv = 1 - } - newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero) - ChangeList = append(ChangeList, newHero) - _hero.NormalSkill = sz - } - _heroMap := map[string]interface{}{ "normalSkill": _hero.NormalSkill, "isOverlying": false, @@ -159,10 +130,6 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt code = pb.ErrorCode_DBError return } - - //this.module.modelHero.ChangeHeroProperty(session, _hero) // 推送属性变化 - ChangeList = append(ChangeList, _hero) - session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: ChangeList}) session.SendMsg(string(this.module.GetType()), StrengthenUpSkill, &pb.HeroStrengthenUpSkillResp{Hero: _hero}) //英雄技能培养 【玩家名称】已将【英雄名称】技能培养至满级! if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 01e68c73a..ce90b35cc 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -124,6 +124,17 @@ func (this *configureComp) GetHeroStarupConfig(hid string, star int32) *cfg.Game return this.starMap[int64(utils.ToInt32(hid)<<8)+int64(star)] } +// 获取当前英雄最高星级 +func (this *configureComp) GetHeroMaxStar(hid string, curStar int32) int32 { + var star int32 + for star = curStar; ; star++ { + if _, ok := this.starMap[int64(utils.ToInt32(hid)<<8)+int64(star)]; !ok { + return star + } + } + return star +} + // 通过英雄配置ID获取共鸣配置信息 func (this *configureComp) GetHeroResonanceConfig(hid string, star int32) *cfg.GameHeroResonanceData { return this.resonanceMap[int64(utils.ToInt32(hid)<<8)+int64(star)] diff --git a/modules/hero/module.go b/modules/hero/module.go index fc31518ce..9087ac0c5 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -218,16 +218,7 @@ func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string, return } // 获取最大星级 - for i := 1; ; i++ { - starConf := this.configure.GetHeroStarupConfig(cid, conf.Star+int32(i)) - if starConf == nil { - break - } - if starConf != nil && starConf.Gold == 0 { - maxStar = star + int32(i) - break - } - } + maxStar = this.configure.GetHeroMaxStar(cid, conf.Star) maxLv := this.configure.GetHeroStargrowConfigByStar(maxStar) // 最大等级 if star > maxStar || lv > maxLv { @@ -304,7 +295,6 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string] func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp int32) (curAddExp int32, code pb.ErrorCode) { var ( _hero *pb.DBHero - newhero *pb.DBHero _changeHero []*pb.DBHero // 变化的英雄 ) if heroObjID == "" { @@ -315,14 +305,12 @@ func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp in return } - newhero, curAddExp, code = this.modelHero.AddCardExp(session, _hero, exp) + curAddExp, code = this.modelHero.AddCardExp(session, _hero, exp) if code != pb.ErrorCode_Success { return } _changeHero = append(_changeHero, _hero) // 升级后的英雄 hero id 不变 - if newhero != nil { - _changeHero = append(_changeHero, newhero) // 原来的英雄 只是数量变化了 - } + session.SendMsg(string(this.GetType()), "change", &pb.HeroChangePush{List: _changeHero}) return } @@ -656,16 +644,7 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) { continue // 走到这里说明配置表没有配置数据 } // 获取最大星级 - for i := 1; ; i++ { - starConf := this.configure.GetHeroStarupConfig(cid, v.Star+int32(i)) - if starConf == nil { - break - } - if starConf != nil && starConf.Gold == 0 { - maxStar = v.Star + int32(i) - break - } - } + maxStar = this.configure.GetHeroMaxStar(cid, v.Star) maxLv := this.configure.GetHeroStargrowConfigByStar(maxStar) // 最大等级 diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index d62828f39..b575e0b05 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -478,8 +478,8 @@ type HeroStrengthenUpSkillReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - Item map[string]int32 `protobuf:"bytes,2,rep,name=item,proto3" json:"item" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key itemid value 数量 + HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID + Item []string `protobuf:"bytes,2,rep,name=item,proto3" json:"item"` // } func (x *HeroStrengthenUpSkillReq) Reset() { @@ -521,7 +521,7 @@ func (x *HeroStrengthenUpSkillReq) GetHeroObjID() string { return "" } -func (x *HeroStrengthenUpSkillReq) GetItem() map[string]int32 { +func (x *HeroStrengthenUpSkillReq) GetItem() []string { if x != nil { return x.Item } @@ -1869,134 +1869,128 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 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, 0xaa, 0x01, 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, 0x37, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x23, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, - 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 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, 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, 0x68, + 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, 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, 0x0a, + 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, + 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, 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, + 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 ( @@ -2011,7 +2005,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { return file_hero_hero_msg_proto_rawDescData } -var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 40) +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 @@ -2049,37 +2043,35 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroBuyResp)(nil), // 33: HeroBuyResp (*HeroFirstGetPush)(nil), // 34: HeroFirstGetPush nil, // 35: HeroStrengthenUplvReq.ItemEntry - nil, // 36: HeroStrengthenUpSkillReq.ItemEntry - nil, // 37: HeroPropertyPush.PropertyEntry - nil, // 38: HeroPropertyPush.AddPropertyEntry - nil, // 39: HeroFusionReq.HerosEntry - (*DBHero)(nil), // 40: DBHero - (*DBHeroTalent)(nil), // 41: DBHeroTalent + nil, // 36: HeroPropertyPush.PropertyEntry + nil, // 37: HeroPropertyPush.AddPropertyEntry + nil, // 38: HeroFusionReq.HerosEntry + (*DBHero)(nil), // 39: DBHero + (*DBHeroTalent)(nil), // 40: DBHeroTalent } var file_hero_hero_msg_proto_depIdxs = []int32{ - 40, // 0: HeroInfoResp.base:type_name -> DBHero - 40, // 1: HeroListResp.list:type_name -> DBHero + 39, // 0: HeroInfoResp.base:type_name -> DBHero + 39, // 1: HeroListResp.list:type_name -> DBHero 35, // 2: HeroStrengthenUplvReq.item:type_name -> HeroStrengthenUplvReq.ItemEntry - 40, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero - 40, // 4: HeroStrengthenUpStarResp.hero:type_name -> DBHero - 36, // 5: HeroStrengthenUpSkillReq.item:type_name -> HeroStrengthenUpSkillReq.ItemEntry - 40, // 6: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 40, // 7: HeroResonanceUseEnergyResp.hero:type_name -> DBHero - 40, // 8: HeroAwakenResp.hero:type_name -> DBHero - 37, // 9: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry - 38, // 10: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 40, // 11: HeroLockResp.hero:type_name -> DBHero - 40, // 12: HeroGetSpecifiedResp.hero:type_name -> DBHero - 40, // 13: HeroChangePush.list:type_name -> DBHero - 39, // 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 + 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 } func init() { file_hero_hero_msg_proto_init() } @@ -2516,7 +2508,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 40, + NumMessages: 39, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go index 654c6a772..bf46f541e 100644 --- a/sys/configure/structs/game.heroData.go +++ b/sys/configure/structs/game.heroData.go @@ -44,7 +44,7 @@ type GameHeroData struct { Deviation int32 Show int32 Herofrag []*Gameatn - Heroskillup []*Gameatn + Heroskillup []string Expitem []*Gameatn Expitemnum int32 } @@ -152,11 +152,11 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool if _arr_, _ok_ = _buf["heroskillup"].([]interface{}); !_ok_ { err = errors.New("heroskillup error"); return } - _v.Heroskillup = make([]*Gameatn, 0, len(_arr_)) + _v.Heroskillup = make([]string, 0, len(_arr_)) for _, _e_ := range _arr_ { - var _list_v_ *Gameatn - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } _v.Heroskillup = append(_v.Heroskillup, _list_v_) } }