diff --git a/bin/json/game_global.json b/bin/json/game_global.json index ea4f50cec..30c4b279d 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -2,11 +2,6 @@ { "max_char": 100, "task_reset": 8, - "init_gold": 100000, - "init_hero": [ - 15001, - 25001 - ], "cameramin": [ 0, 0, @@ -146,6 +141,8 @@ "dreamland_fightnum": 30, "dreamland_resettime": 0, "dreamland_limit": 3600, - "dreamland_pro": 100 + "dreamland_pro": 100, + "hunting_num": 10, + "hunting_reset": 1 } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 3f0208d5a..3418fdc1e 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -934,7 +934,7 @@ "race": 2, "job": 4, "type": 1, - "handbook": -1, + "handbook": 1, "prefab": "24003", "rotation": "0|0|0", "icon": "24003", @@ -954,10 +954,10 @@ "y": 0, "z": 0 }, - "skill": 125004011, - "skill1": 125004111, - "skill2": 125004211, - "skill3": 125004311, + "skill": 124003011, + "skill1": 124003111, + "skill2": 124003211, + "skill3": 124003311, "txt": { "key": "hero_55032", "text": "" @@ -1858,7 +1858,7 @@ "race": 3, "job": 4, "type": 1, - "handbook": -1, + "handbook": 1, "prefab": "34006", "rotation": "0|0|0", "icon": "34006", @@ -1973,6 +1973,48 @@ "enteranivalue": 0, "camerainterval": 0 }, + { + "hid": "35001", + "name": { + "key": "hero_35001", + "text": "师父" + }, + "star": 4, + "color": 3, + "race": 2, + "job": 2, + "type": 1, + "handbook": -1, + "prefab": "35001", + "rotation": "0|0|0", + "icon": "35001", + "vocal": "35001", + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "hero_35001", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": 135001011, + "skill1": 135001111, + "skill2": 135001211, + "skill3": 135001311, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, { "hid": "35002", "name": { @@ -1984,7 +2026,7 @@ "race": 3, "job": 4, "type": 1, - "handbook": -1, + "handbook": 1, "prefab": "35002", "rotation": "0|0|0", "icon": "35002", @@ -2004,10 +2046,10 @@ "y": 0, "z": 0 }, - "skill": 125004011, - "skill1": 125004111, - "skill2": 125004211, - "skill3": 125004311, + "skill": 135002011, + "skill1": 135002111, + "skill2": 135002211, + "skill3": 135002311, "txt": { "key": "hero_55058", "text": "" @@ -5344,48 +5386,6 @@ "enteranivalue": 0, "camerainterval": 0.6 }, - { - "hid": "35001", - "name": { - "key": "hero_35001", - "text": "师父" - }, - "star": 4, - "color": 4, - "race": 4, - "job": 3, - "type": 1, - "handbook": -1, - "prefab": "35001", - "rotation": "0|0|0", - "icon": "35001", - "vocal": "35001", - "tujing": [ - 1 - ], - "intr": { - "key": "", - "text": "" - }, - "events": "Hero_35001", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 125004011, - "skill1": 125004111, - "skill2": 125004211, - "skill3": 125004311, - "txt": { - "key": "", - "text": "" - }, - "enteranivalue": 0, - "camerainterval": 0.6 - }, { "hid": "63001", "name": { @@ -5397,7 +5397,7 @@ "race": 1, "job": 2, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "63001", "rotation": "", "icon": "63001", @@ -5437,7 +5437,7 @@ "race": 1, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "63002", "rotation": "", "icon": "63002", @@ -5477,7 +5477,7 @@ "race": 1, "job": 2, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "63003", "rotation": "", "icon": "63003", @@ -5517,7 +5517,7 @@ "race": 1, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "63004", "rotation": "", "icon": "63004", @@ -5557,7 +5557,7 @@ "race": 1, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "63005", "rotation": "", "icon": "63005", @@ -5597,7 +5597,7 @@ "race": 1, "job": 2, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "64001", "rotation": "", "icon": "64001", @@ -5637,7 +5637,7 @@ "race": 1, "job": 2, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "64002", "rotation": "", "icon": "64002", @@ -5677,7 +5677,7 @@ "race": 1, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "64003", "rotation": "", "icon": "64003", @@ -5717,7 +5717,7 @@ "race": 1, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "64004", "rotation": "", "icon": "64004", @@ -5757,7 +5757,7 @@ "race": 1, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "64005", "rotation": "", "icon": "64005", @@ -5797,7 +5797,7 @@ "race": 1, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "64006", "rotation": "", "icon": "64006", @@ -5837,7 +5837,7 @@ "race": 1, "job": 2, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "64007", "rotation": "", "icon": "64007", @@ -5877,7 +5877,7 @@ "race": 1, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "65001", "rotation": "", "icon": "65001", @@ -5917,7 +5917,7 @@ "race": 1, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "65002", "rotation": "", "icon": "65002", @@ -5957,7 +5957,7 @@ "race": 1, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "65003", "rotation": "", "icon": "65003", @@ -5997,7 +5997,7 @@ "race": 1, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "65004", "rotation": "", "icon": "65004", @@ -6037,7 +6037,7 @@ "race": 2, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "73001", "rotation": "", "icon": "73001", @@ -6077,7 +6077,7 @@ "race": 2, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "73002", "rotation": "", "icon": "73002", @@ -6117,7 +6117,7 @@ "race": 2, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "73003", "rotation": "", "icon": "73003", @@ -6157,7 +6157,7 @@ "race": 2, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "73004", "rotation": "", "icon": "73004", @@ -6197,7 +6197,7 @@ "race": 2, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "74001", "rotation": "", "icon": "74001", @@ -6237,7 +6237,7 @@ "race": 2, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "74002", "rotation": "", "icon": "74002", @@ -6277,7 +6277,7 @@ "race": 2, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "74003", "rotation": "", "icon": "74003", @@ -6317,7 +6317,7 @@ "race": 2, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "74004", "rotation": "", "icon": "74004", @@ -6357,7 +6357,7 @@ "race": 2, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "74005", "rotation": "", "icon": "74005", @@ -6397,7 +6397,7 @@ "race": 2, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "74006", "rotation": "", "icon": "74006", @@ -6437,7 +6437,7 @@ "race": 2, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "74007", "rotation": "", "icon": "74007", @@ -6477,7 +6477,7 @@ "race": 2, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "74008", "rotation": "", "icon": "74008", @@ -6517,7 +6517,7 @@ "race": 2, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "74009", "rotation": "", "icon": "74009", @@ -6557,7 +6557,7 @@ "race": 2, "job": 2, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "75001", "rotation": "", "icon": "75001", @@ -6597,7 +6597,7 @@ "race": 2, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "75002", "rotation": "", "icon": "75002", @@ -6637,7 +6637,7 @@ "race": 2, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "75003", "rotation": "", "icon": "75003", @@ -6677,7 +6677,7 @@ "race": 2, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "75004", "rotation": "", "icon": "75004", @@ -6717,7 +6717,7 @@ "race": 3, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "83001", "rotation": "", "icon": "83001", @@ -6757,7 +6757,7 @@ "race": 3, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "83002", "rotation": "", "icon": "83002", @@ -6797,7 +6797,7 @@ "race": 3, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "83003", "rotation": "", "icon": "83003", @@ -6837,7 +6837,7 @@ "race": 3, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "83004", "rotation": "", "icon": "83004", @@ -6877,7 +6877,7 @@ "race": 3, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "83005", "rotation": "", "icon": "83005", @@ -6917,7 +6917,7 @@ "race": 3, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "83006", "rotation": "", "icon": "83006", @@ -6957,7 +6957,7 @@ "race": 3, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "84001", "rotation": "", "icon": "84001", @@ -6997,7 +6997,7 @@ "race": 3, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "84002", "rotation": "", "icon": "84002", @@ -7037,7 +7037,7 @@ "race": 3, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "84003", "rotation": "", "icon": "84003", @@ -7077,7 +7077,7 @@ "race": 3, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "84004", "rotation": "", "icon": "84004", @@ -7117,7 +7117,7 @@ "race": 3, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "84005", "rotation": "", "icon": "84005", @@ -7157,7 +7157,7 @@ "race": 3, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "84006", "rotation": "", "icon": "84006", @@ -7197,7 +7197,7 @@ "race": 3, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "84007", "rotation": "", "icon": "84007", @@ -7237,7 +7237,7 @@ "race": 3, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "84008", "rotation": "", "icon": "84008", @@ -7277,7 +7277,7 @@ "race": 3, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "85002", "rotation": "", "icon": "85002", @@ -7317,7 +7317,7 @@ "race": 3, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "85003", "rotation": "", "icon": "85003", @@ -7357,7 +7357,7 @@ "race": 3, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "85004", "rotation": "", "icon": "85004", @@ -7397,7 +7397,7 @@ "race": 3, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "85005", "rotation": "", "icon": "85005", @@ -7437,7 +7437,7 @@ "race": 3, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "85006", "rotation": "", "icon": "85006", @@ -7477,7 +7477,7 @@ "race": 4, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "93001", "rotation": "", "icon": "93001", @@ -7517,7 +7517,7 @@ "race": 4, "job": 4, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "93002", "rotation": "", "icon": "93002", @@ -7557,7 +7557,7 @@ "race": 4, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "93003", "rotation": "", "icon": "93003", @@ -7597,7 +7597,7 @@ "race": 4, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "93004", "rotation": "", "icon": "93004", @@ -7637,7 +7637,7 @@ "race": 4, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "93005", "rotation": "", "icon": "93005", @@ -7677,7 +7677,7 @@ "race": 4, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "93006", "rotation": "", "icon": "93006", @@ -7717,7 +7717,7 @@ "race": 4, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "93007", "rotation": "", "icon": "93007", @@ -7757,7 +7757,7 @@ "race": 4, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "94001", "rotation": "", "icon": "94001", @@ -7797,7 +7797,7 @@ "race": 4, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "94002", "rotation": "", "icon": "94002", @@ -7837,7 +7837,7 @@ "race": 4, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "94003", "rotation": "", "icon": "94003", @@ -7877,7 +7877,7 @@ "race": 4, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "94004", "rotation": "", "icon": "94004", @@ -7917,7 +7917,7 @@ "race": 4, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "94006", "rotation": "", "icon": "94006", @@ -7957,7 +7957,7 @@ "race": 4, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "95001", "rotation": "", "icon": "95001", @@ -7997,7 +7997,7 @@ "race": 4, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "95002", "rotation": "", "icon": "95002", @@ -8037,7 +8037,7 @@ "race": 4, "job": 3, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "95003", "rotation": "", "icon": "95003", @@ -8077,7 +8077,7 @@ "race": 4, "job": 1, "type": 1, - "handbook": 0, + "handbook": -1, "prefab": "95004", "rotation": "", "icon": "95004", diff --git a/bin/json/game_herostargrow.json b/bin/json/game_herostargrow.json index 09f5228c0..f44bdce65 100644 --- a/bin/json/game_herostargrow.json +++ b/bin/json/game_herostargrow.json @@ -1,8 +1,6 @@ [ { "star": 1, - "level": 1, - "maxlevel": 10, "starup_hp": 0, "starup_atk": 0, "starup_def": 0, @@ -10,8 +8,6 @@ }, { "star": 2, - "level": 10, - "maxlevel": 20, "starup_hp": 9.5, "starup_atk": 9.5, "starup_def": 9.5, @@ -19,8 +15,6 @@ }, { "star": 3, - "level": 20, - "maxlevel": 30, "starup_hp": 19, "starup_atk": 19, "starup_def": 19, @@ -28,8 +22,6 @@ }, { "star": 4, - "level": 30, - "maxlevel": 40, "starup_hp": 28.5, "starup_atk": 28.5, "starup_def": 28.5, @@ -37,8 +29,6 @@ }, { "star": 5, - "level": 40, - "maxlevel": 50, "starup_hp": 38, "starup_atk": 38, "starup_def": 38, @@ -46,8 +36,6 @@ }, { "star": 6, - "level": 50, - "maxlevel": 60, "starup_hp": 47.5, "starup_atk": 47.5, "starup_def": 47.5, diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index eda1f4599..dee84897a 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -4,8 +4,8 @@ "var": [ { "a": "hero", - "t": "11001", - "n": 1 + "t": "25001", + "n": 5 } ] }, @@ -24,8 +24,8 @@ "var": [ { "a": "hero", - "t": "11003", - "n": 2 + "t": "25004", + "n": 5 } ] }, @@ -154,8 +154,8 @@ "var": [ { "a": "hero", - "t": "11009", - "n": 1 + "t": "42911", + "n": 100 } ] }, @@ -164,8 +164,8 @@ "var": [ { "a": "hero", - "t": "11009", - "n": 1 + "t": "43911", + "n": 100 } ] }, @@ -174,8 +174,8 @@ "var": [ { "a": "hero", - "t": "11009", - "n": 1 + "t": "44911", + "n": 100 } ] }, @@ -458,5 +458,85 @@ "n": 999 } ] + }, + { + "index": "50", + "var": [ + { + "a": "hero", + "t": "43921", + "n": 50 + } + ] + }, + { + "index": "51", + "var": [ + { + "a": "hero", + "t": "44921", + "n": 50 + } + ] + }, + { + "index": "52", + "var": [ + { + "a": "hero", + "t": "45921", + "n": 50 + } + ] + }, + { + "index": "53", + "var": [ + { + "a": "hero", + "t": "11001", + "n": 1 + } + ] + }, + { + "index": "54", + "var": [ + { + "a": "hero", + "t": "11003", + "n": 2 + } + ] + }, + { + "index": "55", + "var": [ + { + "a": "hero", + "t": "11009", + "n": 1 + } + ] + }, + { + "index": "56", + "var": [ + { + "a": "hero", + "t": "11009", + "n": 1 + } + ] + }, + { + "index": "57", + "var": [ + { + "a": "hero", + "t": "11009", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 25f8bf129..e7d774284 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -14,8 +14,8 @@ "effects": "effects1", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": -1, "uselv": 0, "isani": 1, @@ -51,8 +51,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -88,8 +88,8 @@ "effects": "", "box_id": 10002, "synthetize_num": 50, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": -1, "uselv": 0, "isani": 0, @@ -125,8 +125,8 @@ "effects": "", "box_id": 20001, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -162,8 +162,8 @@ "effects": "", "box_id": 20002, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -199,8 +199,8 @@ "effects": "", "box_id": 20003, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -236,8 +236,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -273,8 +273,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -310,8 +310,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -347,8 +347,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -384,8 +384,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -421,8 +421,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -458,8 +458,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -495,8 +495,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -532,8 +532,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -569,8 +569,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -606,8 +606,8 @@ "effects": "", "box_id": 10001, "synthetize_num": 50, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": -1, "uselv": 0, "isani": 0, @@ -643,8 +643,8 @@ "effects": "", "box_id": 10002, "synthetize_num": 50, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": -1, "uselv": 0, "isani": 0, @@ -680,8 +680,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "store", + "use_skip": "recruit", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -711,8 +711,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "store", + "use_skip": "recruit", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -742,8 +742,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "store", + "use_skip": "recruit", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -773,8 +773,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "store", + "use_skip": "recruit", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -804,8 +804,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "store", + "use_skip": "recruit", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -835,8 +835,8 @@ "effects": "", "box_id": 50005, "synthetize_num": 5, - "access": 0, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -878,8 +878,8 @@ "effects": "", "box_id": 50006, "synthetize_num": 5, - "access": 0, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -921,8 +921,8 @@ "effects": "", "box_id": 50007, "synthetize_num": 5, - "access": 0, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -964,8 +964,8 @@ "effects": "", "box_id": 50008, "synthetize_num": 5, - "access": 0, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1007,8 +1007,8 @@ "effects": "", "box_id": 50009, "synthetize_num": 5, - "access": 50001, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1050,8 +1050,8 @@ "effects": "", "box_id": 50010, "synthetize_num": 5, - "access": 50002, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1093,8 +1093,8 @@ "effects": "", "box_id": 50011, "synthetize_num": 5, - "access": 50003, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1136,8 +1136,8 @@ "effects": "", "box_id": 50012, "synthetize_num": 5, - "access": 50004, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1179,8 +1179,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 50005, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1216,8 +1216,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 50006, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1253,8 +1253,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 50007, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1290,8 +1290,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 50008, - "use_skip": 0, + "access": "resonancepopup", + "use_skip": "resonancepopup", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1327,8 +1327,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, @@ -1364,8 +1364,8 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": 0, - "use_skip": 0, + "access": "", + "use_skip": "", "upper_limit": 999, "uselv": 0, "isani": 0, diff --git a/bin/json/game_mainlinepurgatory.json b/bin/json/game_mainlinepurgatory.json index 06a9df930..f2c13507f 100644 --- a/bin/json/game_mainlinepurgatory.json +++ b/bin/json/game_mainlinepurgatory.json @@ -73,7 +73,7 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061 + 350021 ], "wave2enemyid": [], "enemyid": "zx_42271", @@ -123,8 +123,8 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051 + 350021, + 240031 ], "wave2enemyid": [], "enemyid": "zx_42271", @@ -177,9 +177,9 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, - 240031 + 350021, + 240031, + 250041 ], "wave2enemyid": [], "enemyid": "zx_42271", @@ -229,17 +229,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42272", "monster_id": "250011", @@ -288,17 +288,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250012, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -350,17 +350,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250013, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -409,17 +409,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250014, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -468,17 +468,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250015, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -530,17 +530,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250016, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42273", "monster_id": "250011", @@ -592,17 +592,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250017, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -651,17 +651,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250018, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -710,17 +710,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250019, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -769,17 +769,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250020, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -831,17 +831,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250021, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42274", "monster_id": "250011", @@ -890,17 +890,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250022, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -949,17 +949,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250023, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1008,17 +1008,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250024, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1067,17 +1067,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250025, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1129,17 +1129,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250026, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42275", "monster_id": "250011", @@ -1188,17 +1188,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250027, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1247,17 +1247,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250028, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1306,17 +1306,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250029, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1365,17 +1365,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250030, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1427,17 +1427,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250031, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42276", "monster_id": "250011", @@ -1486,17 +1486,17 @@ "enemy2defpro": 0, "wave1enemyid": [ 250011, - 340061, - 440051, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250032, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1544,18 +1544,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250012, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250033, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1603,18 +1603,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250013, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250034, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1662,18 +1662,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250014, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250035, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1724,18 +1724,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250015, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250036, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42277", "monster_id": "250011", @@ -1786,18 +1786,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250016, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250037, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1845,18 +1845,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250017, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250038, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1904,18 +1904,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250018, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250039, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -1963,18 +1963,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250019, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250040, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2025,18 +2025,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250020, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250041, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42278", "monster_id": "250011", @@ -2084,18 +2084,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250021, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250042, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2143,18 +2143,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250022, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250043, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2202,18 +2202,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250023, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250044, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2261,18 +2261,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250024, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250045, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2323,18 +2323,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250025, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250046, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42279", "monster_id": "250011", @@ -2382,18 +2382,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250026, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250047, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2441,18 +2441,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250027, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250048, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2500,18 +2500,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250028, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250049, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2559,18 +2559,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250029, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250050, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2621,18 +2621,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250030, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250051, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42280", "monster_id": "250011", @@ -2680,18 +2680,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250031, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250052, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2739,18 +2739,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250032, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250053, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2798,18 +2798,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250033, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250054, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2857,18 +2857,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250034, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250055, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -2919,18 +2919,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250035, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250056, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42281", "monster_id": "250011", @@ -2978,18 +2978,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250036, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250057, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3037,18 +3037,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250037, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250058, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3096,18 +3096,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250038, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250059, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3155,18 +3155,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250039, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250060, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3217,18 +3217,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250040, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250061, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42282", "monster_id": "250011", @@ -3279,18 +3279,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250041, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250062, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3338,18 +3338,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250042, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250063, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3397,18 +3397,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250043, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250064, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3456,18 +3456,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250044, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250065, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3518,18 +3518,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250045, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250066, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42283", "monster_id": "250011", @@ -3577,18 +3577,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250046, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250067, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3636,18 +3636,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250047, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250068, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3695,18 +3695,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250048, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250069, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3754,18 +3754,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250049, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250070, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3816,18 +3816,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250050, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250071, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42284", "monster_id": "250011", @@ -3875,18 +3875,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250051, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250072, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3934,18 +3934,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250052, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250073, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -3993,18 +3993,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250053, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250074, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4052,18 +4052,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250054, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250075, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4114,18 +4114,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250055, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250076, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42285", "monster_id": "250011", @@ -4173,18 +4173,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250056, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250077, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4232,18 +4232,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250057, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250078, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4291,18 +4291,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250058, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250079, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4350,18 +4350,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250059, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250080, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4412,18 +4412,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250060, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250081, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42286", "monster_id": "250011", @@ -4471,18 +4471,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250061, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250082, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4530,18 +4530,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250062, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250083, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4589,18 +4589,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250063, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250084, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4648,18 +4648,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250064, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250085, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4710,18 +4710,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250065, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250086, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42287", "monster_id": "250011", @@ -4769,18 +4769,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250066, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250087, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4828,18 +4828,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250067, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250088, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4887,18 +4887,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250068, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250089, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -4946,18 +4946,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250069, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250090, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5008,18 +5008,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250070, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250091, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42288", "monster_id": "250011", @@ -5070,18 +5070,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250071, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250092, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5129,18 +5129,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250072, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250093, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5188,18 +5188,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250073, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250094, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5247,18 +5247,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250074, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250095, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5309,18 +5309,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250075, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250096, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42289", "monster_id": "250011", @@ -5368,18 +5368,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250076, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250097, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5427,18 +5427,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250077, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250098, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5486,18 +5486,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250078, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250099, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5545,18 +5545,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250079, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250100, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5607,18 +5607,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250080, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250101, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42290", "monster_id": "250011", @@ -5666,18 +5666,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250081, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250102, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5725,18 +5725,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250082, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250103, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5784,18 +5784,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250083, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250104, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5843,18 +5843,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250084, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250105, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -5905,18 +5905,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250085, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250106, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42291", "monster_id": "250011", @@ -5964,18 +5964,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250086, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250107, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6023,18 +6023,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250087, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250108, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6082,18 +6082,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250088, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250109, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6141,18 +6141,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250089, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250110, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6203,18 +6203,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250090, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250111, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42292", "monster_id": "250011", @@ -6262,18 +6262,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250091, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250112, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6321,18 +6321,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250092, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250113, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6380,18 +6380,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250093, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250114, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6439,18 +6439,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250094, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250115, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6501,18 +6501,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250095, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250116, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42293", "monster_id": "250011", @@ -6560,18 +6560,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250096, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250117, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6619,18 +6619,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250097, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250118, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6678,18 +6678,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250098, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250119, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6737,18 +6737,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250099, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250120, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6799,18 +6799,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250100, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250121, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42294", "monster_id": "250011", @@ -6858,18 +6858,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250101, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250122, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "250011", @@ -6917,18 +6917,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250102, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250123, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "", @@ -6976,18 +6976,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250103, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250124, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "", @@ -7035,18 +7035,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250104, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250125, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42271", "monster_id": "", @@ -7097,18 +7097,18 @@ "enemy2atkpro": 0, "enemy2defpro": 0, "wave1enemyid": [ - 250105, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "wave2enemyid": [ - 250126, - 340061, - 440051, + 250011, + 350021, 240031, - 350021 + 250041, + 340061 ], "enemyid": "zx_42295", "monster_id": "", diff --git a/bin/json/game_model.json b/bin/json/game_model.json index ed63e2f1e..410015462 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -8,7 +8,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_13001", - "bust": "zx_42271", + "bust": "bust_13001", "postxyz": [ 0, 0, @@ -29,7 +29,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_13002", - "bust": "zx_42271", + "bust": "bust_13002", "postxyz": [ 0, 0, @@ -50,7 +50,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_13003", - "bust": "zx_42271", + "bust": "bust_13003", "postxyz": [ 0, 0, @@ -71,7 +71,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_13004", - "bust": "zx_42271", + "bust": "bust_13004", "postxyz": [ 0, 0, @@ -92,7 +92,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_13005", - "bust": "zx_42271", + "bust": "bust_13005", "postxyz": [ 0, 0, @@ -113,7 +113,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_14001", - "bust": "zx_42271", + "bust": "bust_14001", "postxyz": [ 0, 0, @@ -134,7 +134,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_14002", - "bust": "zx_42271", + "bust": "bust_14002", "postxyz": [ 0, 0, @@ -155,7 +155,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_14003", - "bust": "zx_42271", + "bust": "bust_14003", "postxyz": [ 0, 0, @@ -176,7 +176,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_14004", - "bust": "zx_42271", + "bust": "bust_14004", "postxyz": [ 0, 0, @@ -197,7 +197,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_14005", - "bust": "zx_42271", + "bust": "bust_14005", "postxyz": [ 0, 0, @@ -218,7 +218,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_14006", - "bust": "zx_42271", + "bust": "bust_14006", "postxyz": [ 0, 0, @@ -239,7 +239,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_14007", - "bust": "zx_42271", + "bust": "bust_14007", "postxyz": [ 0, 0, @@ -260,7 +260,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_15001", - "bust": "zx_42271", + "bust": "bust_15001", "postxyz": [ 0, 0, @@ -281,7 +281,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_15002", - "bust": "zx_42271", + "bust": "bust_15002", "postxyz": [ 0, 0, @@ -302,7 +302,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_15003", - "bust": "zx_42271", + "bust": "bust_15003", "postxyz": [ 0, 0, @@ -323,7 +323,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_15004", - "bust": "zx_42271", + "bust": "bust_15004", "postxyz": [ 0, 0, @@ -344,7 +344,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_15005", - "bust": "zx_42271", + "bust": "bust_15005", "postxyz": [ 0, 0, @@ -365,7 +365,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_23001", - "bust": "zx_42271", + "bust": "bust_23001", "postxyz": [ 0, 0, @@ -386,7 +386,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_23002", - "bust": "zx_42271", + "bust": "bust_23002", "postxyz": [ 0, 0, @@ -407,7 +407,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_23003", - "bust": "zx_42271", + "bust": "bust_23003", "postxyz": [ 0, 0, @@ -428,7 +428,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_23004", - "bust": "zx_42271", + "bust": "bust_23004", "postxyz": [ 0, 0, @@ -449,7 +449,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_24001", - "bust": "zx_42271", + "bust": "bust_24001", "postxyz": [ 0, 0, @@ -470,7 +470,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_24002", - "bust": "zx_42271", + "bust": "bust_24002", "postxyz": [ 0, 0, @@ -491,7 +491,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "portrait_24003", - "bust": "zx_42271", + "bust": "bust_24003", "postxyz": [ 0, 0, @@ -512,7 +512,7 @@ "img": "sbkp_js_25001", "heroimg": "hbkp_js_25001", "portrait": "portrait_24004", - "bust": "zx_42271", + "bust": "bust_24004", "postxyz": [ 0, 0, @@ -533,7 +533,7 @@ "img": "sbkp_js_25001", "heroimg": "hbkp_js_25001", "portrait": "portrait_24005", - "bust": "zx_42271", + "bust": "bust_24005", "postxyz": [ 0, 0, @@ -554,7 +554,7 @@ "img": "sbkp_js_25001", "heroimg": "hbkp_js_25001", "portrait": "portrait_24006", - "bust": "zx_42271", + "bust": "bust_24006", "postxyz": [ 0, 0, @@ -575,7 +575,7 @@ "img": "sbkp_js_25001", "heroimg": "hbkp_js_25001", "portrait": "portrait_24007", - "bust": "zx_42271", + "bust": "bust_24007", "postxyz": [ 0, 0, @@ -596,7 +596,7 @@ "img": "sbkp_js_25001", "heroimg": "hbkp_js_25001", "portrait": "portrait_24008", - "bust": "zx_42271", + "bust": "bust_24008", "postxyz": [ 0, 0, @@ -617,7 +617,7 @@ "img": "sbkp_js_25001", "heroimg": "hbkp_js_25001", "portrait": "portrait_24009", - "bust": "zx_42271", + "bust": "bust_24009", "postxyz": [ 0, 0, @@ -631,14 +631,14 @@ }, { "id": "25001", - "preson": "90002", + "preson": "25001", "presonshow": "25001_exhibition", "ico": "tx_js_25001", "fight": "ytx_js_25001", "img": "sbkp_js_25001", "heroimg": "hbkp_js_25001", "portrait": "portrait_25001", - "bust": "zx_42271", + "bust": "bust_25001", "postxyz": [ 0, 0, @@ -659,7 +659,7 @@ "img": "sbkp_js_25004", "heroimg": "hbkp_js_25004", "portrait": "portrait_25002", - "bust": "zx_42271", + "bust": "bust_25002", "postxyz": [ 0, 0, @@ -680,7 +680,7 @@ "img": "sbkp_js_25004", "heroimg": "hbkp_js_25004", "portrait": "portrait_25003", - "bust": "zx_42271", + "bust": "bust_25003", "postxyz": [ 0, 0, @@ -694,14 +694,14 @@ }, { "id": "25004", - "preson": "90003", + "preson": "11003", "presonshow": "25004_exhibition", "ico": "tx_js_25004", "fight": "ytx_js_25004", "img": "sbkp_js_25004", "heroimg": "hbkp_js_25004", "portrait": "portrait_25004", - "bust": "zx_42271", + "bust": "bust_25004", "postxyz": [ 0.08, 0, @@ -722,7 +722,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_33001", - "bust": "zx_42271", + "bust": "bust_33001", "postxyz": [ 0, 0, @@ -743,7 +743,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_33002", - "bust": "zx_42271", + "bust": "bust_33002", "postxyz": [ 0, 0, @@ -764,7 +764,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_33003", - "bust": "zx_42271", + "bust": "bust_33003", "postxyz": [ 0, 0, @@ -785,7 +785,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_33004", - "bust": "zx_42271", + "bust": "bust_33004", "postxyz": [ 0, 0, @@ -806,7 +806,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_33005", - "bust": "zx_42271", + "bust": "bust_33005", "postxyz": [ 0, 0, @@ -827,7 +827,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_33006", - "bust": "zx_42271", + "bust": "bust_33006", "postxyz": [ 0, 0, @@ -848,7 +848,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_34001", - "bust": "zx_42271", + "bust": "bust_34001", "postxyz": [ 0, 0, @@ -869,7 +869,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_34002", - "bust": "zx_42271", + "bust": "bust_34002", "postxyz": [ 0, 0, @@ -890,7 +890,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_34003", - "bust": "zx_42271", + "bust": "bust_34003", "postxyz": [ 0, 0, @@ -911,7 +911,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_34004", - "bust": "zx_42271", + "bust": "bust_34004", "postxyz": [ 0, 0, @@ -932,7 +932,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_34005", - "bust": "zx_42271", + "bust": "bust_34005", "postxyz": [ 0, 0, @@ -953,7 +953,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "portrait_34006", - "bust": "zx_42271", + "bust": "bust_34006", "postxyz": [ 0, 0, @@ -974,7 +974,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_34007", - "bust": "zx_42271", + "bust": "bust_34007", "postxyz": [ 0, 0, @@ -995,7 +995,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_34008", - "bust": "zx_42271", + "bust": "bust_34008", "postxyz": [ 0, 0, @@ -1016,7 +1016,7 @@ "img": "sbkp_js_35001", "heroimg": "hbkp_js_35001", "portrait": "portrait_35001", - "bust": "zx_42271", + "bust": "bust_35001", "postxyz": [ 0, 0, @@ -1037,7 +1037,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_35002", - "bust": "zx_42271", + "bust": "bust_35002", "postxyz": [ 0, 0, @@ -1058,7 +1058,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_35003", - "bust": "zx_42271", + "bust": "bust_35003", "postxyz": [ 0, 0, @@ -1079,7 +1079,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_35004", - "bust": "zx_42271", + "bust": "bust_35004", "postxyz": [ 0, 0, @@ -1100,7 +1100,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_35005", - "bust": "zx_42271", + "bust": "bust_35005", "postxyz": [ 0, 0, @@ -1121,7 +1121,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_35006", - "bust": "zx_42271", + "bust": "bust_35006", "postxyz": [ 0, 0, @@ -1142,7 +1142,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_43001", - "bust": "zx_42271", + "bust": "bust_43001", "postxyz": [ 0, 0, @@ -1163,7 +1163,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_43002", - "bust": "zx_42271", + "bust": "bust_43002", "postxyz": [ 0, 0, @@ -1184,7 +1184,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_43003", - "bust": "zx_42271", + "bust": "bust_43003", "postxyz": [ 0, 0, @@ -1205,7 +1205,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_43004", - "bust": "zx_42271", + "bust": "bust_43004", "postxyz": [ 0, 0, @@ -1226,7 +1226,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_43005", - "bust": "zx_42271", + "bust": "bust_43005", "postxyz": [ 0, 0, @@ -1247,7 +1247,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_43006", - "bust": "zx_42271", + "bust": "bust_43006", "postxyz": [ 0, 0, @@ -1268,7 +1268,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_43007", - "bust": "zx_42271", + "bust": "bust_43007", "postxyz": [ 0, 0, @@ -1289,7 +1289,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_44001", - "bust": "zx_42271", + "bust": "bust_44001", "postxyz": [ 0, 0, @@ -1310,7 +1310,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_44002", - "bust": "zx_42271", + "bust": "bust_44002", "postxyz": [ 0, 0, @@ -1331,7 +1331,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_44003", - "bust": "zx_42271", + "bust": "bust_44003", "postxyz": [ 0, 0, @@ -1352,7 +1352,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_44004", - "bust": "zx_42271", + "bust": "bust_44004", "postxyz": [ 0, 0, @@ -1373,7 +1373,7 @@ "img": "sbkp_js_44005", "heroimg": "hbkp_js_44005", "portrait": "portrait_44005", - "bust": "zx_42271", + "bust": "bust_44005", "postxyz": [ 0, 0, @@ -1394,7 +1394,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_44006", - "bust": "zx_42271", + "bust": "bust_44006", "postxyz": [ 0, 0, @@ -1415,7 +1415,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_45001", - "bust": "zx_42271", + "bust": "bust_45001", "postxyz": [ 0, 0, @@ -1436,7 +1436,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_45002", - "bust": "zx_42271", + "bust": "bust_45002", "postxyz": [ 0, 0, @@ -1457,7 +1457,7 @@ "img": "sbkp_js_45003", "heroimg": "hbkp_js_45003", "portrait": "portrait_45003", - "bust": "zx_42271", + "bust": "bust_45003", "postxyz": [ 0, 0, @@ -1478,7 +1478,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_45004", - "bust": "zx_42271", + "bust": "bust_45004", "postxyz": [ 0, 0, @@ -1499,7 +1499,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_43901", - "bust": "zx_42271", + "bust": "bust_43901", "postxyz": [ 0, 0, @@ -1520,7 +1520,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_42911", - "bust": "zx_42271", + "bust": "bust_42911", "postxyz": [ 0, 0, @@ -1541,7 +1541,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_43911", - "bust": "zx_42271", + "bust": "bust_43911", "postxyz": [ 0, 0, @@ -1562,7 +1562,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_44911", - "bust": "zx_42271", + "bust": "bust_44911", "postxyz": [ 0, 0, @@ -1583,7 +1583,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_35002", - "bust": "zx_42271", + "bust": "bust_43921", "postxyz": [ 0, 0, @@ -1604,7 +1604,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_35002", - "bust": "zx_42271", + "bust": "bust_44921", "postxyz": [ 0, 0, @@ -1625,7 +1625,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_35002", - "bust": "zx_42271", + "bust": "bust_45921", "postxyz": [ 0, 0, @@ -1646,7 +1646,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51001", - "bust": "zx_42271", + "bust": "bust_51001", "postxyz": [ 0, 0, @@ -1667,7 +1667,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51002", - "bust": "zx_42271", + "bust": "bust_51002", "postxyz": [ 0, 0, @@ -1688,7 +1688,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51003", - "bust": "zx_42271", + "bust": "bust_51003", "postxyz": [ 0, 0, @@ -1709,7 +1709,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51004", - "bust": "zx_42271", + "bust": "bust_51004", "postxyz": [ 0, 0, @@ -1730,7 +1730,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51005", - "bust": "zx_42271", + "bust": "bust_51005", "postxyz": [ 0, 0, @@ -1751,7 +1751,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51006", - "bust": "zx_42271", + "bust": "bust_51006", "postxyz": [ 0, 0, @@ -1772,7 +1772,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51007", - "bust": "zx_42271", + "bust": "bust_51007", "postxyz": [ 0, 0, @@ -1793,7 +1793,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51008", - "bust": "zx_42271", + "bust": "bust_51008", "postxyz": [ 0, 0, @@ -1814,7 +1814,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51009", - "bust": "zx_42271", + "bust": "bust_51009", "postxyz": [ 0, 0, @@ -1835,7 +1835,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51010", - "bust": "zx_42271", + "bust": "bust_51010", "postxyz": [ 0, 0, @@ -1856,7 +1856,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51011", - "bust": "zx_42271", + "bust": "bust_51011", "postxyz": [ 0, 0, @@ -1877,7 +1877,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51012", - "bust": "zx_42271", + "bust": "bust_51012", "postxyz": [ 0, 0, @@ -1898,7 +1898,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51013", - "bust": "zx_42271", + "bust": "bust_51013", "postxyz": [ 0, 0, @@ -1919,7 +1919,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_51014", - "bust": "zx_42271", + "bust": "bust_51014", "postxyz": [ 0, 0, @@ -1940,7 +1940,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_53001", - "bust": "zx_42271", + "bust": "bust_53001", "postxyz": [ 0, 0, @@ -1961,7 +1961,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_53002", - "bust": "zx_42271", + "bust": "bust_53002", "postxyz": [ 0, 0, @@ -1982,7 +1982,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_53003", - "bust": "zx_42271", + "bust": "bust_53003", "postxyz": [ 0, 0, @@ -2003,7 +2003,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_53004", - "bust": "zx_42271", + "bust": "bust_53004", "postxyz": [ 0, 0, @@ -2024,7 +2024,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_53005", - "bust": "zx_42271", + "bust": "bust_53005", "postxyz": [ 0, 0, @@ -2045,7 +2045,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_53006", - "bust": "zx_42271", + "bust": "bust_53006", "postxyz": [ 0, 0, @@ -2066,7 +2066,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_55001", - "bust": "zx_42271", + "bust": "bust_55001", "postxyz": [ 0, 0, @@ -2087,7 +2087,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_55002", - "bust": "zx_42271", + "bust": "bust_55002", "postxyz": [ 0, 0, @@ -2101,14 +2101,14 @@ }, { "id": "55003", - "preson": "55003", + "preson": "55002", "presonshow": "", "ico": "tx_hhjs_35002", "fight": "ytx_js_55003", "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_55003", - "bust": "zx_42271", + "bust": "bust_55003", "postxyz": [ 0, 0, @@ -2129,7 +2129,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_55004", - "bust": "zx_42271", + "bust": "bust_55004", "postxyz": [ 0, 0, @@ -2143,14 +2143,14 @@ }, { "id": "55005", - "preson": "55005", + "preson": "55004", "presonshow": "", "ico": "tx_hhjs_35002", "fight": "ytx_js_55005", "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_55005", - "bust": "zx_42271", + "bust": "bust_55005", "postxyz": [ 0, 0, @@ -2171,7 +2171,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_55006", - "bust": "zx_42271", + "bust": "bust_55006", "postxyz": [ 0, 0, @@ -2185,14 +2185,14 @@ }, { "id": "55007", - "preson": "55007", + "preson": "11021", "presonshow": "", "ico": "tx_hhjs_35002", "fight": "ytx_js_55007", "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_55007", - "bust": "zx_42271", + "bust": "bust_55007", "postxyz": [ 0, 0, @@ -2213,7 +2213,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "portrait_55008", - "bust": "zx_42271", + "bust": "bust_55008", "postxyz": [ 0, 0, diff --git a/bin/json/game_monster.json b/bin/json/game_monster.json index 1cfe7fc9d..96c17adcd 100644 --- a/bin/json/game_monster.json +++ b/bin/json/game_monster.json @@ -298,5 +298,55 @@ }, "star": 5, "equip": "10001|10002|10003|10004" + }, + { + "monster_id": 250041, + "hero_id": "25004", + "name": { + "key": "hero_25004", + "text": "波比" + }, + "star": 1, + "equip": "10001|10002|10003|10004" + }, + { + "monster_id": 250042, + "hero_id": "25004", + "name": { + "key": "hero_25004", + "text": "波比" + }, + "star": 1, + "equip": "10001|10002|10003|10004" + }, + { + "monster_id": 250043, + "hero_id": "25004", + "name": { + "key": "hero_25004", + "text": "波比" + }, + "star": 1, + "equip": "10001|10002|10003|10004" + }, + { + "monster_id": 250044, + "hero_id": "25004", + "name": { + "key": "hero_25004", + "text": "波比" + }, + "star": 1, + "equip": "10001|10002|10003|10004" + }, + { + "monster_id": 250045, + "hero_id": "25004", + "name": { + "key": "hero_25004", + "text": "波比" + }, + "star": 1, + "equip": "10001|10002|10003|10004" } ] \ No newline at end of file diff --git a/bin/json/game_rdtask.json b/bin/json/game_rdtask.json index 849ef4517..0459cc1aa 100644 --- a/bin/json/game_rdtask.json +++ b/bin/json/game_rdtask.json @@ -10,7 +10,7 @@ "CD": 0, "objType": 1, "point": "model_01", - "storyBegin": 3, + "storyBegin": 4, "storyEnd": 0, "chooseId": [ 10001, @@ -37,29 +37,27 @@ "type": 2, "preTid": 100100, "condition": [ - 101, - 102 + 101 ], "CD": 0, "objType": 2, "point": "icon_01", - "storyBegin": 3, - "storyEnd": 0, + "storyBegin": 6, + "storyEnd": 9, "chooseId": [ - 10011, - 10012, - 10013 + 20001, + 20002 ], "reward": [ { "a": "attr", "t": "diamond", - "n": 15 + "n": 10 }, { "a": "attr", "t": "gold", - "n": 1500 + "n": 1000 } ], "nextTid": 100102 @@ -68,146 +66,29 @@ "id": 100102, "group": 1, "type": 2, - "preTid": 100101, + "preTid": 100100, "condition": [ 101, - 103 + 107 ], "CD": 0, "objType": 1, - "point": "model_01", - "storyBegin": 3, + "point": "model_02", + "storyBegin": 7, "storyEnd": 0, "chooseId": [], "reward": [ { "a": "attr", "t": "diamond", - "n": 15 + "n": 10 }, { "a": "attr", "t": "gold", - "n": 1500 - } - ], - "nextTid": 100103 - }, - { - "id": 100103, - "group": 1, - "type": 2, - "preTid": 100102, - "condition": [ - 101, - 103 - ], - "CD": 0, - "objType": 1, - "point": "model_01", - "storyBegin": 3, - "storyEnd": 0, - "chooseId": [], - "reward": [ - { - "a": "attr", - "t": "diamond", - "n": 15 - }, - { - "a": "attr", - "t": "gold", - "n": 1500 - } - ], - "nextTid": 100104 - }, - { - "id": 100104, - "group": 1, - "type": 2, - "preTid": 100103, - "condition": [ - 104, - 105 - ], - "CD": 0, - "objType": 1, - "point": "model_01", - "storyBegin": 3, - "storyEnd": 0, - "chooseId": [], - "reward": [ - { - "a": "attr", - "t": "diamond", - "n": 15 - }, - { - "a": "attr", - "t": "gold", - "n": 1500 - } - ], - "nextTid": 100105 - }, - { - "id": 100105, - "group": 1, - "type": 2, - "preTid": 100104, - "condition": [ - 106 - ], - "CD": 0, - "objType": 1, - "point": "model_01", - "storyBegin": 3, - "storyEnd": 0, - "chooseId": [ - 10021, - 10022 - ], - "reward": [ - { - "a": "attr", - "t": "diamond", - "n": 15 - }, - { - "a": "attr", - "t": "gold", - "n": 1500 + "n": 1000 } ], "nextTid": 0 - }, - { - "id": 100106, - "group": 1, - "type": 1, - "preTid": 100100, - "condition": [ - 107 - ], - "CD": 1, - "objType": 1, - "point": "model_01", - "storyBegin": 3, - "storyEnd": 0, - "chooseId": [], - "reward": [ - { - "a": "attr", - "t": "diamond", - "n": 15 - }, - { - "a": "attr", - "t": "gold", - "n": 1500 - } - ], - "nextTid": 100101 } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index 26d2a9f65..50b979a4a 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -6,7 +6,7 @@ "needItem": [ 0 ], - "endTid": 105 + "endTid": 0 }, { "id": 10002, @@ -27,7 +27,7 @@ "endTid": 0 }, { - "id": 10011, + "id": 20001, "num": 1, "preTid": 0, "needItem": [ @@ -36,34 +36,7 @@ "endTid": 105 }, { - "id": 10012, - "num": 2, - "preTid": 107, - "needItem": [ - 0 - ], - "endTid": 105 - }, - { - "id": 10013, - "num": 3, - "preTid": 0, - "needItem": [ - 0 - ], - "endTid": 0 - }, - { - "id": 10021, - "num": 1, - "preTid": 107, - "needItem": [ - 0 - ], - "endTid": 105 - }, - { - "id": 10022, + "id": 20002, "num": 2, "preTid": 0, "needItem": [ diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 68c73802f..4dc580ec8 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -8,8 +8,8 @@ }, { "id": 102, - "type": 2, - "data1": 3, + "type": 1, + "data1": 25001, "data2": 0, "data3": 0 }, @@ -24,7 +24,7 @@ "id": 104, "type": 4, "data1": 90001, - "data2": 15, + "data2": 20, "data3": 0 }, { @@ -43,9 +43,9 @@ }, { "id": 107, - "type": 4, + "type": 1, "data1": 25001, - "data2": 20, + "data2": 0, "data3": 0 }, { diff --git a/bin/json/game_stroy.json b/bin/json/game_stroy.json index 0f050c739..d8af4809f 100644 --- a/bin/json/game_stroy.json +++ b/bin/json/game_stroy.json @@ -399,5 +399,941 @@ "perf": "", "cg": "", "skip": 1 + }, + { + "id": 40001, + "groupid": 4, + "before": -1, + "next": 40002, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "你怎么了?", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 40002, + "groupid": 4, + "before": 40001, + "next": 40003, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "额,没什么,哈哈。", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 40003, + "groupid": 4, + "before": 40002, + "next": 40004, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "不对,你有心事,和我说说?", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 40004, + "groupid": 4, + "before": 40003, + "next": 40005, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "没有没有,你想多了,我先溜了哈.....", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 40005, + "groupid": 4, + "before": 40004, + "next": -1, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "有问题,我应该.....", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 50001, + "groupid": 5, + "before": -1, + "next": -1, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "我看到他了,他在那儿!!", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 60001, + "groupid": 6, + "before": -1, + "next": 60002, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "你怎么了?", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 60002, + "groupid": 6, + "before": 60001, + "next": 60003, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "我感觉我太弱了,无法守护同伴", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 60003, + "groupid": 6, + "before": 60002, + "next": 60004, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "等等,你是月中人选中的存在,你有办法让我变强吗?", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 60004, + "groupid": 6, + "before": 60003, + "next": -1, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "让我想想.....", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 70001, + "groupid": 7, + "before": -1, + "next": 70002, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "你知道阿宝怎么了吗?", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 70002, + "groupid": 7, + "before": 70001, + "next": 70003, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25004", + "emoji": "", + "des": "他找我单挑,后来被我打败了,然后就那样了....", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 70003, + "groupid": 7, + "before": 70002, + "next": 70004, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "找,你,单,挑???", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 70004, + "groupid": 7, + "before": 70003, + "next": 70005, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25004", + "emoji": "", + "des": "嗯,我也不知道为什么他不开心,真的怪....", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 70005, + "groupid": 7, + "before": 70004, + "next": 70006, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "没什么别的事情了?", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 70006, + "groupid": 7, + "before": 70005, + "next": 70007, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25004", + "emoji": "", + "des": "没啦。", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 70007, + "groupid": 7, + "before": 70006, + "next": -1, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "好吧,我或许需要想办法让阿宝变强一些,或许我可以想办法去武馆内帮助他", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 1 + }, + { + "id": 80001, + "groupid": 8, + "before": -1, + "next": 80002, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "额,为啥带俺来这里。", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 0 + }, + { + "id": 80002, + "groupid": 8, + "before": 80001, + "next": 80003, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "我将用月光的能量来强化你,你准备好了吗?", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 0 + }, + { + "id": 80003, + "groupid": 8, + "before": 80002, + "next": 80004, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "灌.....灌顶!!?", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 0 + }, + { + "id": 80004, + "groupid": 8, + "before": 80003, + "next": 80005, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "不不不,是月光洗礼。", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 0 + }, + { + "id": 80005, + "groupid": 8, + "before": 80004, + "next": -1, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "我开始啦!(请将阿宝升到10级)", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 0 + }, + { + "id": 90001, + "groupid": 9, + "before": -1, + "next": 90002, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "我感觉,我现在超勇!!!", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 0 + }, + { + "id": 90002, + "groupid": 9, + "before": 90001, + "next": 90003, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "我这就去找波比单挑!", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 1, + "position": { + "x": 0, + "y": 207, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 0 + }, + { + "id": 90003, + "groupid": 9, + "before": 90002, + "next": 90004, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "什么??!", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 0 + }, + { + "id": 90004, + "groupid": 9, + "before": 90003, + "next": -1, + "type": 2, + "bg": "jqdh_bg01", + "speak": "25001", + "emoji": "", + "des": "你给我站住!", + "chose": [], + "turn": -1, + "show": 1, + "move": "idle", + "action": "", + "sound": "", + "place": 0, + "position": { + "x": 0, + "y": 40, + "z": 900 + }, + "revolve": { + "x": 0, + "y": -180, + "z": 0 + }, + "size": { + "x": 4, + "y": 4, + "z": 4 + }, + "perf": "", + "cg": "", + "skip": 0 } ] \ No newline at end of file diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 2b2e38843..e40bc2911 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -394,7 +394,7 @@ func (this *ModelHero) PropertyCompute(hero *pb.DBHero) { } //英雄星级对应等级属性 - heroStarCfg := this.moduleHero.configure.GetHeroLv(stargrowCfg.Level) + heroStarCfg := this.moduleHero.configure.GetHeroLv(heroCfg.Star * comm.HeroStarLvRatio) if heroStarCfg == nil { return } diff --git a/modules/timer/pagodarank.go b/modules/timer/pagodarank.go index 15588284e..77eae521a 100644 --- a/modules/timer/pagodarank.go +++ b/modules/timer/pagodarank.go @@ -46,16 +46,6 @@ func (this *PagodaRank) Timer() { } } if len(data) > 0 { - // keys, err := this.Redis.Keys(comm.TablePagodaRank) // 这种方式效率太低不建议使用 - // if err != nil { - // for _, v := range keys { - // err = this.Redis.Delete(v) - // if err != nil { - // log.Errorf("delete failed") - // } - // } - // } - // iLne, _ := this.Redis.Llen(comm.TablePagodaRank) err := this.Redis.RPush(comm.TablePagodaRank, data...) if err == nil { err = this.Redis.Ltrim(comm.TablePagodaRank, -1*len(data), -1) //对一个列表进行修剪 diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index bf98f08c2..3745bcc7b 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -13,8 +13,6 @@ import "errors" type GameGlobalData struct { MaxChar int32 TaskReset int32 - InitGold int32 - InitHero []int32 Cameramin []int32 MaxGetreward []int32 Cameramax []float32 @@ -79,6 +77,8 @@ type GameGlobalData struct { DreamlandResettime int32 DreamlandLimit int32 DreamlandPro int32 + HuntingNum int32 + HuntingReset int32 } const TypeId_GameGlobalData = 477542761 @@ -90,21 +90,6 @@ func (*GameGlobalData) GetTypeId() int32 { func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_char"].(float64); !_ok_ { err = errors.New("max_char error"); return }; _v.MaxChar = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_reset"].(float64); !_ok_ { err = errors.New("task_reset error"); return }; _v.TaskReset = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["init_gold"].(float64); !_ok_ { err = errors.New("init_gold error"); return }; _v.InitGold = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["init_hero"].([]interface{}); !_ok_ { err = errors.New("init_hero error"); return } - - _v.InitHero = make([]int32, 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_) } - _v.InitHero = append(_v.InitHero, _list_v_) - } - } - { var _arr_ []interface{} var _ok_ bool @@ -234,6 +219,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_resettime"].(float64); !_ok_ { err = errors.New("dreamland_resettime error"); return }; _v.DreamlandResettime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_limit"].(float64); !_ok_ { err = errors.New("dreamland_limit error"); return }; _v.DreamlandLimit = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_pro"].(float64); !_ok_ { err = errors.New("dreamland_pro error"); return }; _v.DreamlandPro = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_num"].(float64); !_ok_ { err = errors.New("hunting_num error"); return }; _v.HuntingNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_reset"].(float64); !_ok_ { err = errors.New("hunting_reset error"); return }; _v.HuntingReset = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.heroStargrowData.go b/sys/configure/structs/game.heroStargrowData.go index 5bbb33397..4e080be34 100644 --- a/sys/configure/structs/game.heroStargrowData.go +++ b/sys/configure/structs/game.heroStargrowData.go @@ -12,8 +12,6 @@ import "errors" type GameHeroStargrowData struct { Star int32 - Level int32 - Maxlevel int32 StarupHp float32 StarupAtk float32 StarupDef float32 @@ -28,8 +26,6 @@ func (*GameHeroStargrowData) GetTypeId() int32 { func (_v *GameHeroStargrowData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxlevel"].(float64); !_ok_ { err = errors.New("maxlevel error"); return }; _v.Maxlevel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_hp"].(float64); !_ok_ { err = errors.New("starup_hp error"); return }; _v.StarupHp = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_atk"].(float64); !_ok_ { err = errors.New("starup_atk error"); return }; _v.StarupAtk = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_def"].(float64); !_ok_ { err = errors.New("starup_def error"); return }; _v.StarupDef = float32(_tempNum_) } diff --git a/sys/configure/structs/game.itemData.go b/sys/configure/structs/game.itemData.go index 9d07d193c..f1e7a122a 100644 --- a/sys/configure/structs/game.itemData.go +++ b/sys/configure/structs/game.itemData.go @@ -22,8 +22,8 @@ type GameItemData struct { Effects string BoxId int32 SynthetizeNum int32 - Access int32 - UseSkip int32 + Access string + UseSkip string UpperLimit int32 Uselv int32 Isani int32 @@ -54,8 +54,8 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["box_id"].(float64); !_ok_ { err = errors.New("box_id error"); return }; _v.BoxId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["synthetize_num"].(float64); !_ok_ { err = errors.New("synthetize_num error"); return }; _v.SynthetizeNum = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["use_skip"].(float64); !_ok_ { err = errors.New("use_skip error"); return }; _v.UseSkip = int32(_tempNum_) } + { var _ok_ bool; if _v.Access, _ok_ = _buf["access"].(string); !_ok_ { err = errors.New("access error"); return } } + { var _ok_ bool; if _v.UseSkip, _ok_ = _buf["use_skip"].(string); !_ok_ { err = errors.New("use_skip error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["upper_limit"].(float64); !_ok_ { err = errors.New("upper_limit error"); return }; _v.UpperLimit = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uselv"].(float64); !_ok_ { err = errors.New("uselv error"); return }; _v.Uselv = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isani"].(float64); !_ok_ { err = errors.New("isani error"); return }; _v.Isani = int32(_tempNum_) }