diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 4c96cbc7b..03f901633 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -58,7 +58,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "13002", @@ -119,7 +133,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "13003", @@ -180,7 +208,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "13004", @@ -241,7 +283,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "13005", @@ -302,7 +358,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "14001", @@ -363,7 +433,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "14002", @@ -424,7 +508,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "14003", @@ -485,7 +583,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "14004", @@ -546,7 +658,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "14005", @@ -607,7 +733,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "14006", @@ -668,7 +808,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "14007", @@ -729,7 +883,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "15001", @@ -790,7 +958,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "15002", @@ -851,7 +1033,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "15003", @@ -912,7 +1108,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "15004", @@ -973,7 +1183,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "23001", @@ -1034,7 +1258,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "23002", @@ -1095,7 +1333,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "23003", @@ -1156,7 +1408,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "23004", @@ -1217,7 +1483,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "24001", @@ -1278,7 +1558,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "24002", @@ -1339,7 +1633,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "24003", @@ -1400,7 +1708,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "24004", @@ -1461,7 +1783,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "24005", @@ -1522,7 +1858,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "24006", @@ -1583,7 +1933,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "24007", @@ -1644,7 +2008,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "24008", @@ -1705,7 +2083,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "24009", @@ -1766,7 +2158,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "25001", @@ -1827,7 +2233,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "25002", @@ -1888,7 +2308,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "25003", @@ -1949,7 +2383,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "25004", @@ -2010,7 +2458,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "33001", @@ -2071,7 +2533,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "33002", @@ -2132,7 +2608,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "33003", @@ -2193,7 +2683,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "33004", @@ -2254,7 +2758,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "33005", @@ -2315,7 +2833,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "33006", @@ -2376,7 +2908,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "34001", @@ -2437,7 +2983,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "34002", @@ -2498,7 +3058,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "34003", @@ -2559,7 +3133,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "34004", @@ -2620,7 +3208,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "34005", @@ -2681,7 +3283,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "34006", @@ -2742,7 +3358,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "34007", @@ -2803,7 +3433,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "34008", @@ -2864,7 +3508,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "35001", @@ -2925,7 +3583,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "35002", @@ -2986,7 +3658,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "35003", @@ -3047,7 +3733,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "35004", @@ -3108,7 +3808,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "35005", @@ -3169,7 +3883,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "35006", @@ -3230,7 +3958,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43001", @@ -3291,7 +4033,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43002", @@ -3352,7 +4108,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43003", @@ -3413,7 +4183,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43004", @@ -3474,7 +4258,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43005", @@ -3535,7 +4333,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43006", @@ -3596,7 +4408,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43007", @@ -3657,7 +4483,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "44001", @@ -3718,7 +4558,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "44002", @@ -3779,7 +4633,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "44003", @@ -3840,7 +4708,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "44004", @@ -3901,7 +4783,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "44006", @@ -3962,7 +4858,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "45001", @@ -4023,7 +4933,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "45002", @@ -4084,7 +5008,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "45003", @@ -4145,7 +5083,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "45004", @@ -4206,7 +5158,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "44005", @@ -4267,7 +5233,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "15005", @@ -4328,7 +5308,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43901", @@ -4389,7 +5383,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43902", @@ -4450,7 +5458,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43903", @@ -4511,7 +5533,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "42911", @@ -4572,7 +5608,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43911", @@ -4633,7 +5683,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "44911", @@ -4694,7 +5758,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "43921", @@ -4755,7 +5833,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "44921", @@ -4816,7 +5908,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "45921", @@ -4877,7 +5983,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51001", @@ -4938,7 +6058,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51002", @@ -4999,7 +6133,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51003", @@ -5060,7 +6208,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51004", @@ -5121,7 +6283,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51005", @@ -5182,7 +6358,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51006", @@ -5243,7 +6433,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51007", @@ -5304,7 +6508,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "54005", @@ -5365,7 +6583,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51010", @@ -5426,7 +6658,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51011", @@ -5487,7 +6733,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51012", @@ -5548,7 +6808,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51013", @@ -5609,7 +6883,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "51014", @@ -5670,7 +6958,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "54001", @@ -5731,7 +7033,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "53001", @@ -5792,7 +7108,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "53002", @@ -5853,7 +7183,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "53003", @@ -5914,7 +7258,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "54002", @@ -5975,7 +7333,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "53005", @@ -6036,7 +7408,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "53006", @@ -6097,7 +7483,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "55001", @@ -6158,7 +7558,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "55002", @@ -6219,7 +7633,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "55003", @@ -6280,7 +7708,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "55004", @@ -6341,7 +7783,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "55005", @@ -6402,7 +7858,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "55006", @@ -6463,7 +7933,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "55007", @@ -6524,7 +8008,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "11021", @@ -6585,7 +8083,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "12003", @@ -6648,7 +8160,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "63002", @@ -6709,7 +8235,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "63003", @@ -6770,7 +8310,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "63004", @@ -6831,7 +8385,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "64003", @@ -6892,7 +8460,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "74002", @@ -6953,7 +8535,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "74003", @@ -7014,7 +8610,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "74004", @@ -7075,7 +8685,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "83002", @@ -7136,7 +8760,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "83006", @@ -7197,7 +8835,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "84002", @@ -7258,7 +8910,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "94002", @@ -7319,7 +8985,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "94005", @@ -7380,7 +9060,21 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] }, { "hid": "101004", @@ -7441,6 +9135,20 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 52886d0d3..96fdb73b1 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -6332,5 +6332,49 @@ "key": "itemtipstxt_10017", "text": "体力药剂不足" } + }, + { + "id": "625001", + "name": { + "key": "itemname_90001", + "text": "阿宝碎片" + }, + "usetype": 3, + "color": 5, + "bagtype": 1, + "index": 99, + "special_type": 0, + "time": 0, + "effects": "effect_ui_wuping_2", + "box_id": 0, + "synthetize_num": 0, + "access": [ + 155 + ], + "use_skip": 155, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 0, + "race": 0, + "img": "ytx_js_25001", + "ico": "ytx_js_25001", + "intr": { + "key": "itemdesc_625001", + "text": "阿宝天赋点" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "synthetize_deplete": [], + "decompose_deplete": [], + "tipstxt": { + "key": "itemtipstxt_625001", + "text": "阿宝的天赋点不足" + } } ] \ No newline at end of file diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index c1508f357..682f8d478 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -135,7 +135,7 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int ) hero = this.InitHero(uid, heroCfgId) if hero != nil { - hero.SameCount = count + hero.SameCount = 1 // 新需求 不需要判断叠加 if this.moduleHero.IsCross() { if model, err = this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err != nil { this.moduleHero.Errorln(err) @@ -171,35 +171,38 @@ func (this *ModelHero) createHeroOverlying(uid string, heroCfgId string, count i this.moduleHero.Errorf("err:%v", err) } } + for _, obj := range heros { + if obj.HeroID == heroCfgId { // z + return + } + } + for _, h := range heros { + if h.HeroID == heroCfgId && + h.IsOverlying { + h.SameCount += count + data := map[string]interface{}{ + "sameCount": h.SameCount, //叠加数 + } + hero = h - if len(heros) >= 0 { - for _, h := range heros { - if h.HeroID == heroCfgId && - h.IsOverlying { - h.SameCount += count - data := map[string]interface{}{ - "sameCount": h.SameCount, //叠加数 - } - hero = h - - if this.moduleHero.IsCross() { - if model, err := this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err != nil { - this.moduleHero.Errorln(err) - } else { - if err := model.ChangeList(uid, h.Id, data); err != nil { - return nil, err - } - } + if this.moduleHero.IsCross() { + if model, err := this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err != nil { + this.moduleHero.Errorln(err) } else { - if err := this.ChangeList(uid, h.Id, data); err != nil { + if err := model.ChangeList(uid, h.Id, data); err != nil { return nil, err } } - - return + } else { + if err := this.ChangeList(uid, h.Id, data); err != nil { + return nil, err + } } + + return } } + return this.initHeroOverlying(uid, heroCfgId, count) } @@ -881,3 +884,48 @@ func (this *ModelHero) resetTalentProperty(hero *pb.DBHero) { } } + +// 创建一条英雄信息,如果有这个英雄 则转换成对应的碎片 +func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, count int32) (hero *pb.DBHero, err error) { + heros := make([]*pb.DBHero, 0) + uid := session.GetUserId() + bNew := false // 新活得的英雄 + if this.moduleHero.IsCross() { + if dbModel, err := this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err != nil { + this.moduleHero.Errorln(err) + + } else { + if err = dbModel.GetList(uid, &heros); err != nil { + this.moduleHero.Errorf("err:%v", err) + } + } + } else { + if err = this.GetList(uid, &heros); err != nil { + this.moduleHero.Errorf("err:%v", err) + } + } + for _, obj := range heros { + if obj.HeroID == heroCfgId { // z + bNew = true + break + } + } + if !bNew { // 没有当前英雄 + count -= 1 + hero, err = this.initHeroOverlying(uid, heroCfgId, 1) + } + + // 转碎片处理 + if count > 0 { + heroCfg := this.moduleHero.configure.GetHeroConfig(heroCfgId) + if heroCfg != nil { + res := make([]*cfg.Gameatn, 0) + for i := 0; i < int(count); i++ { + res = append(res, heroCfg.Herofrag...) + } + this.moduleHero.DispenseRes(session, res, true) + } + } + + return +} diff --git a/modules/hero/module.go b/modules/hero/module.go index faf671c6b..a1ea27bb4 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -78,7 +78,7 @@ func (this *Hero) Start() (err error) { //创建单个叠加英雄 func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string, num int32) (hero *pb.DBHero, code pb.ErrorCode) { var err error - hero, err = this.modelHero.createHeroOverlying(session.GetUserId(), heroCfgId, num) + hero, err = this.modelHero.createHero(session, heroCfgId, num) if err == nil { //go func(uid string, heroCfgId string) { // 携程处理 图鉴数据 if db.IsCross() { diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go index 9f5b847df..5f048a86a 100644 --- a/sys/configure/structs/game.heroData.go +++ b/sys/configure/structs/game.heroData.go @@ -43,6 +43,8 @@ type GameHeroData struct { Angle int32 Deviation int32 Show int32 + Herofrag []*Gameatn + Heroskillup []*Gameatn } const TypeId_GameHeroData = 1513828672 @@ -129,6 +131,34 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["angle"].(float64); !_ok_ { err = errors.New("angle error"); return }; _v.Angle = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deviation"].(float64); !_ok_ { err = errors.New("deviation error"); return }; _v.Deviation = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show"].(float64); !_ok_ { err = errors.New("show error"); return }; _v.Show = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["herofrag"].([]interface{}); !_ok_ { err = errors.New("herofrag error"); return } + + _v.Herofrag = make([]*Gameatn, 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 } } + _v.Herofrag = append(_v.Herofrag, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["heroskillup"].([]interface{}); !_ok_ { err = errors.New("heroskillup error"); return } + + _v.Heroskillup = make([]*Gameatn, 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 } } + _v.Heroskillup = append(_v.Heroskillup, _list_v_) + } + } + return }