diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 4943a341b..8521f2a58 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -55,7 +55,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "13002", @@ -113,7 +114,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "13003", @@ -171,7 +173,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "13004", @@ -229,7 +232,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "13005", @@ -287,7 +291,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "14001", @@ -345,7 +350,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "14002", @@ -403,7 +409,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "14003", @@ -461,7 +468,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "14004", @@ -519,7 +527,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "14005", @@ -577,7 +586,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "14006", @@ -635,7 +645,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "14007", @@ -693,7 +704,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "15001", @@ -751,7 +763,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "15002", @@ -809,7 +822,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "15003", @@ -867,7 +881,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "15004", @@ -925,7 +940,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "23001", @@ -983,7 +999,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "23002", @@ -1041,7 +1058,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "23003", @@ -1099,7 +1117,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "23004", @@ -1157,7 +1176,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "24001", @@ -1215,7 +1235,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "24002", @@ -1273,7 +1294,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "24003", @@ -1331,7 +1353,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "24004", @@ -1389,7 +1412,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "24005", @@ -1447,7 +1471,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "24006", @@ -1505,7 +1530,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "24007", @@ -1563,7 +1589,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "24008", @@ -1621,7 +1648,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "24009", @@ -1679,7 +1707,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "25001", @@ -1737,7 +1766,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "25002", @@ -1795,7 +1825,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "25003", @@ -1853,7 +1884,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "25004", @@ -1911,7 +1943,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "33001", @@ -1969,7 +2002,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "33002", @@ -2027,7 +2061,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "33003", @@ -2085,7 +2120,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "33004", @@ -2143,7 +2179,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "33005", @@ -2201,7 +2238,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "33006", @@ -2259,7 +2297,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "34001", @@ -2317,7 +2356,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "34002", @@ -2375,7 +2415,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "34003", @@ -2433,7 +2474,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "34004", @@ -2491,7 +2533,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "34005", @@ -2549,7 +2592,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "34006", @@ -2607,7 +2651,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "34007", @@ -2665,7 +2710,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "34008", @@ -2723,7 +2769,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "35001", @@ -2781,7 +2828,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "35002", @@ -2839,7 +2887,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "35003", @@ -2897,7 +2946,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "35004", @@ -2955,7 +3005,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "35005", @@ -3013,7 +3064,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "35006", @@ -3071,7 +3123,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "43001", @@ -3129,7 +3182,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "43002", @@ -3187,7 +3241,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "43003", @@ -3245,7 +3300,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "43004", @@ -3303,7 +3359,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "43005", @@ -3361,7 +3418,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "43006", @@ -3419,7 +3477,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "43007", @@ -3477,7 +3536,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "44001", @@ -3535,7 +3595,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "44002", @@ -3593,7 +3654,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "44003", @@ -3651,7 +3713,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "44004", @@ -3709,7 +3772,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "44006", @@ -3767,7 +3831,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "45001", @@ -3825,7 +3890,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "45002", @@ -3883,7 +3949,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "45003", @@ -3941,7 +4008,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "45004", @@ -3999,13 +4067,14 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "43901", "name": { "key": "hero_43901", - "text": "升星精灵" + "text": "升星精灵·稀有" }, "star": 3, "color": 2, @@ -4057,7 +4126,126 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 + }, + { + "hid": "43902", + "name": { + "key": "hero_43902", + "text": "升星精灵·史诗" + }, + "star": 4, + "color": 3, + "race": 4, + "job": 5, + "type": 2, + "ip": 1, + "sd": 1, + "handbook": -1, + "prefab": "43901", + "rotation": "0|0|0", + "icon": "43902", + "vocal": "43902", + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "hero_43902", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": 143902011, + "skill1": 143902111, + "skill2": 143902211, + "skill3": 143902311, + "txt": { + "key": "hero_55080", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0, + "equiprcom": [ + "11001", + "11002", + "11003", + "11004", + "11005", + "11006", + "11011", + "11012", + "11013", + "11014", + "11015", + "11016" + ], + "angle": 0 + }, + { + "hid": "43903", + "name": { + "key": "hero_43903", + "text": "升星精灵·传说" + }, + "star": 5, + "color": 4, + "race": 4, + "job": 5, + "type": 2, + "ip": 1, + "sd": 1, + "handbook": -1, + "prefab": "43901", + "rotation": "0|0|0", + "icon": "43903", + "vocal": "43903", + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "hero_43903", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": 143903011, + "skill1": 143903111, + "skill2": 143903211, + "skill3": 143903311, + "txt": { + "key": "hero_55080", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0, + "equiprcom": [ + "11001", + "11002", + "11003", + "11004", + "11005", + "11006", + "11011", + "11012", + "11013", + "11014", + "11015", + "11016" + ], + "angle": 0 }, { "hid": "42911", @@ -4115,7 +4303,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "43911", @@ -4173,7 +4362,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "44911", @@ -4231,7 +4421,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "43921", @@ -4289,7 +4480,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "44921", @@ -4347,7 +4539,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "45921", @@ -4405,13 +4598,14 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "51001", "name": { "key": "hero_51001", - "text": "啵啵星人 " + "text": "啵啵星人" }, "star": 2, "color": 1, @@ -4463,13 +4657,14 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "51002", "name": { "key": "hero_51002", - "text": "埃雷特手下1号 " + "text": "埃雷特手下1号" }, "star": 2, "color": 1, @@ -4521,13 +4716,14 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "51003", "name": { "key": "hero_51003", - "text": "埃雷特手下2号 " + "text": "埃雷特手下2号" }, "star": 2, "color": 1, @@ -4579,13 +4775,14 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "51004", "name": { "key": "hero_51004", - "text": "豺狼小怪 " + "text": "豺狼小怪" }, "star": 2, "color": 1, @@ -4637,13 +4834,14 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "51005", "name": { "key": "hero_51005", - "text": "犀牛守卫 " + "text": "犀牛守卫" }, "star": 2, "color": 1, @@ -4695,13 +4893,14 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "51006", "name": { "key": "hero_51006", - "text": "香塔尔 杜布瓦队长手下1号 " + "text": "香塔尔杜布瓦队长手下1号" }, "star": 2, "color": 1, @@ -4753,13 +4952,14 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "51007", "name": { "key": "hero_51007", - "text": "香塔尔 杜布瓦队长手下2号 " + "text": "香塔尔杜布瓦队长手下2号" }, "star": 2, "color": 1, @@ -4811,13 +5011,14 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "51008", "name": { "key": "hero_51008", - "text": "香塔尔 杜布瓦队长手下3号 " + "text": "香塔尔杜布瓦队长手下3号" }, "star": 2, "color": 1, @@ -4869,13 +5070,14 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "51009", "name": { "key": "hero_51009", - "text": "香塔尔 杜布瓦队长手下4号 " + "text": "香塔尔杜布瓦队长手下4号" }, "star": 2, "color": 1, @@ -4927,13 +5129,14 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "51010", "name": { "key": "hero_51010", - "text": "警卫1号 " + "text": "警卫1号" }, "star": 2, "color": 1, @@ -4985,13 +5188,14 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "51011", "name": { "key": "hero_51011", - "text": "警卫2号 " + "text": "警卫2号" }, "star": 2, "color": 1, @@ -5043,13 +5247,14 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "51012", "name": { "key": "hero_51012", - "text": "小猴子 " + "text": "小猴子" }, "star": 2, "color": 1, @@ -5101,13 +5306,14 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "51013", "name": { "key": "hero_51013", - "text": "巨怪啰啰 " + "text": "巨怪啰啰" }, "star": 2, "color": 1, @@ -5159,13 +5365,14 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "51014", "name": { "key": "hero_51014", - "text": "博啃族宫廷守卫 " + "text": "博啃族宫廷守卫" }, "star": 2, "color": 1, @@ -5217,7 +5424,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "54001", @@ -5275,13 +5483,14 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "53001", "name": { "key": "hero_53001", - "text": "埃雷特 " + "text": "埃雷特" }, "star": 3, "color": 2, @@ -5333,13 +5542,14 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "53002", "name": { "key": "hero_53002", - "text": "豺狼头领 " + "text": "豺狼头领" }, "star": 3, "color": 2, @@ -5391,13 +5601,14 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "53003", "name": { "key": "hero_53003", - "text": "豪猪大师（翡翠僵尸） " + "text": "豪猪大师（翡翠僵尸）" }, "star": 3, "color": 2, @@ -5449,13 +5660,14 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "53004", "name": { "key": "hero_53004", - "text": "双獾大师（翡翠僵尸） " + "text": "双獾大师（翡翠僵尸）" }, "star": 3, "color": 2, @@ -5507,13 +5719,14 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "53005", "name": { "key": "hero_53005", - "text": "小猴子首领 " + "text": "小猴子首领" }, "star": 3, "color": 2, @@ -5565,13 +5778,14 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "53006", "name": { "key": "hero_53006", - "text": "巨怪首领 " + "text": "巨怪首领" }, "star": 3, "color": 2, @@ -5623,7 +5837,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "55001", @@ -5681,7 +5896,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "55002", @@ -5739,7 +5955,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "55003", @@ -5797,7 +6014,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "55004", @@ -5855,7 +6073,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "55005", @@ -5913,7 +6132,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "55006", @@ -5971,7 +6191,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "55007", @@ -6029,7 +6250,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "11001", @@ -6087,7 +6309,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "11002", @@ -6145,7 +6368,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "11003", @@ -6205,7 +6429,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "11004", @@ -6263,7 +6488,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "11005", @@ -6321,7 +6547,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "11006", @@ -6379,7 +6606,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "11009", @@ -6437,7 +6665,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "22002", @@ -6495,7 +6724,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "90001", @@ -6553,7 +6783,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "11011", @@ -6611,7 +6842,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "11008", @@ -6669,7 +6901,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "11017", @@ -6729,7 +6962,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "11018", @@ -6790,7 +7024,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "11019", @@ -6848,7 +7083,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "11020", @@ -6906,7 +7142,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "11021", @@ -6964,7 +7201,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "11099", @@ -7022,7 +7260,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "12001", @@ -7080,7 +7319,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "12003", @@ -7140,7 +7380,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "12009", @@ -7198,7 +7439,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "12017", @@ -7258,7 +7500,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "12018", @@ -7316,7 +7559,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "44005", @@ -7374,7 +7618,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "15005", @@ -7432,7 +7677,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "63002", @@ -7488,7 +7734,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "63003", @@ -7544,7 +7791,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "63004", @@ -7600,7 +7848,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "64003", @@ -7656,7 +7905,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "74002", @@ -7712,7 +7962,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "74003", @@ -7768,7 +8019,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "74004", @@ -7824,7 +8076,8 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 }, { "hid": "83002", @@ -7880,7 +8133,8 @@ "11014", "11015", "11016" - ] + ], + "angle": 0 }, { "hid": "83006", @@ -7936,7 +8190,8 @@ "11034", "11035", "11036" - ] + ], + "angle": 0 }, { "hid": "84002", @@ -7992,7 +8247,8 @@ "11054", "11055", "11056" - ] + ], + "angle": 0 }, { "hid": "94002", @@ -8048,7 +8304,8 @@ "10014", "10015", "10016" - ] + ], + "angle": 0 }, { "hid": "94005", @@ -8106,7 +8363,8 @@ "10034", "10035", "10036" - ] + ], + "angle": 0 }, { "hid": "64007", @@ -8164,6 +8422,7 @@ "10054", "10055", "10056" - ] + ], + "angle": 0 } ] \ No newline at end of file diff --git a/bin/json/game_libraryfetter.json b/bin/json/game_libraryfetter.json index 02e162492..7536307f9 100644 --- a/bin/json/game_libraryfetter.json +++ b/bin/json/game_libraryfetter.json @@ -6,8 +6,8 @@ "name": "师徒二人", "lv": 1, "hid": [ - 25001, - 35001 + "25001", + "35001" ], "favorlv": 1, "prize": [] @@ -19,8 +19,8 @@ "name": "师徒二人", "lv": 2, "hid": [ - 25001, - 35001 + "25001", + "35001" ], "favorlv": 2, "prize": [ @@ -43,8 +43,8 @@ "name": "师徒二人", "lv": 3, "hid": [ - 25001, - 35001 + "25001", + "35001" ], "favorlv": 3, "prize": [ @@ -67,9 +67,9 @@ "name": "毫不相干", "lv": 1, "hid": [ - 11003, - 11009, - 15004 + "11003", + "11009", + "15004" ], "favorlv": 1, "prize": [] @@ -81,9 +81,9 @@ "name": "毫不相干", "lv": 2, "hid": [ - 11003, - 11009, - 15004 + "11003", + "11009", + "15004" ], "favorlv": 2, "prize": [ @@ -106,9 +106,9 @@ "name": "毫不相干", "lv": 3, "hid": [ - 11003, - 11009, - 15004 + "11003", + "11009", + "15004" ], "favorlv": 3, "prize": [ diff --git a/bin/json/game_libraryhero.json b/bin/json/game_libraryhero.json index 3566d7d33..0f9344c8a 100644 --- a/bin/json/game_libraryhero.json +++ b/bin/json/game_libraryhero.json @@ -1,15 +1,15 @@ [ { - "hid": 15004, + "hid": "15004", "name": { "key": "hero_15004", "text": "小欧" }, "star": 5, "history": [ - 150041, - 150042, - 150043 + "150041", + "150042", + "150043" ], "favorlv": [ 1, @@ -32,16 +32,16 @@ ] }, { - "hid": 25001, + "hid": "25001", "name": { "key": "hero_25001", "text": "阿宝" }, "star": 5, "history": [ - 250011, - 250012, - 250013 + "250011", + "250012", + "250013" ], "favorlv": [ 1, @@ -64,16 +64,16 @@ ] }, { - "hid": 35001, + "hid": "35001", "name": { "key": "hero_35001", "text": "师父" }, "star": 4, "history": [ - 350011, - 350012, - 350013 + "350011", + "350012", + "350013" ], "favorlv": [ 1, @@ -96,16 +96,16 @@ ] }, { - "hid": 11009, + "hid": "11009", "name": { "key": "hero_35002", "text": "希卡普" }, "star": 4, "history": [ - 110091, - 110092, - 110093 + "110091", + "110092", + "110093" ], "favorlv": [ 1, diff --git a/bin/json/game_libraryhistory.json b/bin/json/game_libraryhistory.json index 260032c4a..0b666efc7 100644 --- a/bin/json/game_libraryhistory.json +++ b/bin/json/game_libraryhistory.json @@ -1,6 +1,6 @@ [ { - "histroy": 150041, + "histroy": "150041", "txt": "小欧是个很乖巧的姑娘", "prize": [ { @@ -11,7 +11,7 @@ ] }, { - "histroy": 150042, + "histroy": "150042", "txt": "小欧是个很潇洒的姑娘", "prize": [ { @@ -22,7 +22,7 @@ ] }, { - "histroy": 150043, + "histroy": "150043", "txt": "小欧是个深情的姑娘", "prize": [ { @@ -33,7 +33,7 @@ ] }, { - "histroy": 250011, + "histroy": "250011", "txt": "阿宝长得贼胖", "prize": [ { @@ -44,7 +44,7 @@ ] }, { - "histroy": 250012, + "histroy": "250012", "txt": "阿宝长得贼圆", "prize": [ { @@ -55,7 +55,7 @@ ] }, { - "histroy": 250013, + "histroy": "250013", "txt": "阿宝长得贼可爱", "prize": [ { @@ -66,7 +66,7 @@ ] }, { - "histroy": 350011, + "histroy": "350011", "txt": "师父武功高强", "prize": [ { @@ -77,7 +77,7 @@ ] }, { - "histroy": 350012, + "histroy": "350012", "txt": "师父很傲娇", "prize": [ { @@ -88,7 +88,7 @@ ] }, { - "histroy": 350013, + "histroy": "350013", "txt": "师父的武功来自于乌龟大师", "prize": [ { @@ -99,7 +99,7 @@ ] }, { - "histroy": 110091, + "histroy": "110091", "txt": "希卡普很勇敢", "prize": [ { @@ -110,7 +110,7 @@ ] }, { - "histroy": 110092, + "histroy": "110092", "txt": "希卡普很善良", "prize": [ { @@ -121,7 +121,7 @@ ] }, { - "histroy": 110093, + "histroy": "110093", "txt": "希卡普很帅气", "prize": [ { diff --git a/bin/json/game_stroy.json b/bin/json/game_stroy.json index fd98ebde2..42b4f1351 100644 --- a/bin/json/game_stroy.json +++ b/bin/json/game_stroy.json @@ -21,17 +21,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": -0.25, + "y": 0.25, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -62,17 +77,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -103,17 +133,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -144,17 +189,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -185,17 +245,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -226,17 +301,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -267,17 +357,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -308,17 +413,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -349,17 +469,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -390,17 +525,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -431,17 +581,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -472,17 +637,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -513,17 +693,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -554,17 +749,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -595,17 +805,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -636,17 +861,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -677,17 +917,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -718,17 +973,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -759,17 +1029,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -800,17 +1085,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -841,17 +1141,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -882,17 +1197,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -923,17 +1253,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -964,17 +1309,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1005,17 +1365,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1046,17 +1421,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1087,17 +1477,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1128,17 +1533,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1169,17 +1589,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1210,17 +1645,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1251,17 +1701,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1292,17 +1757,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1333,17 +1813,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1374,17 +1869,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1415,17 +1925,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1456,17 +1981,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1497,17 +2037,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1538,17 +2093,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1579,17 +2149,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1620,17 +2205,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1661,17 +2261,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1702,17 +2317,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1743,17 +2373,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1784,17 +2429,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1825,17 +2485,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1866,17 +2541,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1907,17 +2597,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1948,17 +2653,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -1989,17 +2709,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2030,17 +2765,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2071,17 +2821,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2112,17 +2877,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2153,17 +2933,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2194,17 +2989,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2235,17 +3045,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2276,17 +3101,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2317,17 +3157,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2358,17 +3213,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2399,17 +3269,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2440,17 +3325,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2481,17 +3381,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2522,17 +3437,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2563,17 +3493,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2604,17 +3549,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2645,17 +3605,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2686,17 +3661,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2727,17 +3717,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2768,17 +3773,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2809,17 +3829,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2850,17 +3885,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2891,17 +3941,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2932,17 +3997,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -2973,17 +4053,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -3014,17 +4109,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -3055,17 +4165,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 @@ -3096,17 +4221,32 @@ "move": "", "action": "", "sound": "", - "position": { + "positionR": { "x": 0, "y": 0, "z": 0 }, - "revolve": { + "positionL": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": 0, + "z": 0 + }, + "revolveL": { "x": 0, "y": -180, "z": 0 }, - "size": { + "sizeR": { + "x": 0, + "y": 0, + "z": 0 + }, + "sizeL": { "x": 0.8, "y": 0.8, "z": 0.8 diff --git a/modules/hero/module.go b/modules/hero/module.go index c73f2d256..c736a18f7 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -63,11 +63,11 @@ func (this *Hero) CreateRepeatHero(session comm.IUserSession, heroCfgId string, initUpdate := map[string]interface{}{} sz := result.GetTujian() if len(sz) == 0 { - sz = make(map[string]bool, 0) + sz = make(map[string]int32, 0) } if _, ok := result.GetTujian()[heroCfgId]; !ok { - sz[heroCfgId] = true + sz[heroCfgId] = 0 initUpdate["tujian"] = sz } @@ -253,11 +253,11 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string] initUpdate := map[string]interface{}{} sz := result.GetTujian() if len(sz) == 0 { - sz = make(map[string]bool, 0) + sz = make(map[string]int32, 0) } for k := range heros { if _, ok := result.GetTujian()[k]; !ok { - sz[k] = true + sz[k] = 0 initUpdate["tujian"] = sz } } diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go new file mode 100644 index 000000000..b22c68617 --- /dev/null +++ b/modules/library/api_getstoryreward.go @@ -0,0 +1,48 @@ +package library + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +//参数校验 +func (this *apiComp) GetStoryRewardCheck(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode) { + if req.Hid == "" || req.StoryId == 0 { + code = pb.ErrorCode_ReqParameterError + } + return +} + +func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode, data proto.Message) { + + code = this.GetStoryRewardCheck(session, req) + if code != pb.ErrorCode_Success { + return // 参数校验失败直接返回 + } + expand, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return + } + + conf := this.module.configure.GetLibraryHero(req.Hid) + for k, v := range expand.Tujian { + if k == req.Hid && conf.Rightend == v { + code = this.module.DispenseRes(session, conf.Stroyprize, true) + // 修改storyID + + sz := make(map[string]interface{}, 0) + for k, v := range expand.Tujian { + sz[k] = v + } + sz[req.Hid] = conf.Rightend + + this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), sz) + + break + } + } + return +} diff --git a/modules/library/comp_configure.go b/modules/library/comp_configure.go index 0087b1894..59bfbd778 100644 --- a/modules/library/comp_configure.go +++ b/modules/library/comp_configure.go @@ -43,7 +43,7 @@ func (this *configureComp) GetConfigure(name string) (v interface{}, err error) return configure.GetConfigure(name) } -func (this *configureComp) GetLibraryHero(hid int32) (data *cfg.GameLibraryHeroData) { +func (this *configureComp) GetLibraryHero(hid string) (data *cfg.GameLibraryHeroData) { if v, err := this.GetConfigure(game_libraryhero); err == nil { if configure, ok := v.(*cfg.GameLibraryHero); ok { data = configure.Get(hid) diff --git a/pb/library_db.pb.go b/pb/library_db.pb.go index daa9ccfea..93dd5c8ac 100644 --- a/pb/library_db.pb.go +++ b/pb/library_db.pb.go @@ -80,9 +80,9 @@ type DBLibrary struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - Fid int32 `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + Fid int32 `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"` // 配置表id 羁绊id Hero map[int32]int32 `protobuf:"bytes,4,rep,name=hero,proto3" json:"hero" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key: hid value: favorlv Prize bool `protobuf:"varint,5,opt,name=prize,proto3" json:"prize"` //是否领奖 Fetterlv int32 `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"` // 当前羁绊等级 diff --git a/pb/library_msg.pb.go b/pb/library_msg.pb.go index 5e3a89027..1a204b93b 100644 --- a/pb/library_msg.pb.go +++ b/pb/library_msg.pb.go @@ -201,6 +201,109 @@ func (x *LibraryGetRewardResp) GetData() *DBLibrary { return nil } +// 领取剧情奖励 +type LibraryGetStoryRewardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hid string `protobuf:"bytes,1,opt,name=hid,proto3" json:"hid"` // 英雄ID + StoryId int32 `protobuf:"varint,2,opt,name=storyId,proto3" json:"storyId"` // 故事剧情id +} + +func (x *LibraryGetStoryRewardReq) Reset() { + *x = LibraryGetStoryRewardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryGetStoryRewardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryGetStoryRewardReq) ProtoMessage() {} + +func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message { + mi := &file_library_library_msg_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use LibraryGetStoryRewardReq.ProtoReflect.Descriptor instead. +func (*LibraryGetStoryRewardReq) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{4} +} + +func (x *LibraryGetStoryRewardReq) GetHid() string { + if x != nil { + return x.Hid + } + return "" +} + +func (x *LibraryGetStoryRewardReq) GetStoryId() int32 { + if x != nil { + return x.StoryId + } + return 0 +} + +type LibraryGetStoryRewardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBLibrary `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *LibraryGetStoryRewardResp) Reset() { + *x = LibraryGetStoryRewardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryGetStoryRewardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryGetStoryRewardResp) ProtoMessage() {} + +func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message { + mi := &file_library_library_msg_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use LibraryGetStoryRewardResp.ProtoReflect.Descriptor instead. +func (*LibraryGetStoryRewardResp) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{5} +} + +func (x *LibraryGetStoryRewardResp) GetData() *DBLibrary { + if x != nil { + return x.Data + } + return nil +} + var File_library_library_msg_proto protoreflect.FileDescriptor var file_library_library_msg_proto_rawDesc = []byte{ @@ -218,8 +321,16 @@ var file_library_library_msg_proto_rawDesc = []byte{ 0x14, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, + 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x68, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x22, 0x3b, 0x0a, + 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, + 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -234,22 +345,25 @@ func file_library_library_msg_proto_rawDescGZIP() []byte { return file_library_library_msg_proto_rawDescData } -var file_library_library_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_library_library_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_library_library_msg_proto_goTypes = []interface{}{ - (*LibraryGetListReq)(nil), // 0: LibraryGetListReq - (*LibraryGetListResp)(nil), // 1: LibraryGetListResp - (*LibraryGetRewardReq)(nil), // 2: LibraryGetRewardReq - (*LibraryGetRewardResp)(nil), // 3: LibraryGetRewardResp - (*DBLibrary)(nil), // 4: DBLibrary + (*LibraryGetListReq)(nil), // 0: LibraryGetListReq + (*LibraryGetListResp)(nil), // 1: LibraryGetListResp + (*LibraryGetRewardReq)(nil), // 2: LibraryGetRewardReq + (*LibraryGetRewardResp)(nil), // 3: LibraryGetRewardResp + (*LibraryGetStoryRewardReq)(nil), // 4: LibraryGetStoryRewardReq + (*LibraryGetStoryRewardResp)(nil), // 5: LibraryGetStoryRewardResp + (*DBLibrary)(nil), // 6: DBLibrary } var file_library_library_msg_proto_depIdxs = []int32{ - 4, // 0: LibraryGetListResp.data:type_name -> DBLibrary - 4, // 1: LibraryGetRewardResp.data:type_name -> DBLibrary - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 6, // 0: LibraryGetListResp.data:type_name -> DBLibrary + 6, // 1: LibraryGetRewardResp.data:type_name -> DBLibrary + 6, // 2: LibraryGetStoryRewardResp.data:type_name -> DBLibrary + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_library_library_msg_proto_init() } @@ -307,6 +421,30 @@ func file_library_library_msg_proto_init() { return nil } } + file_library_library_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryGetStoryRewardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_library_library_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryGetStoryRewardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -314,7 +452,7 @@ func file_library_library_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_library_library_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 6, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index 4d8aaef5a..f9b5a5ae9 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -377,7 +377,7 @@ type DBUserExpand struct { InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数 Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道 ModifynameCount int32 `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"` //修改昵称次数 - Tujian map[string]bool `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴 + Tujian map[string]int32 `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴 CurFigure int32 `protobuf:"varint,9,opt,name=curFigure,proto3" json:"curFigure"` //当前形象 Preinstall map[int32]*Figure `protobuf:"bytes,10,rep,name=preinstall,proto3" json:"preinstall" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //形象预设 Activeday int32 `protobuf:"varint,11,opt,name=activeday,proto3" json:"activeday"` //日活跃度 @@ -474,7 +474,7 @@ func (x *DBUserExpand) GetModifynameCount() int32 { return 0 } -func (x *DBUserExpand) GetTujian() map[string]bool { +func (x *DBUserExpand) GetTujian() map[string]int32 { if x != nil { return x.Tujian } @@ -655,7 +655,7 @@ var file_userexpand_proto_rawDesc = []byte{ 0x61, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x0f, + 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, diff --git a/sys/configure/structs/Game.LibraryFetterData.go b/sys/configure/structs/Game.LibraryFetterData.go index 136d97a2b..74eb3cd3e 100644 --- a/sys/configure/structs/Game.LibraryFetterData.go +++ b/sys/configure/structs/Game.LibraryFetterData.go @@ -16,7 +16,7 @@ type GameLibraryFetterData struct { Ftype int32 Name string Lv int32 - Hid []int32 + Hid []string Favorlv int32 Prize []*Gameatn } @@ -38,11 +38,11 @@ func (_v *GameLibraryFetterData)Deserialize(_buf map[string]interface{}) (err er var _ok_ bool if _arr_, _ok_ = _buf["hid"].([]interface{}); !_ok_ { err = errors.New("hid error"); return } - _v.Hid = make([]int32, 0, len(_arr_)) + _v.Hid = make([]string, 0, len(_arr_)) for _, _e_ := range _arr_ { - var _list_v_ int32 - { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } _v.Hid = append(_v.Hid, _list_v_) } } diff --git a/sys/configure/structs/Game.LibraryHero.go b/sys/configure/structs/Game.LibraryHero.go index c79719917..74b90f88f 100644 --- a/sys/configure/structs/Game.LibraryHero.go +++ b/sys/configure/structs/Game.LibraryHero.go @@ -9,13 +9,13 @@ package cfg type GameLibraryHero struct { - _dataMap map[int32]*GameLibraryHeroData + _dataMap map[string]*GameLibraryHeroData _dataList []*GameLibraryHeroData } func NewGameLibraryHero(_buf []map[string]interface{}) (*GameLibraryHero, error) { _dataList := make([]*GameLibraryHeroData, 0, len(_buf)) - dataMap := make(map[int32]*GameLibraryHeroData) + dataMap := make(map[string]*GameLibraryHeroData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameLibraryHeroData(_ele_); err2 != nil { return nil, err2 @@ -27,7 +27,7 @@ func NewGameLibraryHero(_buf []map[string]interface{}) (*GameLibraryHero, error) return &GameLibraryHero{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameLibraryHero) GetDataMap() map[int32]*GameLibraryHeroData { +func (table *GameLibraryHero) GetDataMap() map[string]*GameLibraryHeroData { return table._dataMap } @@ -35,7 +35,7 @@ func (table *GameLibraryHero) GetDataList() []*GameLibraryHeroData { return table._dataList } -func (table *GameLibraryHero) Get(key int32) *GameLibraryHeroData { +func (table *GameLibraryHero) Get(key string) *GameLibraryHeroData { return table._dataMap[key] } diff --git a/sys/configure/structs/Game.LibraryHeroData.go b/sys/configure/structs/Game.LibraryHeroData.go index d5bde3571..9424b99b0 100644 --- a/sys/configure/structs/Game.LibraryHeroData.go +++ b/sys/configure/structs/Game.LibraryHeroData.go @@ -11,10 +11,10 @@ package cfg import "errors" type GameLibraryHeroData struct { - Hid int32 + Hid string Name string Star int32 - History []int32 + History []string Favorlv []int32 Startid int32 Rightend int32 @@ -31,7 +31,7 @@ func (*GameLibraryHeroData) GetTypeId() int32 { } func (_v *GameLibraryHeroData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hid"].(float64); !_ok_ { err = errors.New("hid error"); return }; _v.Hid = int32(_tempNum_) } + { 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_) } { @@ -39,11 +39,11 @@ func (_v *GameLibraryHeroData)Deserialize(_buf map[string]interface{}) (err erro var _ok_ bool if _arr_, _ok_ = _buf["history"].([]interface{}); !_ok_ { err = errors.New("history error"); return } - _v.History = make([]int32, 0, len(_arr_)) + _v.History = make([]string, 0, len(_arr_)) for _, _e_ := range _arr_ { - var _list_v_ int32 - { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } _v.History = append(_v.History, _list_v_) } } diff --git a/sys/configure/structs/Game.LibraryHistory.go b/sys/configure/structs/Game.LibraryHistory.go index 9cef209ed..b006ada2e 100644 --- a/sys/configure/structs/Game.LibraryHistory.go +++ b/sys/configure/structs/Game.LibraryHistory.go @@ -9,13 +9,13 @@ package cfg type GameLibraryHistory struct { - _dataMap map[int32]*GameLibraryHistoryData + _dataMap map[string]*GameLibraryHistoryData _dataList []*GameLibraryHistoryData } func NewGameLibraryHistory(_buf []map[string]interface{}) (*GameLibraryHistory, error) { _dataList := make([]*GameLibraryHistoryData, 0, len(_buf)) - dataMap := make(map[int32]*GameLibraryHistoryData) + dataMap := make(map[string]*GameLibraryHistoryData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameLibraryHistoryData(_ele_); err2 != nil { return nil, err2 @@ -27,7 +27,7 @@ func NewGameLibraryHistory(_buf []map[string]interface{}) (*GameLibraryHistory, return &GameLibraryHistory{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameLibraryHistory) GetDataMap() map[int32]*GameLibraryHistoryData { +func (table *GameLibraryHistory) GetDataMap() map[string]*GameLibraryHistoryData { return table._dataMap } @@ -35,7 +35,7 @@ func (table *GameLibraryHistory) GetDataList() []*GameLibraryHistoryData { return table._dataList } -func (table *GameLibraryHistory) Get(key int32) *GameLibraryHistoryData { +func (table *GameLibraryHistory) Get(key string) *GameLibraryHistoryData { return table._dataMap[key] } diff --git a/sys/configure/structs/Game.LibraryHistoryData.go b/sys/configure/structs/Game.LibraryHistoryData.go index 5953d5448..8bd33b15a 100644 --- a/sys/configure/structs/Game.LibraryHistoryData.go +++ b/sys/configure/structs/Game.LibraryHistoryData.go @@ -11,7 +11,7 @@ package cfg import "errors" type GameLibraryHistoryData struct { - Histroy int32 + Histroy string Txt string Prize []*Gameatn } @@ -23,7 +23,7 @@ func (*GameLibraryHistoryData) GetTypeId() int32 { } func (_v *GameLibraryHistoryData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["histroy"].(float64); !_ok_ { err = errors.New("histroy error"); return }; _v.Histroy = int32(_tempNum_) } + { var _ok_ bool; if _v.Histroy, _ok_ = _buf["histroy"].(string); !_ok_ { err = errors.New("histroy error"); return } } { var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.StroyData.go b/sys/configure/structs/Game.StroyData.go index 23f5c2278..db3a60a5b 100644 --- a/sys/configure/structs/Game.StroyData.go +++ b/sys/configure/structs/Game.StroyData.go @@ -33,9 +33,12 @@ type GameStroyData struct { Move string Action string Sound string - Position serialization.Vector3 - Revolve serialization.Vector3 - Size serialization.Vector3 + PositionR serialization.Vector3 + PositionL serialization.Vector3 + RevolveR serialization.Vector3 + RevolveL serialization.Vector3 + SizeR serialization.Vector3 + SizeL serialization.Vector3 Perf string Cg string Skip bool @@ -82,28 +85,52 @@ func (_v *GameStroyData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Move, _ok_ = _buf["move"].(string); !_ok_ { err = errors.New("move error"); return } } { var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } } { var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } } - { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["position"].(map[string]interface{}); !_ok_ { err = errors.New("position error"); return } + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["positionR"].(map[string]interface{}); !_ok_ { err = errors.New("positionR error"); return } var _x_, _y_, _z_ float32; { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) } - _v.Position = serialization.NewVector3(_x_, _y_, _z_) + _v.PositionR = serialization.NewVector3(_x_, _y_, _z_) } - { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["revolve"].(map[string]interface{}); !_ok_ { err = errors.New("revolve error"); return } + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["positionL"].(map[string]interface{}); !_ok_ { err = errors.New("positionL error"); return } var _x_, _y_, _z_ float32; { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) } - _v.Revolve = serialization.NewVector3(_x_, _y_, _z_) + _v.PositionL = serialization.NewVector3(_x_, _y_, _z_) } - { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["size"].(map[string]interface{}); !_ok_ { err = errors.New("size error"); return } + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["revolveR"].(map[string]interface{}); !_ok_ { err = errors.New("revolveR error"); return } var _x_, _y_, _z_ float32; { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) } - _v.Size = serialization.NewVector3(_x_, _y_, _z_) + _v.RevolveR = serialization.NewVector3(_x_, _y_, _z_) + } + + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["revolveL"].(map[string]interface{}); !_ok_ { err = errors.New("revolveL error"); return } + var _x_, _y_, _z_ float32; + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) } + _v.RevolveL = serialization.NewVector3(_x_, _y_, _z_) + } + + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["sizeR"].(map[string]interface{}); !_ok_ { err = errors.New("sizeR error"); return } + var _x_, _y_, _z_ float32; + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) } + _v.SizeR = serialization.NewVector3(_x_, _y_, _z_) + } + + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["sizeL"].(map[string]interface{}); !_ok_ { err = errors.New("sizeL error"); return } + var _x_, _y_, _z_ float32; + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) } + _v.SizeL = serialization.NewVector3(_x_, _y_, _z_) } { var _ok_ bool; if _v.Perf, _ok_ = _buf["perf"].(string); !_ok_ { err = errors.New("perf error"); return } } diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go index bfb507e8e..4f6548f68 100644 --- a/sys/configure/structs/game.heroData.go +++ b/sys/configure/structs/game.heroData.go @@ -40,6 +40,7 @@ type GameHeroData struct { Enteranivalue int32 Camerainterval float32 Equiprcom []string + Angle int32 } const TypeId_GameHeroData = 1513828672 @@ -123,6 +124,7 @@ 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_) } return }