diff --git a/bin/json/game_newhero.json b/bin/json/game_hero.json similarity index 91% rename from bin/json/game_newhero.json rename to bin/json/game_hero.json index 5fdc37919..57492b70e 100644 --- a/bin/json/game_newhero.json +++ b/bin/json/game_hero.json @@ -12,11 +12,9 @@ "type": 1, "handbook": -1, "prefab": 13001, + "rotation": "0|8|0", "icon": 13001, - "sound": { - "key": "13001", - "text": "" - }, + "vocal": "13001", "tujing": [ 1 ], @@ -56,11 +54,9 @@ "type": 1, "handbook": -1, "prefab": 13002, + "rotation": "0|8|0", "icon": 13002, - "sound": { - "key": "13002", - "text": "" - }, + "vocal": "13002", "tujing": [ 1 ], @@ -100,11 +96,9 @@ "type": 1, "handbook": -1, "prefab": 13003, + "rotation": "0|8|0", "icon": 13003, - "sound": { - "key": "13003", - "text": "" - }, + "vocal": "13003", "tujing": [ 1 ], @@ -144,11 +138,9 @@ "type": 1, "handbook": -1, "prefab": 13004, + "rotation": "0|8|0", "icon": 13004, - "sound": { - "key": "13004", - "text": "" - }, + "vocal": "13004", "tujing": [ 1 ], @@ -188,11 +180,9 @@ "type": 1, "handbook": -1, "prefab": 13005, + "rotation": "0|8|0", "icon": 13005, - "sound": { - "key": "13005", - "text": "" - }, + "vocal": "13005", "tujing": [ 1 ], @@ -232,11 +222,9 @@ "type": 1, "handbook": -1, "prefab": 14001, + "rotation": "0|8|0", "icon": 14001, - "sound": { - "key": "14001", - "text": "" - }, + "vocal": "14001", "tujing": [ 1 ], @@ -276,11 +264,9 @@ "type": 1, "handbook": -1, "prefab": 14002, + "rotation": "0|8|0", "icon": 14002, - "sound": { - "key": "14002", - "text": "" - }, + "vocal": "14002", "tujing": [ 1 ], @@ -320,11 +306,9 @@ "type": 1, "handbook": -1, "prefab": 14003, + "rotation": "0|8|0", "icon": 14003, - "sound": { - "key": "14003", - "text": "" - }, + "vocal": "14003", "tujing": [ 1 ], @@ -364,11 +348,9 @@ "type": 1, "handbook": -1, "prefab": 14004, + "rotation": "0|8|0", "icon": 14004, - "sound": { - "key": "14004", - "text": "" - }, + "vocal": "14004", "tujing": [ 1 ], @@ -408,11 +390,9 @@ "type": 1, "handbook": -1, "prefab": 14005, + "rotation": "0|8|0", "icon": 14005, - "sound": { - "key": "14005", - "text": "" - }, + "vocal": "14005", "tujing": [ 1 ], @@ -452,11 +432,9 @@ "type": 1, "handbook": -1, "prefab": 14006, + "rotation": "0|8|0", "icon": 14006, - "sound": { - "key": "14006", - "text": "" - }, + "vocal": "14006", "tujing": [ 1 ], @@ -496,11 +474,9 @@ "type": 1, "handbook": -1, "prefab": 14007, + "rotation": "0|8|0", "icon": 14007, - "sound": { - "key": "14007", - "text": "" - }, + "vocal": "14007", "tujing": [ 1 ], @@ -540,11 +516,9 @@ "type": 1, "handbook": -1, "prefab": 15001, + "rotation": "0|8|0", "icon": 15001, - "sound": { - "key": "15001", - "text": "" - }, + "vocal": "15001", "tujing": [ 1 ], @@ -584,11 +558,9 @@ "type": 1, "handbook": -1, "prefab": 15002, + "rotation": "0|8|0", "icon": 15002, - "sound": { - "key": "15002", - "text": "" - }, + "vocal": "15002", "tujing": [ 1 ], @@ -628,11 +600,9 @@ "type": 1, "handbook": -1, "prefab": 15003, + "rotation": "0|8|0", "icon": 15003, - "sound": { - "key": "15003", - "text": "" - }, + "vocal": "15003", "tujing": [ 1 ], @@ -672,11 +642,9 @@ "type": 1, "handbook": -1, "prefab": 15004, + "rotation": "0|8|0", "icon": 15004, - "sound": { - "key": "15004", - "text": "" - }, + "vocal": "15004", "tujing": [ 1 ], @@ -716,11 +684,9 @@ "type": 1, "handbook": -1, "prefab": 23001, + "rotation": "0|8|0", "icon": 23001, - "sound": { - "key": "23001", - "text": "" - }, + "vocal": "23001", "tujing": [ 1 ], @@ -760,11 +726,9 @@ "type": 1, "handbook": -1, "prefab": 23002, + "rotation": "0|8|0", "icon": 23002, - "sound": { - "key": "23002", - "text": "" - }, + "vocal": "23002", "tujing": [ 1 ], @@ -804,11 +768,9 @@ "type": 1, "handbook": -1, "prefab": 23003, + "rotation": "0|8|0", "icon": 23003, - "sound": { - "key": "23003", - "text": "" - }, + "vocal": "23003", "tujing": [ 1 ], @@ -848,11 +810,9 @@ "type": 1, "handbook": -1, "prefab": 23004, + "rotation": "0|8|0", "icon": 23004, - "sound": { - "key": "23004", - "text": "" - }, + "vocal": "23004", "tujing": [ 1 ], @@ -892,11 +852,9 @@ "type": 1, "handbook": -1, "prefab": 24001, + "rotation": "0|8|0", "icon": 24001, - "sound": { - "key": "24001", - "text": "" - }, + "vocal": "24001", "tujing": [ 1 ], @@ -936,11 +894,9 @@ "type": 1, "handbook": -1, "prefab": 24002, + "rotation": "0|8|0", "icon": 24002, - "sound": { - "key": "24002", - "text": "" - }, + "vocal": "24002", "tujing": [ 1 ], @@ -980,11 +936,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 24003, - "sound": { - "key": "24003", - "text": "" - }, + "vocal": "24003", "tujing": [ 1 ], @@ -1024,11 +978,9 @@ "type": 1, "handbook": -1, "prefab": 24004, + "rotation": "0|8|0", "icon": 24004, - "sound": { - "key": "24004", - "text": "" - }, + "vocal": "24004", "tujing": [ 1 ], @@ -1068,11 +1020,9 @@ "type": 1, "handbook": -1, "prefab": 24005, + "rotation": "0|8|0", "icon": 24005, - "sound": { - "key": "24005", - "text": "" - }, + "vocal": "24005", "tujing": [ 1 ], @@ -1112,11 +1062,9 @@ "type": 1, "handbook": -1, "prefab": 24006, + "rotation": "0|8|0", "icon": 24006, - "sound": { - "key": "24006", - "text": "" - }, + "vocal": "24006", "tujing": [ 1 ], @@ -1156,11 +1104,9 @@ "type": 1, "handbook": -1, "prefab": 24007, + "rotation": "0|8|0", "icon": 24007, - "sound": { - "key": "24007", - "text": "" - }, + "vocal": "24007", "tujing": [ 1 ], @@ -1200,11 +1146,9 @@ "type": 1, "handbook": -1, "prefab": 24008, + "rotation": "0|8|0", "icon": 24008, - "sound": { - "key": "24008", - "text": "" - }, + "vocal": "24008", "tujing": [ 1 ], @@ -1244,11 +1188,9 @@ "type": 1, "handbook": -1, "prefab": 24009, + "rotation": "0|8|0", "icon": 24009, - "sound": { - "key": "24009", - "text": "" - }, + "vocal": "24009", "tujing": [ 1 ], @@ -1288,11 +1230,9 @@ "type": 1, "handbook": 1, "prefab": 25001, + "rotation": "0|8|0", "icon": 25001, - "sound": { - "key": "25001", - "text": "" - }, + "vocal": "25001", "tujing": [ 1 ], @@ -1332,11 +1272,9 @@ "type": 1, "handbook": -1, "prefab": 25002, + "rotation": "0|8|0", "icon": 25002, - "sound": { - "key": "25002", - "text": "" - }, + "vocal": "25002", "tujing": [ 1 ], @@ -1376,11 +1314,9 @@ "type": 1, "handbook": -1, "prefab": 25003, + "rotation": "0|8|0", "icon": 25003, - "sound": { - "key": "25003", - "text": "" - }, + "vocal": "25003", "tujing": [ 1 ], @@ -1420,11 +1356,9 @@ "type": 1, "handbook": 1, "prefab": 25004, + "rotation": "0|8|0", "icon": 25004, - "sound": { - "key": "25004", - "text": "" - }, + "vocal": "25004", "tujing": [ 1 ], @@ -1464,11 +1398,9 @@ "type": 1, "handbook": -1, "prefab": 33001, + "rotation": "0|8|0", "icon": 33001, - "sound": { - "key": "33001", - "text": "" - }, + "vocal": "33001", "tujing": [ 1 ], @@ -1508,11 +1440,9 @@ "type": 1, "handbook": -1, "prefab": 33002, + "rotation": "0|8|0", "icon": 33002, - "sound": { - "key": "33002", - "text": "" - }, + "vocal": "33002", "tujing": [ 1 ], @@ -1552,11 +1482,9 @@ "type": 1, "handbook": -1, "prefab": 33003, + "rotation": "0|8|0", "icon": 33003, - "sound": { - "key": "33003", - "text": "" - }, + "vocal": "33003", "tujing": [ 1 ], @@ -1596,11 +1524,9 @@ "type": 1, "handbook": -1, "prefab": 33004, + "rotation": "0|8|0", "icon": 33004, - "sound": { - "key": "33004", - "text": "" - }, + "vocal": "33004", "tujing": [ 1 ], @@ -1640,11 +1566,9 @@ "type": 1, "handbook": -1, "prefab": 33005, + "rotation": "0|8|0", "icon": 33005, - "sound": { - "key": "33005", - "text": "" - }, + "vocal": "33005", "tujing": [ 1 ], @@ -1684,11 +1608,9 @@ "type": 1, "handbook": -1, "prefab": 33006, + "rotation": "0|8|0", "icon": 33006, - "sound": { - "key": "33006", - "text": "" - }, + "vocal": "33006", "tujing": [ 1 ], @@ -1728,11 +1650,9 @@ "type": 1, "handbook": -1, "prefab": 34001, + "rotation": "0|8|0", "icon": 34001, - "sound": { - "key": "34001", - "text": "" - }, + "vocal": "34001", "tujing": [ 1 ], @@ -1772,11 +1692,9 @@ "type": 1, "handbook": -1, "prefab": 34002, + "rotation": "0|8|0", "icon": 34002, - "sound": { - "key": "34002", - "text": "" - }, + "vocal": "34002", "tujing": [ 1 ], @@ -1816,11 +1734,9 @@ "type": 1, "handbook": -1, "prefab": 34003, + "rotation": "0|8|0", "icon": 34003, - "sound": { - "key": "34003", - "text": "" - }, + "vocal": "34003", "tujing": [ 1 ], @@ -1860,11 +1776,9 @@ "type": 1, "handbook": -1, "prefab": 34004, + "rotation": "0|8|0", "icon": 34004, - "sound": { - "key": "34004", - "text": "" - }, + "vocal": "34004", "tujing": [ 1 ], @@ -1904,11 +1818,9 @@ "type": 1, "handbook": -1, "prefab": 34005, + "rotation": "0|8|0", "icon": 34005, - "sound": { - "key": "34005", - "text": "" - }, + "vocal": "34005", "tujing": [ 1 ], @@ -1948,11 +1860,9 @@ "type": 1, "handbook": -1, "prefab": 34006, + "rotation": "0|8|0", "icon": 34006, - "sound": { - "key": "34006", - "text": "" - }, + "vocal": "34006", "tujing": [ 1 ], @@ -1992,11 +1902,9 @@ "type": 1, "handbook": -1, "prefab": 34007, + "rotation": "0|8|0", "icon": 34007, - "sound": { - "key": "34007", - "text": "" - }, + "vocal": "34007", "tujing": [ 1 ], @@ -2036,11 +1944,9 @@ "type": 1, "handbook": -1, "prefab": 34008, + "rotation": "0|8|0", "icon": 34008, - "sound": { - "key": "34008", - "text": "" - }, + "vocal": "34008", "tujing": [ 1 ], @@ -2080,11 +1986,9 @@ "type": 1, "handbook": -1, "prefab": 35002, + "rotation": "0|8|0", "icon": 35002, - "sound": { - "key": "35002", - "text": "" - }, + "vocal": "35002", "tujing": [ 1 ], @@ -2124,11 +2028,9 @@ "type": 1, "handbook": -1, "prefab": 35003, + "rotation": "0|8|0", "icon": 35003, - "sound": { - "key": "35003", - "text": "" - }, + "vocal": "35003", "tujing": [ 1 ], @@ -2168,11 +2070,9 @@ "type": 1, "handbook": -1, "prefab": 35004, + "rotation": "0|8|0", "icon": 35004, - "sound": { - "key": "35004", - "text": "" - }, + "vocal": "35004", "tujing": [ 1 ], @@ -2212,11 +2112,9 @@ "type": 1, "handbook": -1, "prefab": 35005, + "rotation": "0|8|0", "icon": 35005, - "sound": { - "key": "35005", - "text": "" - }, + "vocal": "35005", "tujing": [ 1 ], @@ -2256,11 +2154,9 @@ "type": 1, "handbook": -1, "prefab": 35006, + "rotation": "0|8|0", "icon": 35006, - "sound": { - "key": "35006", - "text": "" - }, + "vocal": "35006", "tujing": [ 1 ], @@ -2300,11 +2196,9 @@ "type": 1, "handbook": -1, "prefab": 43001, + "rotation": "0|8|0", "icon": 43001, - "sound": { - "key": "43001", - "text": "" - }, + "vocal": "43001", "tujing": [ 1 ], @@ -2344,11 +2238,9 @@ "type": 1, "handbook": -1, "prefab": 43002, + "rotation": "0|8|0", "icon": 43002, - "sound": { - "key": "43002", - "text": "" - }, + "vocal": "43002", "tujing": [ 1 ], @@ -2388,11 +2280,9 @@ "type": 1, "handbook": -1, "prefab": 43003, + "rotation": "0|8|0", "icon": 43003, - "sound": { - "key": "43003", - "text": "" - }, + "vocal": "43003", "tujing": [ 1 ], @@ -2432,11 +2322,9 @@ "type": 1, "handbook": -1, "prefab": 43004, + "rotation": "0|8|0", "icon": 43004, - "sound": { - "key": "43004", - "text": "" - }, + "vocal": "43004", "tujing": [ 1 ], @@ -2476,11 +2364,9 @@ "type": 1, "handbook": -1, "prefab": 43005, + "rotation": "0|8|0", "icon": 43005, - "sound": { - "key": "43005", - "text": "" - }, + "vocal": "43005", "tujing": [ 1 ], @@ -2520,11 +2406,9 @@ "type": 1, "handbook": -1, "prefab": 43006, + "rotation": "0|8|0", "icon": 43006, - "sound": { - "key": "43006", - "text": "" - }, + "vocal": "43006", "tujing": [ 1 ], @@ -2564,11 +2448,9 @@ "type": 1, "handbook": -1, "prefab": 43007, + "rotation": "0|8|0", "icon": 43007, - "sound": { - "key": "43007", - "text": "" - }, + "vocal": "43007", "tujing": [ 1 ], @@ -2608,11 +2490,9 @@ "type": 1, "handbook": -1, "prefab": 44001, + "rotation": "0|8|0", "icon": 44001, - "sound": { - "key": "44001", - "text": "" - }, + "vocal": "44001", "tujing": [ 1 ], @@ -2652,11 +2532,9 @@ "type": 1, "handbook": -1, "prefab": 44002, + "rotation": "0|8|0", "icon": 44002, - "sound": { - "key": "44002", - "text": "" - }, + "vocal": "44002", "tujing": [ 1 ], @@ -2696,11 +2574,9 @@ "type": 1, "handbook": -1, "prefab": 44003, + "rotation": "0|8|0", "icon": 44003, - "sound": { - "key": "44003", - "text": "" - }, + "vocal": "44003", "tujing": [ 1 ], @@ -2740,11 +2616,9 @@ "type": 1, "handbook": -1, "prefab": 44004, + "rotation": "0|8|0", "icon": 44004, - "sound": { - "key": "44004", - "text": "" - }, + "vocal": "44004", "tujing": [ 1 ], @@ -2784,11 +2658,9 @@ "type": 1, "handbook": -1, "prefab": 44006, + "rotation": "0|8|0", "icon": 44006, - "sound": { - "key": "44006", - "text": "" - }, + "vocal": "44006", "tujing": [ 1 ], @@ -2828,11 +2700,9 @@ "type": 1, "handbook": -1, "prefab": 45001, + "rotation": "0|8|0", "icon": 45001, - "sound": { - "key": "45001", - "text": "" - }, + "vocal": "45001", "tujing": [ 1 ], @@ -2872,11 +2742,9 @@ "type": 1, "handbook": -1, "prefab": 45002, + "rotation": "0|8|0", "icon": 45002, - "sound": { - "key": "45002", - "text": "" - }, + "vocal": "45002", "tujing": [ 1 ], @@ -2916,11 +2784,9 @@ "type": 1, "handbook": -1, "prefab": 45003, + "rotation": "0|8|0", "icon": 45003, - "sound": { - "key": "45003", - "text": "" - }, + "vocal": "45003", "tujing": [ 1 ], @@ -2960,11 +2826,9 @@ "type": 1, "handbook": -1, "prefab": 45004, + "rotation": "0|8|0", "icon": 45004, - "sound": { - "key": "45004", - "text": "" - }, + "vocal": "45004", "tujing": [ 1 ], @@ -3004,11 +2868,9 @@ "type": 2, "handbook": -1, "prefab": 43901, + "rotation": "0|8|0", "icon": 43901, - "sound": { - "key": "43901", - "text": "" - }, + "vocal": "43901", "tujing": [ 1 ], @@ -3048,11 +2910,9 @@ "type": 3, "handbook": -1, "prefab": 42911, + "rotation": "0|8|0", "icon": 42911, - "sound": { - "key": "42911", - "text": "" - }, + "vocal": "42911", "tujing": [ 1 ], @@ -3092,11 +2952,9 @@ "type": 3, "handbook": -1, "prefab": 43911, + "rotation": "0|8|0", "icon": 43911, - "sound": { - "key": "43911", - "text": "" - }, + "vocal": "43911", "tujing": [ 1 ], @@ -3136,11 +2994,9 @@ "type": 3, "handbook": -1, "prefab": 44911, + "rotation": "0|8|0", "icon": 44911, - "sound": { - "key": "44911", - "text": "" - }, + "vocal": "44911", "tujing": [ 1 ], @@ -3180,11 +3036,9 @@ "type": 4, "handbook": -1, "prefab": 43921, + "rotation": "0|8|0", "icon": 43921, - "sound": { - "key": "43921", - "text": "" - }, + "vocal": "43921", "tujing": [ 1 ], @@ -3224,11 +3078,9 @@ "type": 4, "handbook": -1, "prefab": 44921, + "rotation": "0|8|0", "icon": 44921, - "sound": { - "key": "44921", - "text": "" - }, + "vocal": "44921", "tujing": [ 1 ], @@ -3268,11 +3120,9 @@ "type": 4, "handbook": -1, "prefab": 45921, + "rotation": "0|8|0", "icon": 45921, - "sound": { - "key": "45921", - "text": "" - }, + "vocal": "45921", "tujing": [ 1 ], @@ -3312,11 +3162,9 @@ "type": 5, "handbook": -1, "prefab": 51001, + "rotation": "0|8|0", "icon": 51001, - "sound": { - "key": "51001", - "text": "" - }, + "vocal": "51001", "tujing": [ 1 ], @@ -3356,11 +3204,9 @@ "type": 5, "handbook": -1, "prefab": 51002, + "rotation": "0|8|0", "icon": 51002, - "sound": { - "key": "51002", - "text": "" - }, + "vocal": "51002", "tujing": [ 1 ], @@ -3400,11 +3246,9 @@ "type": 5, "handbook": -1, "prefab": 51003, + "rotation": "0|8|0", "icon": 51003, - "sound": { - "key": "51003", - "text": "" - }, + "vocal": "51003", "tujing": [ 1 ], @@ -3444,11 +3288,9 @@ "type": 5, "handbook": -1, "prefab": 51004, + "rotation": "0|8|0", "icon": 51004, - "sound": { - "key": "51004", - "text": "" - }, + "vocal": "51004", "tujing": [ 1 ], @@ -3488,11 +3330,9 @@ "type": 5, "handbook": -1, "prefab": 51005, + "rotation": "0|8|0", "icon": 51005, - "sound": { - "key": "51005", - "text": "" - }, + "vocal": "51005", "tujing": [ 1 ], @@ -3532,11 +3372,9 @@ "type": 5, "handbook": -1, "prefab": 51006, + "rotation": "0|8|0", "icon": 51006, - "sound": { - "key": "51006", - "text": "" - }, + "vocal": "51006", "tujing": [ 1 ], @@ -3576,11 +3414,9 @@ "type": 5, "handbook": -1, "prefab": 51007, + "rotation": "0|8|0", "icon": 51007, - "sound": { - "key": "51007", - "text": "" - }, + "vocal": "51007", "tujing": [ 1 ], @@ -3620,11 +3456,9 @@ "type": 5, "handbook": -1, "prefab": 51008, + "rotation": "0|8|0", "icon": 51008, - "sound": { - "key": "51008", - "text": "" - }, + "vocal": "51008", "tujing": [ 1 ], @@ -3664,11 +3498,9 @@ "type": 5, "handbook": -1, "prefab": 51009, + "rotation": "0|8|0", "icon": 51009, - "sound": { - "key": "51009", - "text": "" - }, + "vocal": "51009", "tujing": [ 1 ], @@ -3708,11 +3540,9 @@ "type": 5, "handbook": -1, "prefab": 51010, + "rotation": "0|8|0", "icon": 51010, - "sound": { - "key": "51010", - "text": "" - }, + "vocal": "51010", "tujing": [ 1 ], @@ -3752,11 +3582,9 @@ "type": 5, "handbook": -1, "prefab": 51011, + "rotation": "0|8|0", "icon": 51011, - "sound": { - "key": "51011", - "text": "" - }, + "vocal": "51011", "tujing": [ 1 ], @@ -3796,11 +3624,9 @@ "type": 5, "handbook": -1, "prefab": 51012, + "rotation": "0|8|0", "icon": 51012, - "sound": { - "key": "51012", - "text": "" - }, + "vocal": "51012", "tujing": [ 1 ], @@ -3840,11 +3666,9 @@ "type": 5, "handbook": -1, "prefab": 51013, + "rotation": "0|8|0", "icon": 51013, - "sound": { - "key": "51013", - "text": "" - }, + "vocal": "51013", "tujing": [ 1 ], @@ -3884,11 +3708,9 @@ "type": 5, "handbook": -1, "prefab": 51014, + "rotation": "0|8|0", "icon": 51014, - "sound": { - "key": "51014", - "text": "" - }, + "vocal": "51014", "tujing": [ 1 ], @@ -3928,11 +3750,9 @@ "type": 5, "handbook": -1, "prefab": 53001, + "rotation": "0|8|0", "icon": 53001, - "sound": { - "key": "53001", - "text": "" - }, + "vocal": "53001", "tujing": [ 1 ], @@ -3972,11 +3792,9 @@ "type": 5, "handbook": -1, "prefab": 53002, + "rotation": "0|8|0", "icon": 53002, - "sound": { - "key": "53002", - "text": "" - }, + "vocal": "53002", "tujing": [ 1 ], @@ -4016,11 +3834,9 @@ "type": 5, "handbook": -1, "prefab": 53003, + "rotation": "0|8|0", "icon": 53003, - "sound": { - "key": "53003", - "text": "" - }, + "vocal": "53003", "tujing": [ 1 ], @@ -4060,11 +3876,9 @@ "type": 5, "handbook": -1, "prefab": 53004, + "rotation": "0|8|0", "icon": 53004, - "sound": { - "key": "53004", - "text": "" - }, + "vocal": "53004", "tujing": [ 1 ], @@ -4104,11 +3918,9 @@ "type": 5, "handbook": -1, "prefab": 53005, + "rotation": "0|8|0", "icon": 53005, - "sound": { - "key": "53005", - "text": "" - }, + "vocal": "53005", "tujing": [ 1 ], @@ -4148,11 +3960,9 @@ "type": 5, "handbook": -1, "prefab": 53006, + "rotation": "0|8|0", "icon": 53006, - "sound": { - "key": "53006", - "text": "" - }, + "vocal": "53006", "tujing": [ 1 ], @@ -4192,11 +4002,9 @@ "type": 5, "handbook": -1, "prefab": 55001, + "rotation": "0|8|0", "icon": 55001, - "sound": { - "key": "55001", - "text": "" - }, + "vocal": "55001", "tujing": [ 1 ], @@ -4236,11 +4044,9 @@ "type": 5, "handbook": -1, "prefab": 55002, + "rotation": "0|8|0", "icon": 55002, - "sound": { - "key": "55002", - "text": "" - }, + "vocal": "55002", "tujing": [ 1 ], @@ -4280,11 +4086,9 @@ "type": 5, "handbook": -1, "prefab": 55003, + "rotation": "0|8|0", "icon": 55003, - "sound": { - "key": "55003", - "text": "" - }, + "vocal": "55003", "tujing": [ 1 ], @@ -4324,11 +4128,9 @@ "type": 5, "handbook": -1, "prefab": 55004, + "rotation": "0|8|0", "icon": 55004, - "sound": { - "key": "55004", - "text": "" - }, + "vocal": "55004", "tujing": [ 1 ], @@ -4368,11 +4170,9 @@ "type": 5, "handbook": -1, "prefab": 55005, + "rotation": "0|8|0", "icon": 55005, - "sound": { - "key": "55005", - "text": "" - }, + "vocal": "55005", "tujing": [ 1 ], @@ -4412,11 +4212,9 @@ "type": 5, "handbook": -1, "prefab": 55006, + "rotation": "0|8|0", "icon": 55006, - "sound": { - "key": "55006", - "text": "" - }, + "vocal": "55006", "tujing": [ 1 ], @@ -4456,11 +4254,9 @@ "type": 5, "handbook": -1, "prefab": 55007, + "rotation": "0|8|0", "icon": 55007, - "sound": { - "key": "55007", - "text": "" - }, + "vocal": "55007", "tujing": [ 1 ], @@ -4500,11 +4296,9 @@ "type": 5, "handbook": -1, "prefab": 55008, + "rotation": "0|8|0", "icon": 55008, - "sound": { - "key": "55008", - "text": "" - }, + "vocal": "55008", "tujing": [ 1 ], @@ -4544,11 +4338,9 @@ "type": 1, "handbook": -1, "prefab": 25001, + "rotation": "0|8|0", "icon": 11001, - "sound": { - "key": "121323", - "text": "" - }, + "vocal": "121323", "tujing": [ 1 ], @@ -4588,11 +4380,9 @@ "type": 1, "handbook": -1, "prefab": 34004, + "rotation": "0|8|0", "icon": 11002, - "sound": { - "key": "11002", - "text": "" - }, + "vocal": "11002", "tujing": [ 1 ], @@ -4632,11 +4422,9 @@ "type": 1, "handbook": -1, "prefab": 25004, + "rotation": "0|8|0", "icon": 11003, - "sound": { - "key": "11003", - "text": "" - }, + "vocal": "11003", "tujing": [ 1 ], @@ -4678,11 +4466,9 @@ "type": 1, "handbook": -1, "prefab": 14006, + "rotation": "0|8|0", "icon": 11004, - "sound": { - "key": "11004", - "text": "" - }, + "vocal": "11004", "tujing": [ 1 ], @@ -4722,11 +4508,9 @@ "type": 1, "handbook": -1, "prefab": 25003, + "rotation": "0|8|0", "icon": 11005, - "sound": { - "key": "121323", - "text": "" - }, + "vocal": "121323", "tujing": [ 1 ], @@ -4766,11 +4550,9 @@ "type": 1, "handbook": -1, "prefab": 14003, + "rotation": "0|8|0", "icon": 11006, - "sound": { - "key": "11006", - "text": "" - }, + "vocal": "11006", "tujing": [ 1 ], @@ -4810,11 +4592,9 @@ "type": 1, "handbook": -1, "prefab": 35002, + "rotation": "0|8|0", "icon": 11009, - "sound": { - "key": "11009", - "text": "" - }, + "vocal": "11009", "tujing": [ 1 ], @@ -4854,11 +4634,9 @@ "type": 1, "handbook": -1, "prefab": 34001, + "rotation": "0|8|0", "icon": 22002, - "sound": { - "key": "22002", - "text": "" - }, + "vocal": "22002", "tujing": [ 1 ], @@ -4898,11 +4676,9 @@ "type": 1, "handbook": -1, "prefab": 25001, + "rotation": "0|8|0", "icon": 90001, - "sound": { - "key": "90001", - "text": "" - }, + "vocal": "90001", "tujing": [ 1 ], @@ -4942,11 +4718,9 @@ "type": 1, "handbook": -1, "prefab": 35001, + "rotation": "0|8|0", "icon": 11011, - "sound": { - "key": "11011", - "text": "" - }, + "vocal": "11011", "tujing": [ 1 ], @@ -4986,11 +4760,9 @@ "type": 1, "handbook": -1, "prefab": 44006, + "rotation": "0|8|0", "icon": 11008, - "sound": { - "key": "11008", - "text": "" - }, + "vocal": "11008", "tujing": [ 1 ], @@ -5030,11 +4802,9 @@ "type": 1, "handbook": -1, "prefab": 34006, + "rotation": "0|8|0", "icon": 11017, - "sound": { - "key": "11017", - "text": "" - }, + "vocal": "11017", "tujing": [ 1 ], @@ -5076,11 +4846,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11018, - "sound": { - "key": "11018", - "text": "" - }, + "vocal": "11018", "tujing": [ 1 ], @@ -5123,11 +4891,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11019, - "sound": { - "key": "11019", - "text": "" - }, + "vocal": "11019", "tujing": [ 1 ], @@ -5167,11 +4933,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11020, - "sound": { - "key": "11020", - "text": "" - }, + "vocal": "11020", "tujing": [ 1 ], @@ -5211,11 +4975,9 @@ "type": 1, "handbook": -1, "prefab": 55007, + "rotation": "0|8|0", "icon": 11021, - "sound": { - "key": "11021", - "text": "" - }, + "vocal": "11021", "tujing": [ 1 ], @@ -5255,11 +5017,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11099, - "sound": { - "key": "11099", - "text": "" - }, + "vocal": "11099", "tujing": [ 1 ], @@ -5299,11 +5059,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 12001, - "sound": { - "key": "121323", - "text": "" - }, + "vocal": "121323", "tujing": [ 1 ], @@ -5343,11 +5101,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 12003, - "sound": { - "key": "12003", - "text": "" - }, + "vocal": "12003", "tujing": [ 1 ], @@ -5389,11 +5145,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11009, - "sound": { - "key": "11009", - "text": "" - }, + "vocal": "11009", "tujing": [ 1 ], @@ -5433,11 +5187,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 12017, - "sound": { - "key": "12017", - "text": "" - }, + "vocal": "12017", "tujing": [ 1 ], @@ -5479,11 +5231,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 12018, - "sound": { - "key": "12018", - "text": "" - }, + "vocal": "12018", "tujing": [ 1 ], @@ -5523,11 +5273,9 @@ "type": 1, "handbook": -1, "prefab": 44005, + "rotation": "0|8|0", "icon": 44005, - "sound": { - "key": "44005", - "text": "" - }, + "vocal": "44005", "tujing": [ 1 ], @@ -5567,11 +5315,9 @@ "type": 1, "handbook": -1, "prefab": 15005, + "rotation": "0|8|0", "icon": 15005, - "sound": { - "key": "15005", - "text": "" - }, + "vocal": "15005", "tujing": [ 1 ], @@ -5611,11 +5357,9 @@ "type": 1, "handbook": -1, "prefab": 35001, + "rotation": "0|8|0", "icon": 35001, - "sound": { - "key": "35001", - "text": "" - }, + "vocal": "35001", "tujing": [ 1 ], diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index aff7f74de..e965155f6 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -9,7 +9,7 @@ import ( ) const ( - new_hero = "game_newhero.json" //英雄 + new_hero = "game_hero.json" //英雄 hero_stargrow = "game_herostargrow.json" //英雄品质系数 hero_levelgrow = "game_herolevelgrow.json" //英雄成长系数 hero_starup = "game_herostarup.json" // 升星 @@ -35,7 +35,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) err = this.LoadMultiConfigure(map[string]interface{}{ - new_hero: cfg.NewGame_newHero, + new_hero: cfg.NewGame_hero, hero_stargrow: cfg.NewGame_heroStargrow, hero_levelgrow: cfg.NewGame_heroLevelgrow, hero_starup: cfg.NewGame_heroStarup, @@ -55,7 +55,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp } //获取英雄配置数据 -func (this *configureComp) getHeroConfigure() (configure *cfg.Game_newHero, err error) { +func (this *configureComp) getHeroConfigure() (configure *cfg.Game_hero, err error) { var ( v interface{} ok bool @@ -64,7 +64,7 @@ func (this *configureComp) getHeroConfigure() (configure *cfg.Game_newHero, err if v, err = this.GetConfigure(new_hero); err != nil { return } else { - if configure, ok = v.(*cfg.Game_newHero); !ok { + if configure, ok = v.(*cfg.Game_hero); !ok { err = fmt.Errorf("%T no is *cfg.Game_hero", v) } } @@ -204,7 +204,7 @@ func (this *configureComp) GetHeroStargrow() (configure *cfg.Game_heroStargrow, } //获取英雄配置 -func (this *configureComp) GetHero(heroCfgId string) *cfg.Game_newHeroData { +func (this *configureComp) GetHero(heroCfgId string) *cfg.Game_heroData { cfg, err := this.getHeroConfigure() if err != nil { return nil diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 20fbb96ad..eb01611fb 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -1,4 +1,3 @@ - //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -12,425 +11,425 @@ package cfg type JsonLoader func(string) ([]map[string]interface{}, error) type Tables struct { - LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory - LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory - LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory - global *Game_global - ui *Game_ui - plot *Game_plot - extservers *Game_extservers - skillAtk *Game_skillAtk - skillAfteratk *Game_skillAfteratk - skillBuff *Game_skillBuff - skillPassive *Game_skillPassive - newHero *Game_newHero - heroStargrow *Game_heroStargrow - heroLevelgrow *Game_heroLevelgrow - heroStarup *Game_heroStarup - heroExp *Game_heroExp - heroLevelup *Game_heroLevelup - equip *Game_equip - equipAttrlibrary *Game_equipAttrlibrary - equipSuit *Game_equipSuit - equipColor *Game_equipColor - equipIntensify *Game_equipIntensify - item *Game_item - heroSkillLevel *Game_heroSkillLevel - heroResonance *Game_heroResonance - comAtn *Game_comAtn - heroAwaken *Game_heroAwaken - heroMethod *Game_heroMethod - shop *Game_shop - shopitem *Game_shopitem - activeReward *Game_activeReward - serverList *Game_serverList - com *Game_com - newSkill *Game_newSkill - model *Game_model - mainlineChapter *Game_mainlineChapter - mainlineEasy *Game_mainlineEasy - mainlineHard *Game_mainlineHard - mainlinePurgatory *Game_mainlinePurgatory - drawCard *Game_drawCard - drawUpdraw *Game_drawUpdraw - drawCom *Game_drawCom - drawCost *Game_drawCost - chatChannel *Game_chatChannel - chatSystem *Game_chatSystem - chatServerGroup *Game_chatServerGroup - chatChannelCom *Game_chatChannelCom - taskRound *Game_taskRound - taskActiveReward *Game_taskActiveReward - coin *Game_coin - initial *Game_initial - monster *Game_monster - equipPos *Game_equipPos - playerlv *Game_playerlv - propsgroup *Game_propsgroup - facemod *Game_facemod - msgdistrib *Game_msgdistrib - language *Game_language - propsgrouplist *Game_propsgrouplist + LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory + LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory + LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory + global *Game_global + ui *Game_ui + plot *Game_plot + extservers *Game_extservers + skillAtk *Game_skillAtk + skillAfteratk *Game_skillAfteratk + skillBuff *Game_skillBuff + skillPassive *Game_skillPassive + newHero *Game_hero + heroStargrow *Game_heroStargrow + heroLevelgrow *Game_heroLevelgrow + heroStarup *Game_heroStarup + heroExp *Game_heroExp + heroLevelup *Game_heroLevelup + equip *Game_equip + equipAttrlibrary *Game_equipAttrlibrary + equipSuit *Game_equipSuit + equipColor *Game_equipColor + equipIntensify *Game_equipIntensify + item *Game_item + heroSkillLevel *Game_heroSkillLevel + heroResonance *Game_heroResonance + comAtn *Game_comAtn + heroAwaken *Game_heroAwaken + heroMethod *Game_heroMethod + shop *Game_shop + shopitem *Game_shopitem + activeReward *Game_activeReward + serverList *Game_serverList + com *Game_com + newSkill *Game_newSkill + model *Game_model + mainlineChapter *Game_mainlineChapter + mainlineEasy *Game_mainlineEasy + mainlineHard *Game_mainlineHard + mainlinePurgatory *Game_mainlinePurgatory + drawCard *Game_drawCard + drawUpdraw *Game_drawUpdraw + drawCom *Game_drawCom + drawCost *Game_drawCost + chatChannel *Game_chatChannel + chatSystem *Game_chatSystem + chatServerGroup *Game_chatServerGroup + chatChannelCom *Game_chatChannelCom + taskRound *Game_taskRound + taskActiveReward *Game_taskActiveReward + coin *Game_coin + initial *Game_initial + monster *Game_monster + equipPos *Game_equipPos + playerlv *Game_playerlv + propsgroup *Game_propsgroup + facemod *Game_facemod + msgdistrib *Game_msgdistrib + language *Game_language + propsgrouplist *Game_propsgrouplist } func NewTables(loader JsonLoader) (*Tables, error) { - var err error - var buf []map[string]interface{} + var err error + var buf []map[string]interface{} - tables := &Tables{} - if buf, err = loader("LocalizeConfig_CN") ; err != nil { - return nil, err - } - if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("LocalizeConfig_EN") ; err != nil { - return nil, err - } - if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("LocalizeConfig_TW") ; err != nil { - return nil, err - } - if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_global") ; err != nil { - return nil, err - } - if tables.global, err = NewGame_global(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_ui") ; err != nil { - return nil, err - } - if tables.ui, err = NewGame_ui(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_plot") ; err != nil { - return nil, err - } - if tables.plot, err = NewGame_plot(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_extservers") ; err != nil { - return nil, err - } - if tables.extservers, err = NewGame_extservers(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillatk") ; err != nil { - return nil, err - } - if tables.skillAtk, err = NewGame_skillAtk(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillafteratk") ; err != nil { - return nil, err - } - if tables.skillAfteratk, err = NewGame_skillAfteratk(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillbuff") ; err != nil { - return nil, err - } - if tables.skillBuff, err = NewGame_skillBuff(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillpassive") ; err != nil { - return nil, err - } - if tables.skillPassive, err = NewGame_skillPassive(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_newhero") ; err != nil { - return nil, err - } - if tables.newHero, err = NewGame_newHero(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herostargrow") ; err != nil { - return nil, err - } - if tables.heroStargrow, err = NewGame_heroStargrow(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herolevelgrow") ; err != nil { - return nil, err - } - if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herostarup") ; err != nil { - return nil, err - } - if tables.heroStarup, err = NewGame_heroStarup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroexp") ; err != nil { - return nil, err - } - if tables.heroExp, err = NewGame_heroExp(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herolevelup") ; err != nil { - return nil, err - } - if tables.heroLevelup, err = NewGame_heroLevelup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equip") ; err != nil { - return nil, err - } - if tables.equip, err = NewGame_equip(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipattrlibrary") ; err != nil { - return nil, err - } - if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipsuit") ; err != nil { - return nil, err - } - if tables.equipSuit, err = NewGame_equipSuit(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipcolor") ; err != nil { - return nil, err - } - if tables.equipColor, err = NewGame_equipColor(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipintensify") ; err != nil { - return nil, err - } - if tables.equipIntensify, err = NewGame_equipIntensify(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_item") ; err != nil { - return nil, err - } - if tables.item, err = NewGame_item(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroskilllevel") ; err != nil { - return nil, err - } - if tables.heroSkillLevel, err = NewGame_heroSkillLevel(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroresonance") ; err != nil { - return nil, err - } - if tables.heroResonance, err = NewGame_heroResonance(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_comatn") ; err != nil { - return nil, err - } - if tables.comAtn, err = NewGame_comAtn(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroawaken") ; err != nil { - return nil, err - } - if tables.heroAwaken, err = NewGame_heroAwaken(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heromethod") ; err != nil { - return nil, err - } - if tables.heroMethod, err = NewGame_heroMethod(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_shop") ; err != nil { - return nil, err - } - if tables.shop, err = NewGame_shop(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_shopitem") ; err != nil { - return nil, err - } - if tables.shopitem, err = NewGame_shopitem(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_activereward") ; err != nil { - return nil, err - } - if tables.activeReward, err = NewGame_activeReward(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_serverlist") ; err != nil { - return nil, err - } - if tables.serverList, err = NewGame_serverList(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_com") ; err != nil { - return nil, err - } - if tables.com, err = NewGame_com(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_newskill") ; err != nil { - return nil, err - } - if tables.newSkill, err = NewGame_newSkill(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_model") ; err != nil { - return nil, err - } - if tables.model, err = NewGame_model(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlinechapter") ; err != nil { - return nil, err - } - if tables.mainlineChapter, err = NewGame_mainlineChapter(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlineeasy") ; err != nil { - return nil, err - } - if tables.mainlineEasy, err = NewGame_mainlineEasy(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlinehard") ; err != nil { - return nil, err - } - if tables.mainlineHard, err = NewGame_mainlineHard(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlinepurgatory") ; err != nil { - return nil, err - } - if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drawcard") ; err != nil { - return nil, err - } - if tables.drawCard, err = NewGame_drawCard(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drawupdraw") ; err != nil { - return nil, err - } - if tables.drawUpdraw, err = NewGame_drawUpdraw(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drawcom") ; err != nil { - return nil, err - } - if tables.drawCom, err = NewGame_drawCom(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drawcost") ; err != nil { - return nil, err - } - if tables.drawCost, err = NewGame_drawCost(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatchannel") ; err != nil { - return nil, err - } - if tables.chatChannel, err = NewGame_chatChannel(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatsystem") ; err != nil { - return nil, err - } - if tables.chatSystem, err = NewGame_chatSystem(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatservergroup") ; err != nil { - return nil, err - } - if tables.chatServerGroup, err = NewGame_chatServerGroup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatchannelcom") ; err != nil { - return nil, err - } - if tables.chatChannelCom, err = NewGame_chatChannelCom(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_taskround") ; err != nil { - return nil, err - } - if tables.taskRound, err = NewGame_taskRound(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_taskactivereward") ; err != nil { - return nil, err - } - if tables.taskActiveReward, err = NewGame_taskActiveReward(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_coin") ; err != nil { - return nil, err - } - if tables.coin, err = NewGame_coin(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_initial") ; err != nil { - return nil, err - } - if tables.initial, err = NewGame_initial(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_monster") ; err != nil { - return nil, err - } - if tables.monster, err = NewGame_monster(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equippos") ; err != nil { - return nil, err - } - if tables.equipPos, err = NewGame_equipPos(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_playerlv") ; err != nil { - return nil, err - } - if tables.playerlv, err = NewGame_playerlv(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_propsgroup") ; err != nil { - return nil, err - } - if tables.propsgroup, err = NewGame_propsgroup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_facemod") ; err != nil { - return nil, err - } - if tables.facemod, err = NewGame_facemod(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_msgdistrib") ; err != nil { - return nil, err - } - if tables.msgdistrib, err = NewGame_msgdistrib(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_language") ; err != nil { - return nil, err - } - if tables.language, err = NewGame_language(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_propsgrouplist") ; err != nil { - return nil, err - } - if tables.propsgrouplist, err = NewGame_propsgrouplist(buf) ; err != nil { - return nil, err - } - return tables, nil + tables := &Tables{} + if buf, err = loader("LocalizeConfig_CN"); err != nil { + return nil, err + } + if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf); err != nil { + return nil, err + } + if buf, err = loader("LocalizeConfig_EN"); err != nil { + return nil, err + } + if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf); err != nil { + return nil, err + } + if buf, err = loader("LocalizeConfig_TW"); err != nil { + return nil, err + } + if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf); err != nil { + return nil, err + } + if buf, err = loader("game_global"); err != nil { + return nil, err + } + if tables.global, err = NewGame_global(buf); err != nil { + return nil, err + } + if buf, err = loader("game_ui"); err != nil { + return nil, err + } + if tables.ui, err = NewGame_ui(buf); err != nil { + return nil, err + } + if buf, err = loader("game_plot"); err != nil { + return nil, err + } + if tables.plot, err = NewGame_plot(buf); err != nil { + return nil, err + } + if buf, err = loader("game_extservers"); err != nil { + return nil, err + } + if tables.extservers, err = NewGame_extservers(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillatk"); err != nil { + return nil, err + } + if tables.skillAtk, err = NewGame_skillAtk(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillafteratk"); err != nil { + return nil, err + } + if tables.skillAfteratk, err = NewGame_skillAfteratk(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillbuff"); err != nil { + return nil, err + } + if tables.skillBuff, err = NewGame_skillBuff(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillpassive"); err != nil { + return nil, err + } + if tables.skillPassive, err = NewGame_skillPassive(buf); err != nil { + return nil, err + } + if buf, err = loader("game_hero"); err != nil { + return nil, err + } + if tables.newHero, err = NewGame_hero(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herostargrow"); err != nil { + return nil, err + } + if tables.heroStargrow, err = NewGame_heroStargrow(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herolevelgrow"); err != nil { + return nil, err + } + if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herostarup"); err != nil { + return nil, err + } + if tables.heroStarup, err = NewGame_heroStarup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroexp"); err != nil { + return nil, err + } + if tables.heroExp, err = NewGame_heroExp(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herolevelup"); err != nil { + return nil, err + } + if tables.heroLevelup, err = NewGame_heroLevelup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equip"); err != nil { + return nil, err + } + if tables.equip, err = NewGame_equip(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipattrlibrary"); err != nil { + return nil, err + } + if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipsuit"); err != nil { + return nil, err + } + if tables.equipSuit, err = NewGame_equipSuit(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipcolor"); err != nil { + return nil, err + } + if tables.equipColor, err = NewGame_equipColor(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipintensify"); err != nil { + return nil, err + } + if tables.equipIntensify, err = NewGame_equipIntensify(buf); err != nil { + return nil, err + } + if buf, err = loader("game_item"); err != nil { + return nil, err + } + if tables.item, err = NewGame_item(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroskilllevel"); err != nil { + return nil, err + } + if tables.heroSkillLevel, err = NewGame_heroSkillLevel(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroresonance"); err != nil { + return nil, err + } + if tables.heroResonance, err = NewGame_heroResonance(buf); err != nil { + return nil, err + } + if buf, err = loader("game_comatn"); err != nil { + return nil, err + } + if tables.comAtn, err = NewGame_comAtn(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroawaken"); err != nil { + return nil, err + } + if tables.heroAwaken, err = NewGame_heroAwaken(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heromethod"); err != nil { + return nil, err + } + if tables.heroMethod, err = NewGame_heroMethod(buf); err != nil { + return nil, err + } + if buf, err = loader("game_shop"); err != nil { + return nil, err + } + if tables.shop, err = NewGame_shop(buf); err != nil { + return nil, err + } + if buf, err = loader("game_shopitem"); err != nil { + return nil, err + } + if tables.shopitem, err = NewGame_shopitem(buf); err != nil { + return nil, err + } + if buf, err = loader("game_activereward"); err != nil { + return nil, err + } + if tables.activeReward, err = NewGame_activeReward(buf); err != nil { + return nil, err + } + if buf, err = loader("game_serverlist"); err != nil { + return nil, err + } + if tables.serverList, err = NewGame_serverList(buf); err != nil { + return nil, err + } + if buf, err = loader("game_com"); err != nil { + return nil, err + } + if tables.com, err = NewGame_com(buf); err != nil { + return nil, err + } + if buf, err = loader("game_newskill"); err != nil { + return nil, err + } + if tables.newSkill, err = NewGame_newSkill(buf); err != nil { + return nil, err + } + if buf, err = loader("game_model"); err != nil { + return nil, err + } + if tables.model, err = NewGame_model(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlinechapter"); err != nil { + return nil, err + } + if tables.mainlineChapter, err = NewGame_mainlineChapter(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlineeasy"); err != nil { + return nil, err + } + if tables.mainlineEasy, err = NewGame_mainlineEasy(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlinehard"); err != nil { + return nil, err + } + if tables.mainlineHard, err = NewGame_mainlineHard(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlinepurgatory"); err != nil { + return nil, err + } + if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf); err != nil { + return nil, err + } + if buf, err = loader("game_drawcard"); err != nil { + return nil, err + } + if tables.drawCard, err = NewGame_drawCard(buf); err != nil { + return nil, err + } + if buf, err = loader("game_drawupdraw"); err != nil { + return nil, err + } + if tables.drawUpdraw, err = NewGame_drawUpdraw(buf); err != nil { + return nil, err + } + if buf, err = loader("game_drawcom"); err != nil { + return nil, err + } + if tables.drawCom, err = NewGame_drawCom(buf); err != nil { + return nil, err + } + if buf, err = loader("game_drawcost"); err != nil { + return nil, err + } + if tables.drawCost, err = NewGame_drawCost(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatchannel"); err != nil { + return nil, err + } + if tables.chatChannel, err = NewGame_chatChannel(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatsystem"); err != nil { + return nil, err + } + if tables.chatSystem, err = NewGame_chatSystem(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatservergroup"); err != nil { + return nil, err + } + if tables.chatServerGroup, err = NewGame_chatServerGroup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatchannelcom"); err != nil { + return nil, err + } + if tables.chatChannelCom, err = NewGame_chatChannelCom(buf); err != nil { + return nil, err + } + if buf, err = loader("game_taskround"); err != nil { + return nil, err + } + if tables.taskRound, err = NewGame_taskRound(buf); err != nil { + return nil, err + } + if buf, err = loader("game_taskactivereward"); err != nil { + return nil, err + } + if tables.taskActiveReward, err = NewGame_taskActiveReward(buf); err != nil { + return nil, err + } + if buf, err = loader("game_coin"); err != nil { + return nil, err + } + if tables.coin, err = NewGame_coin(buf); err != nil { + return nil, err + } + if buf, err = loader("game_initial"); err != nil { + return nil, err + } + if tables.initial, err = NewGame_initial(buf); err != nil { + return nil, err + } + if buf, err = loader("game_monster"); err != nil { + return nil, err + } + if tables.monster, err = NewGame_monster(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equippos"); err != nil { + return nil, err + } + if tables.equipPos, err = NewGame_equipPos(buf); err != nil { + return nil, err + } + if buf, err = loader("game_playerlv"); err != nil { + return nil, err + } + if tables.playerlv, err = NewGame_playerlv(buf); err != nil { + return nil, err + } + if buf, err = loader("game_propsgroup"); err != nil { + return nil, err + } + if tables.propsgroup, err = NewGame_propsgroup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_facemod"); err != nil { + return nil, err + } + if tables.facemod, err = NewGame_facemod(buf); err != nil { + return nil, err + } + if buf, err = loader("game_msgdistrib"); err != nil { + return nil, err + } + if tables.msgdistrib, err = NewGame_msgdistrib(buf); err != nil { + return nil, err + } + if buf, err = loader("game_language"); err != nil { + return nil, err + } + if tables.language, err = NewGame_language(buf); err != nil { + return nil, err + } + if buf, err = loader("game_propsgrouplist"); err != nil { + return nil, err + } + if tables.propsgrouplist, err = NewGame_propsgrouplist(buf); err != nil { + return nil, err + } + return tables, nil } diff --git a/sys/configure/structs/game.hero.go b/sys/configure/structs/game.hero.go new file mode 100644 index 000000000..48cc2c6ea --- /dev/null +++ b/sys/configure/structs/game.hero.go @@ -0,0 +1,42 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +type Game_hero struct { + _dataMap map[string]*Game_heroData + _dataList []*Game_heroData +} + +func NewGame_hero(_buf []map[string]interface{}) (*Game_hero, error) { + _dataList := make([]*Game_heroData, 0, len(_buf)) + dataMap := make(map[string]*Game_heroData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_heroData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Hid] = _v + } + } + return &Game_hero{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_hero) GetDataMap() map[string]*Game_heroData { + return table._dataMap +} + +func (table *Game_hero) GetDataList() []*Game_heroData { + return table._dataList +} + +func (table *Game_hero) Get(key string) *Game_heroData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.newHeroData.go b/sys/configure/structs/game.heroData.go similarity index 91% rename from sys/configure/structs/game.newHeroData.go rename to sys/configure/structs/game.heroData.go index aaf7877e1..2e7541699 100644 --- a/sys/configure/structs/game.newHeroData.go +++ b/sys/configure/structs/game.heroData.go @@ -11,7 +11,7 @@ package cfg import "errors" import "bright/math" -type Game_newHeroData struct { +type Game_heroData struct { Hid string Name string Star int32 @@ -21,8 +21,9 @@ type Game_newHeroData struct { Type int32 Handbook int32 Prefab int32 + Rotation string Icon int32 - Sound string + Vocal string Tujing []int32 Intr string Events string @@ -38,12 +39,12 @@ type Game_newHeroData struct { Camerainterval float32 } -func (Game_newHeroData) GetTypeId() int { - return -1696809848 +func (Game_heroData) GetTypeId() int { + return 650222912 } -func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err error) { - _v = &Game_newHeroData{} +func NewGame_heroData(_buf map[string]interface{}) (_v *Game_heroData, err error) { + _v = &Game_heroData{} { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } @@ -53,8 +54,9 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["handbook"].(float64); !_ok_ { err = errors.New("handbook error"); return }; _v.Handbook = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["prefab"].(float64); !_ok_ { err = errors.New("prefab error"); return }; _v.Prefab = int32(_tempNum_) } + { var _ok_ bool; if _v.Rotation, _ok_ = _buf["rotation"].(string); !_ok_ { err = errors.New("rotation error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ { err = errors.New("icon error"); return }; _v.Icon = int32(_tempNum_) } - {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["sound"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Sound error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Sound, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Vocal, _ok_ = _buf["vocal"].(string); !_ok_ { err = errors.New("vocal error"); return } } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.newHero.go b/sys/configure/structs/game.newHero.go deleted file mode 100644 index e5020d522..000000000 --- a/sys/configure/structs/game.newHero.go +++ /dev/null @@ -1,42 +0,0 @@ - -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ -package cfg - -type Game_newHero struct { - _dataMap map[string]*Game_newHeroData - _dataList []*Game_newHeroData -} - -func NewGame_newHero(_buf []map[string]interface{}) (*Game_newHero, error) { - _dataList := make([]*Game_newHeroData, 0, len(_buf)) - dataMap := make(map[string]*Game_newHeroData) - for _, _ele_ := range _buf { - if _v, err2 := NewGame_newHeroData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Hid] = _v - } - } - return &Game_newHero{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *Game_newHero) GetDataMap() map[string]*Game_newHeroData { - return table._dataMap -} - -func (table *Game_newHero) GetDataList() []*Game_newHeroData { - return table._dataList -} - -func (table *Game_newHero) Get(key string) *Game_newHeroData { - return table._dataMap[key] -} - -