From 4436df09d1a675f3132694347ab0e3c98b847aec Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 16 Sep 2022 20:09:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=8C=E8=BE=88=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_heroawaken.json | 1420 +++++++++++++------------- bin/json/game_initial.json | 82 +- bin/json/game_ip.json | 50 + bin/json/game_mainline.json | 698 ++++++------- bin/json/game_model.json | 2 +- bin/json/game_skillafteratk.json | 10 +- sys/configure/structs/Game.Ip.go | 42 + sys/configure/structs/Game.IpData.go | 37 + sys/configure/structs/Tables.go | 7 + 9 files changed, 1222 insertions(+), 1126 deletions(-) create mode 100644 bin/json/game_ip.json create mode 100644 sys/configure/structs/Game.Ip.go create mode 100644 sys/configure/structs/Game.IpData.go diff --git a/bin/json/game_heroawaken.json b/bin/json/game_heroawaken.json index a06c39151..7522d75fc 100644 --- a/bin/json/game_heroawaken.json +++ b/bin/json/game_heroawaken.json @@ -17,7 +17,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -40,7 +40,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -63,12 +63,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -91,12 +91,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -119,12 +119,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -147,12 +147,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -175,7 +175,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -198,7 +198,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -221,12 +221,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -249,12 +249,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -277,12 +277,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -305,12 +305,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -333,7 +333,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -356,7 +356,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -379,12 +379,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -407,12 +407,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -435,12 +435,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -463,12 +463,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -491,7 +491,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -514,7 +514,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -537,12 +537,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -565,12 +565,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -593,12 +593,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -621,12 +621,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -649,7 +649,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -672,7 +672,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -695,12 +695,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -723,12 +723,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -751,12 +751,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -779,12 +779,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -807,7 +807,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -830,7 +830,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -853,12 +853,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -881,12 +881,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -909,12 +909,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -937,12 +937,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -965,7 +965,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -988,7 +988,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1011,12 +1011,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1039,12 +1039,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1067,12 +1067,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -1095,12 +1095,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -1123,7 +1123,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1146,7 +1146,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1169,12 +1169,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1197,12 +1197,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1225,12 +1225,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -1253,12 +1253,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -1281,7 +1281,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1304,7 +1304,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1327,12 +1327,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1355,12 +1355,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1383,12 +1383,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -1411,12 +1411,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -1439,7 +1439,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1462,7 +1462,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1485,12 +1485,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1513,12 +1513,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1541,12 +1541,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -1569,12 +1569,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -1597,7 +1597,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1620,7 +1620,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1643,12 +1643,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1671,12 +1671,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1699,12 +1699,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -1727,12 +1727,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -1755,7 +1755,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1778,7 +1778,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1801,12 +1801,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1829,12 +1829,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1857,12 +1857,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -1885,12 +1885,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -1913,7 +1913,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1936,7 +1936,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -1959,12 +1959,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -1987,12 +1987,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2015,12 +2015,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -2043,12 +2043,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -2071,7 +2071,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2094,7 +2094,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2117,12 +2117,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2145,12 +2145,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2173,12 +2173,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -2201,12 +2201,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -2229,7 +2229,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2252,7 +2252,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2275,12 +2275,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2303,12 +2303,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2331,12 +2331,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -2359,12 +2359,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -2387,7 +2387,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2410,7 +2410,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2433,12 +2433,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2461,12 +2461,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2489,12 +2489,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -2517,12 +2517,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -2545,7 +2545,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2568,7 +2568,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2591,12 +2591,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2619,12 +2619,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2647,12 +2647,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -2675,12 +2675,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -2703,7 +2703,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2726,7 +2726,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2749,12 +2749,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2777,12 +2777,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2805,12 +2805,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -2833,12 +2833,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -2861,7 +2861,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2884,7 +2884,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2907,12 +2907,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -2935,12 +2935,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -2963,12 +2963,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -2991,12 +2991,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -3019,7 +3019,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3042,7 +3042,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3065,12 +3065,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3093,12 +3093,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3121,12 +3121,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -3149,12 +3149,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -3177,7 +3177,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3200,7 +3200,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3223,12 +3223,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3251,12 +3251,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3279,12 +3279,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -3307,12 +3307,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -3335,7 +3335,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3358,7 +3358,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3381,12 +3381,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3409,12 +3409,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3437,12 +3437,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -3465,12 +3465,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -3493,7 +3493,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3516,7 +3516,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3539,12 +3539,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3567,12 +3567,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3595,12 +3595,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -3623,12 +3623,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -3651,7 +3651,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3674,7 +3674,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3697,12 +3697,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3725,12 +3725,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3753,12 +3753,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -3781,12 +3781,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -3809,7 +3809,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3832,7 +3832,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3855,12 +3855,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3883,12 +3883,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -3911,12 +3911,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -3939,12 +3939,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -3967,7 +3967,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -3990,7 +3990,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4013,12 +4013,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4041,12 +4041,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4069,12 +4069,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -4097,12 +4097,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -4125,7 +4125,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4148,7 +4148,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4171,12 +4171,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4199,12 +4199,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4227,12 +4227,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -4255,12 +4255,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -4283,7 +4283,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4306,7 +4306,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4329,12 +4329,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4357,12 +4357,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4385,12 +4385,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -4413,12 +4413,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -4441,7 +4441,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4464,7 +4464,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4487,12 +4487,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4515,12 +4515,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4543,12 +4543,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -4571,12 +4571,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -4599,7 +4599,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4622,7 +4622,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4645,12 +4645,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4673,12 +4673,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4701,12 +4701,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -4729,12 +4729,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -4757,7 +4757,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4780,7 +4780,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4803,12 +4803,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4831,12 +4831,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4859,12 +4859,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -4887,12 +4887,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -4915,7 +4915,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4938,7 +4938,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -4961,12 +4961,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -4989,12 +4989,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5017,12 +5017,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -5045,12 +5045,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -5073,7 +5073,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5096,7 +5096,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5119,12 +5119,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5147,12 +5147,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5175,12 +5175,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -5203,12 +5203,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -5231,7 +5231,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5254,7 +5254,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5277,12 +5277,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5305,12 +5305,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5333,12 +5333,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -5361,12 +5361,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -5389,7 +5389,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5412,7 +5412,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5435,12 +5435,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5463,12 +5463,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5491,12 +5491,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -5519,12 +5519,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -5547,7 +5547,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5570,7 +5570,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5593,12 +5593,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5621,12 +5621,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5649,12 +5649,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -5677,12 +5677,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -5705,7 +5705,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5728,7 +5728,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5751,12 +5751,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5779,12 +5779,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5807,12 +5807,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -5835,12 +5835,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -5863,7 +5863,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5886,7 +5886,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5909,12 +5909,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -5937,12 +5937,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -5965,12 +5965,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -5993,12 +5993,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -6021,7 +6021,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6044,7 +6044,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6067,12 +6067,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6095,12 +6095,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6123,12 +6123,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -6151,12 +6151,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -6179,7 +6179,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6202,7 +6202,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6225,12 +6225,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6253,12 +6253,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6281,12 +6281,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -6309,12 +6309,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -6337,7 +6337,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6360,7 +6360,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6383,12 +6383,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6411,12 +6411,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6439,12 +6439,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -6467,12 +6467,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -6495,7 +6495,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6518,7 +6518,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6541,12 +6541,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6569,12 +6569,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6597,12 +6597,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -6625,12 +6625,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -6653,7 +6653,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6676,7 +6676,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6699,12 +6699,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6727,12 +6727,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6755,12 +6755,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -6783,12 +6783,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -6811,7 +6811,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6834,7 +6834,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6857,12 +6857,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6885,12 +6885,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -6913,12 +6913,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -6941,12 +6941,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -6969,7 +6969,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -6992,7 +6992,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7015,12 +7015,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7043,12 +7043,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7071,12 +7071,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -7099,12 +7099,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -7127,7 +7127,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7150,7 +7150,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7173,12 +7173,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7201,12 +7201,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7229,12 +7229,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -7257,12 +7257,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -7285,7 +7285,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7308,7 +7308,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7331,12 +7331,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7359,12 +7359,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7387,12 +7387,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -7415,12 +7415,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -7443,7 +7443,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7466,7 +7466,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7489,12 +7489,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7517,12 +7517,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7545,12 +7545,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -7573,12 +7573,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -7601,7 +7601,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7624,7 +7624,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7647,12 +7647,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7675,12 +7675,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7703,12 +7703,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -7731,12 +7731,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -7759,7 +7759,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7782,7 +7782,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7805,12 +7805,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7833,12 +7833,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7861,12 +7861,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -7889,12 +7889,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -7917,7 +7917,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7940,7 +7940,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -7963,12 +7963,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -7991,12 +7991,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8019,12 +8019,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -8047,12 +8047,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -8075,7 +8075,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8098,7 +8098,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8121,12 +8121,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8149,12 +8149,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8177,12 +8177,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -8205,12 +8205,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -8233,7 +8233,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8256,7 +8256,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8279,12 +8279,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8307,12 +8307,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8335,12 +8335,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -8363,12 +8363,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -8391,7 +8391,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8414,7 +8414,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8437,12 +8437,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8465,12 +8465,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8493,12 +8493,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -8521,12 +8521,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -8549,7 +8549,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8572,7 +8572,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8595,12 +8595,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8623,12 +8623,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8651,12 +8651,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -8679,12 +8679,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -8707,7 +8707,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8730,7 +8730,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8753,12 +8753,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8781,12 +8781,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8809,12 +8809,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -8837,12 +8837,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -8865,7 +8865,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8888,7 +8888,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8911,12 +8911,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -8939,12 +8939,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -8967,12 +8967,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -8995,12 +8995,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -9023,7 +9023,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9046,7 +9046,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9069,12 +9069,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9097,12 +9097,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9125,12 +9125,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -9153,12 +9153,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -9181,7 +9181,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9204,7 +9204,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9227,12 +9227,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9255,12 +9255,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9283,12 +9283,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -9311,12 +9311,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -9339,7 +9339,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9362,7 +9362,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9385,12 +9385,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9413,12 +9413,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9441,12 +9441,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -9469,12 +9469,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -9497,7 +9497,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9520,7 +9520,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9543,12 +9543,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9571,12 +9571,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9599,12 +9599,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -9627,12 +9627,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -9655,7 +9655,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9678,7 +9678,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9701,12 +9701,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9729,12 +9729,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9757,12 +9757,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -9785,12 +9785,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -9813,7 +9813,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9836,7 +9836,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9859,12 +9859,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9887,12 +9887,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -9915,12 +9915,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -9943,12 +9943,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -9971,7 +9971,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -9994,7 +9994,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10017,12 +10017,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10045,12 +10045,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10073,12 +10073,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -10101,12 +10101,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -10129,7 +10129,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10152,7 +10152,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10175,12 +10175,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10203,12 +10203,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10231,12 +10231,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -10259,12 +10259,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -10287,7 +10287,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10310,7 +10310,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10333,12 +10333,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10361,12 +10361,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10389,12 +10389,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -10417,12 +10417,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -10445,7 +10445,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10468,7 +10468,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10491,12 +10491,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10519,12 +10519,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10547,12 +10547,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -10575,12 +10575,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -10603,7 +10603,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10626,7 +10626,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10649,12 +10649,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10677,12 +10677,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10705,12 +10705,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -10733,12 +10733,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -10761,7 +10761,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10784,7 +10784,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10807,12 +10807,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10835,12 +10835,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10863,12 +10863,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -10891,12 +10891,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -10919,7 +10919,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10942,7 +10942,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -10965,12 +10965,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -10993,12 +10993,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -11021,12 +11021,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -11049,12 +11049,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] @@ -11077,7 +11077,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -11100,7 +11100,7 @@ }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -11123,12 +11123,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 10 } ] @@ -11151,12 +11151,12 @@ }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 }, { "a": "item", - "t": "10001", + "t": "50001", "n": 20 } ] @@ -11179,12 +11179,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 10 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 10 } ] @@ -11207,12 +11207,12 @@ }, { "a": "item", - "t": "10003", + "t": "50009", "n": 20 }, { "a": "item", - "t": "10002", + "t": "50005", "n": 20 } ] diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index c86c3e5da..28186a23f 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -504,7 +504,7 @@ "var": [ { "a": "hero", - "t": "35002", + "t": "44006", "n": 5 } ] @@ -514,7 +514,7 @@ "var": [ { "a": "hero", - "t": "24003", + "t": "35001", "n": 5 } ] @@ -524,7 +524,7 @@ "var": [ { "a": "hero", - "t": "34006", + "t": "44005", "n": 5 } ] @@ -534,7 +534,7 @@ "var": [ { "a": "hero", - "t": "44006", + "t": "15004", "n": 5 } ] @@ -544,7 +544,7 @@ "var": [ { "a": "hero", - "t": "35001", + "t": "24002", "n": 5 } ] @@ -554,7 +554,77 @@ "var": [ { "a": "hero", - "t": "44005", + "t": "14007", + "n": 5 + } + ] + }, + { + "index": "60", + "var": [ + { + "a": "hero", + "t": "45003", + "n": 5 + } + ] + }, + { + "index": "61", + "var": [ + { + "a": "hero", + "t": "24004", + "n": 5 + } + ] + }, + { + "index": "62", + "var": [ + { + "a": "hero", + "t": "14003", + "n": 5 + } + ] + }, + { + "index": "63", + "var": [ + { + "a": "hero", + "t": "35003", + "n": 5 + } + ] + }, + { + "index": "64", + "var": [ + { + "a": "hero", + "t": "15005", + "n": 5 + } + ] + }, + { + "index": "65", + "var": [ + { + "a": "hero", + "t": "34006", + "n": 5 + } + ] + }, + { + "index": "66", + "var": [ + { + "a": "hero", + "t": "24003", "n": 5 } ] diff --git a/bin/json/game_ip.json b/bin/json/game_ip.json new file mode 100644 index 000000000..350e916fb --- /dev/null +++ b/bin/json/game_ip.json @@ -0,0 +1,50 @@ +[ + { + "ip_id": 1, + "ip_icon": "zm_ip_logo05" + }, + { + "ip_id": 2, + "ip_icon": "zm_ip_logo12" + }, + { + "ip_id": 3, + "ip_icon": "zm_ip_logo02" + }, + { + "ip_id": 4, + "ip_icon": "zm_ip_logo01" + }, + { + "ip_id": 5, + "ip_icon": "zm_ip_logo10" + }, + { + "ip_id": 6, + "ip_icon": "zm_ip_logo11" + }, + { + "ip_id": 7, + "ip_icon": "zm_ip_logo09" + }, + { + "ip_id": 8, + "ip_icon": "zm_ip_logo08" + }, + { + "ip_id": 9, + "ip_icon": "zm_ip_logo04" + }, + { + "ip_id": 10, + "ip_icon": "zm_ip_logo07" + }, + { + "ip_id": 11, + "ip_icon": "zm_ip_logo03" + }, + { + "ip_id": 12, + "ip_icon": "zm_ip_logo06" + } +] \ No newline at end of file diff --git a/bin/json/game_mainline.json b/bin/json/game_mainline.json index 230b1ef1f..e3f865ff8 100644 --- a/bin/json/game_mainline.json +++ b/bin/json/game_mainline.json @@ -16,18 +16,7 @@ ], "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ], + "award": [], "title": { "key": "mainline_title_10001", "text": "第1关：功夫世界" @@ -423,26 +412,15 @@ "chapter": 2, "Episodetype": 0, "Episodelocation": { - "x": 755, - "y": 1533 + "x": 595, + "y": 725 }, "FormatList": [ 101011 ], "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ], + "award": [], "title": { "key": "mainline_title_10001", "text": "第1关：功夫世界" @@ -467,26 +445,15 @@ "chapter": 2, "Episodetype": 7, "Episodelocation": { - "x": 1045, - "y": 1389 + "x": 1051, + "y": 665 }, "FormatList": [ 101011 ], "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ], + "award": [], "title": { "key": "mainline_title_10001", "text": "第1关：功夫世界" @@ -511,8 +478,8 @@ "chapter": 2, "Episodetype": 1, "Episodelocation": { - "x": 1367, - "y": 1371 + "x": 1209, + "y": 979 }, "FormatList": [ 101021 @@ -553,10 +520,10 @@ "previoustage": 202, "order": 3, "chapter": 2, - "Episodetype": 5, + "Episodetype": 7, "Episodelocation": { - "x": 1277, - "y": 1729 + "x": 1479, + "y": 1041 }, "FormatList": [ 101031, @@ -564,18 +531,7 @@ ], "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40002 - } - ], + "award": [], "title": { "key": "mainline_title_10003", "text": "第3关：太狼来袭" @@ -595,19 +551,19 @@ "id": 204, "intensity": 1, "endFlag": 0, - "previoustage": 202, + "previoustage": 203, "order": 4, "chapter": 2, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { - "x": 1907, - "y": 1453 + "x": 1961, + "y": 1173 }, "FormatList": [ 101041, 101042 ], - "captainId": "", + "captainId": "440051", "battlescene": "bg_zhandoulmboss", "award": [ { @@ -643,29 +599,18 @@ "previoustage": 204, "order": 5, "chapter": 2, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { - "x": 1961, - "y": 1173 + "x": 1907, + "y": 1453 }, "FormatList": [ 101051, 101052 ], - "captainId": "440051", + "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40004 - } - ], + "award": [], "title": { "key": "mainline_title_10005", "text": "第4关：太狼来袭" @@ -688,10 +633,10 @@ "previoustage": 205, "order": 6, "chapter": 2, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { - "x": 1479, - "y": 1041 + "x": 1367, + "y": 1371 }, "FormatList": [ 101061, @@ -733,10 +678,10 @@ "previoustage": 206, "order": 7, "chapter": 2, - "Episodetype": 1, + "Episodetype": 5, "Episodelocation": { - "x": 1209, - "y": 979 + "x": 1277, + "y": 1729 }, "FormatList": [ 101071, @@ -775,13 +720,13 @@ "id": 208, "intensity": 1, "endFlag": 0, - "previoustage": 207, + "previoustage": 206, "order": 8, "chapter": 2, "Episodetype": 7, "Episodelocation": { - "x": 1051, - "y": 665 + "x": 1045, + "y": 1389 }, "FormatList": [ 101081, @@ -789,18 +734,7 @@ ], "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40007 - } - ], + "award": [], "title": { "key": "mainline_title_10008", "text": "第6关：乌龟大师" @@ -825,8 +759,8 @@ "chapter": 2, "Episodetype": 3, "Episodelocation": { - "x": 595, - "y": 725 + "x": 755, + "y": 1533 }, "FormatList": [ 101091, @@ -871,26 +805,15 @@ "chapter": 3, "Episodetype": 0, "Episodelocation": { - "x": 755, - "y": 1533 + "x": 1277, + "y": 1729 }, "FormatList": [ 101011 ], "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ], + "award": [], "title": { "key": "mainline_title_10001", "text": "第1关：功夫世界" @@ -913,15 +836,15 @@ "previoustage": 0, "order": 1, "chapter": 3, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { - "x": 1045, - "y": 1389 + "x": 1367, + "y": 1371 }, "FormatList": [ 101011 ], - "captainId": "", + "captainId": "340061", "battlescene": "bg_zhandoulmboss", "award": [ { @@ -957,28 +880,17 @@ "previoustage": 301, "order": 2, "chapter": 3, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { - "x": 1367, - "y": 1371 + "x": 1045, + "y": 1389 }, "FormatList": [ 101021 ], - "captainId": "340061", + "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40001 - } - ], + "award": [], "title": { "key": "mainline_title_10002", "text": "第2关：练功房" @@ -1003,8 +915,8 @@ "chapter": 3, "Episodetype": 5, "Episodelocation": { - "x": 1277, - "y": 1729 + "x": 755, + "y": 1533 }, "FormatList": [ 101031, @@ -1043,10 +955,10 @@ "id": 304, "intensity": 1, "endFlag": 0, - "previoustage": 302, + "previoustage": 301, "order": 4, "chapter": 3, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -1055,7 +967,7 @@ 101041, 101042 ], - "captainId": "", + "captainId": "440051", "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1066,7 +978,7 @@ { "a": "attr", "t": "gold", - "n": 40003 + "n": 40002 } ], "title": { @@ -1091,7 +1003,7 @@ "previoustage": 304, "order": 5, "chapter": 3, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -1100,20 +1012,9 @@ 101051, 101052 ], - "captainId": "440051", + "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40004 - } - ], + "award": [], "title": { "key": "mainline_title_10005", "text": "第4关：太狼来袭" @@ -1136,7 +1037,7 @@ "previoustage": 305, "order": 6, "chapter": 3, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -1145,7 +1046,7 @@ 101061, 101062 ], - "captainId": "", + "captainId": "240031", "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1181,7 +1082,7 @@ "previoustage": 306, "order": 7, "chapter": 3, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -1190,20 +1091,9 @@ 101071, 101072 ], - "captainId": "240031", + "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40006 - } - ], + "award": [], "title": { "key": "mainline_title_10007", "text": "第5关：太狼来袭" @@ -1226,7 +1116,7 @@ "previoustage": 307, "order": 8, "chapter": 3, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -1235,7 +1125,7 @@ 101081, 101082 ], - "captainId": "", + "captainId": "250041", "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1361,7 +1251,7 @@ "previoustage": 0, "order": 1, "chapter": 4, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -1405,7 +1295,7 @@ "previoustage": 401, "order": 2, "chapter": 4, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -1494,7 +1384,7 @@ "previoustage": 402, "order": 4, "chapter": 4, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -1539,7 +1429,7 @@ "previoustage": 404, "order": 5, "chapter": 4, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -1584,7 +1474,7 @@ "previoustage": 405, "order": 6, "chapter": 4, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -1629,7 +1519,7 @@ "previoustage": 406, "order": 7, "chapter": 4, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -1674,7 +1564,7 @@ "previoustage": 407, "order": 8, "chapter": 4, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -1809,7 +1699,7 @@ "previoustage": 0, "order": 1, "chapter": 5, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -1853,7 +1743,7 @@ "previoustage": 501, "order": 2, "chapter": 5, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -1942,7 +1832,7 @@ "previoustage": 502, "order": 4, "chapter": 5, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -1987,7 +1877,7 @@ "previoustage": 504, "order": 5, "chapter": 5, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -2032,7 +1922,7 @@ "previoustage": 505, "order": 6, "chapter": 5, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -2077,7 +1967,7 @@ "previoustage": 506, "order": 7, "chapter": 5, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -2122,7 +2012,7 @@ "previoustage": 507, "order": 8, "chapter": 5, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -2257,7 +2147,7 @@ "previoustage": 0, "order": 1, "chapter": 6, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -2301,7 +2191,7 @@ "previoustage": 601, "order": 2, "chapter": 6, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -2390,7 +2280,7 @@ "previoustage": 602, "order": 4, "chapter": 6, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -2435,7 +2325,7 @@ "previoustage": 604, "order": 5, "chapter": 6, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -2480,7 +2370,7 @@ "previoustage": 605, "order": 6, "chapter": 6, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -2525,7 +2415,7 @@ "previoustage": 606, "order": 7, "chapter": 6, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -2570,7 +2460,7 @@ "previoustage": 607, "order": 8, "chapter": 6, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -2705,7 +2595,7 @@ "previoustage": 0, "order": 1, "chapter": 7, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -2749,7 +2639,7 @@ "previoustage": 701, "order": 2, "chapter": 7, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -2838,7 +2728,7 @@ "previoustage": 702, "order": 4, "chapter": 7, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -2883,7 +2773,7 @@ "previoustage": 704, "order": 5, "chapter": 7, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -2928,7 +2818,7 @@ "previoustage": 705, "order": 6, "chapter": 7, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -2973,7 +2863,7 @@ "previoustage": 706, "order": 7, "chapter": 7, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -3018,7 +2908,7 @@ "previoustage": 707, "order": 8, "chapter": 7, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -3153,7 +3043,7 @@ "previoustage": 0, "order": 1, "chapter": 8, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -3197,7 +3087,7 @@ "previoustage": 801, "order": 2, "chapter": 8, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -3286,7 +3176,7 @@ "previoustage": 802, "order": 4, "chapter": 8, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -3331,7 +3221,7 @@ "previoustage": 804, "order": 5, "chapter": 8, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -3376,7 +3266,7 @@ "previoustage": 805, "order": 6, "chapter": 8, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -3421,7 +3311,7 @@ "previoustage": 806, "order": 7, "chapter": 8, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -3466,7 +3356,7 @@ "previoustage": 807, "order": 8, "chapter": 8, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -3601,7 +3491,7 @@ "previoustage": 0, "order": 1, "chapter": 9, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -3645,7 +3535,7 @@ "previoustage": 901, "order": 2, "chapter": 9, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -3734,7 +3624,7 @@ "previoustage": 902, "order": 4, "chapter": 9, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -3779,7 +3669,7 @@ "previoustage": 904, "order": 5, "chapter": 9, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -3824,7 +3714,7 @@ "previoustage": 905, "order": 6, "chapter": 9, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -3869,7 +3759,7 @@ "previoustage": 906, "order": 7, "chapter": 9, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -3914,7 +3804,7 @@ "previoustage": 907, "order": 8, "chapter": 9, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -4049,7 +3939,7 @@ "previoustage": 0, "order": 1, "chapter": 10, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -4093,7 +3983,7 @@ "previoustage": 1001, "order": 2, "chapter": 10, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -4182,7 +4072,7 @@ "previoustage": 1002, "order": 4, "chapter": 10, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -4227,7 +4117,7 @@ "previoustage": 1004, "order": 5, "chapter": 10, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -4272,7 +4162,7 @@ "previoustage": 1005, "order": 6, "chapter": 10, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -4317,7 +4207,7 @@ "previoustage": 1006, "order": 7, "chapter": 10, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -4362,7 +4252,7 @@ "previoustage": 1007, "order": 8, "chapter": 10, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -4497,7 +4387,7 @@ "previoustage": 0, "order": 1, "chapter": 11, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -4541,7 +4431,7 @@ "previoustage": 1101, "order": 2, "chapter": 11, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -4630,7 +4520,7 @@ "previoustage": 1102, "order": 4, "chapter": 11, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -4675,7 +4565,7 @@ "previoustage": 1104, "order": 5, "chapter": 11, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -4720,7 +4610,7 @@ "previoustage": 1105, "order": 6, "chapter": 11, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -4765,7 +4655,7 @@ "previoustage": 1106, "order": 7, "chapter": 11, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -4810,7 +4700,7 @@ "previoustage": 1107, "order": 8, "chapter": 11, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -4945,7 +4835,7 @@ "previoustage": 0, "order": 1, "chapter": 12, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -4989,7 +4879,7 @@ "previoustage": 1201, "order": 2, "chapter": 12, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -5078,7 +4968,7 @@ "previoustage": 1202, "order": 4, "chapter": 12, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -5123,7 +5013,7 @@ "previoustage": 1204, "order": 5, "chapter": 12, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -5168,7 +5058,7 @@ "previoustage": 1205, "order": 6, "chapter": 12, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -5213,7 +5103,7 @@ "previoustage": 1206, "order": 7, "chapter": 12, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -5258,7 +5148,7 @@ "previoustage": 1207, "order": 8, "chapter": 12, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -5393,7 +5283,7 @@ "previoustage": 0, "order": 1, "chapter": 1, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -5437,7 +5327,7 @@ "previoustage": 101, "order": 2, "chapter": 1, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -5526,7 +5416,7 @@ "previoustage": 102, "order": 4, "chapter": 1, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -5571,7 +5461,7 @@ "previoustage": 104, "order": 5, "chapter": 1, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -5616,7 +5506,7 @@ "previoustage": 105, "order": 6, "chapter": 1, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -5661,7 +5551,7 @@ "previoustage": 106, "order": 7, "chapter": 1, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -5706,7 +5596,7 @@ "previoustage": 107, "order": 8, "chapter": 1, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -5841,7 +5731,7 @@ "previoustage": 0, "order": 1, "chapter": 2, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -5885,7 +5775,7 @@ "previoustage": 201, "order": 2, "chapter": 2, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -5974,7 +5864,7 @@ "previoustage": 202, "order": 4, "chapter": 2, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -6019,7 +5909,7 @@ "previoustage": 204, "order": 5, "chapter": 2, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -6064,7 +5954,7 @@ "previoustage": 205, "order": 6, "chapter": 2, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -6109,7 +5999,7 @@ "previoustage": 206, "order": 7, "chapter": 2, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -6154,7 +6044,7 @@ "previoustage": 207, "order": 8, "chapter": 2, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -6289,7 +6179,7 @@ "previoustage": 0, "order": 1, "chapter": 3, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -6333,7 +6223,7 @@ "previoustage": 301, "order": 2, "chapter": 3, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -6422,7 +6312,7 @@ "previoustage": 302, "order": 4, "chapter": 3, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -6467,7 +6357,7 @@ "previoustage": 304, "order": 5, "chapter": 3, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -6512,7 +6402,7 @@ "previoustage": 305, "order": 6, "chapter": 3, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -6557,7 +6447,7 @@ "previoustage": 306, "order": 7, "chapter": 3, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -6602,7 +6492,7 @@ "previoustage": 307, "order": 8, "chapter": 3, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -6737,7 +6627,7 @@ "previoustage": 0, "order": 1, "chapter": 4, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -6781,7 +6671,7 @@ "previoustage": 401, "order": 2, "chapter": 4, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -6870,7 +6760,7 @@ "previoustage": 402, "order": 4, "chapter": 4, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -6915,7 +6805,7 @@ "previoustage": 404, "order": 5, "chapter": 4, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -6960,7 +6850,7 @@ "previoustage": 405, "order": 6, "chapter": 4, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -7005,7 +6895,7 @@ "previoustage": 406, "order": 7, "chapter": 4, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -7050,7 +6940,7 @@ "previoustage": 407, "order": 8, "chapter": 4, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -7185,7 +7075,7 @@ "previoustage": 0, "order": 1, "chapter": 5, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -7229,7 +7119,7 @@ "previoustage": 501, "order": 2, "chapter": 5, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -7318,7 +7208,7 @@ "previoustage": 502, "order": 4, "chapter": 5, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -7363,7 +7253,7 @@ "previoustage": 504, "order": 5, "chapter": 5, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -7408,7 +7298,7 @@ "previoustage": 505, "order": 6, "chapter": 5, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -7453,7 +7343,7 @@ "previoustage": 506, "order": 7, "chapter": 5, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -7498,7 +7388,7 @@ "previoustage": 507, "order": 8, "chapter": 5, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -7633,7 +7523,7 @@ "previoustage": 0, "order": 1, "chapter": 6, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -7677,7 +7567,7 @@ "previoustage": 601, "order": 2, "chapter": 6, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -7766,7 +7656,7 @@ "previoustage": 602, "order": 4, "chapter": 6, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -7811,7 +7701,7 @@ "previoustage": 604, "order": 5, "chapter": 6, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -7856,7 +7746,7 @@ "previoustage": 605, "order": 6, "chapter": 6, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -7901,7 +7791,7 @@ "previoustage": 606, "order": 7, "chapter": 6, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -7946,7 +7836,7 @@ "previoustage": 607, "order": 8, "chapter": 6, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -8081,7 +7971,7 @@ "previoustage": 0, "order": 1, "chapter": 7, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -8125,7 +8015,7 @@ "previoustage": 701, "order": 2, "chapter": 7, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -8214,7 +8104,7 @@ "previoustage": 702, "order": 4, "chapter": 7, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -8259,7 +8149,7 @@ "previoustage": 704, "order": 5, "chapter": 7, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -8304,7 +8194,7 @@ "previoustage": 705, "order": 6, "chapter": 7, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -8349,7 +8239,7 @@ "previoustage": 706, "order": 7, "chapter": 7, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -8394,7 +8284,7 @@ "previoustage": 707, "order": 8, "chapter": 7, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -8529,7 +8419,7 @@ "previoustage": 0, "order": 1, "chapter": 8, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -8573,7 +8463,7 @@ "previoustage": 801, "order": 2, "chapter": 8, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -8662,7 +8552,7 @@ "previoustage": 802, "order": 4, "chapter": 8, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -8707,7 +8597,7 @@ "previoustage": 804, "order": 5, "chapter": 8, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -8752,7 +8642,7 @@ "previoustage": 805, "order": 6, "chapter": 8, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -8797,7 +8687,7 @@ "previoustage": 806, "order": 7, "chapter": 8, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -8842,7 +8732,7 @@ "previoustage": 807, "order": 8, "chapter": 8, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -8977,7 +8867,7 @@ "previoustage": 0, "order": 1, "chapter": 9, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -9021,7 +8911,7 @@ "previoustage": 901, "order": 2, "chapter": 9, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -9110,7 +9000,7 @@ "previoustage": 902, "order": 4, "chapter": 9, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -9155,7 +9045,7 @@ "previoustage": 904, "order": 5, "chapter": 9, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -9200,7 +9090,7 @@ "previoustage": 905, "order": 6, "chapter": 9, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -9245,7 +9135,7 @@ "previoustage": 906, "order": 7, "chapter": 9, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -9290,7 +9180,7 @@ "previoustage": 907, "order": 8, "chapter": 9, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -9425,7 +9315,7 @@ "previoustage": 0, "order": 1, "chapter": 10, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -9469,7 +9359,7 @@ "previoustage": 1001, "order": 2, "chapter": 10, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -9558,7 +9448,7 @@ "previoustage": 1002, "order": 4, "chapter": 10, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -9603,7 +9493,7 @@ "previoustage": 1004, "order": 5, "chapter": 10, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -9648,7 +9538,7 @@ "previoustage": 1005, "order": 6, "chapter": 10, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -9693,7 +9583,7 @@ "previoustage": 1006, "order": 7, "chapter": 10, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -9738,7 +9628,7 @@ "previoustage": 1007, "order": 8, "chapter": 10, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -9873,7 +9763,7 @@ "previoustage": 0, "order": 1, "chapter": 11, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -9917,7 +9807,7 @@ "previoustage": 1101, "order": 2, "chapter": 11, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -10006,7 +9896,7 @@ "previoustage": 1102, "order": 4, "chapter": 11, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -10051,7 +9941,7 @@ "previoustage": 1104, "order": 5, "chapter": 11, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -10096,7 +9986,7 @@ "previoustage": 1105, "order": 6, "chapter": 11, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -10141,7 +10031,7 @@ "previoustage": 1106, "order": 7, "chapter": 11, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -10186,7 +10076,7 @@ "previoustage": 1107, "order": 8, "chapter": 11, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -10321,7 +10211,7 @@ "previoustage": 0, "order": 1, "chapter": 12, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -10365,7 +10255,7 @@ "previoustage": 1201, "order": 2, "chapter": 12, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -10454,7 +10344,7 @@ "previoustage": 1202, "order": 4, "chapter": 12, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -10499,7 +10389,7 @@ "previoustage": 1204, "order": 5, "chapter": 12, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -10544,7 +10434,7 @@ "previoustage": 1205, "order": 6, "chapter": 12, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -10589,7 +10479,7 @@ "previoustage": 1206, "order": 7, "chapter": 12, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -10634,7 +10524,7 @@ "previoustage": 1207, "order": 8, "chapter": 12, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -10769,7 +10659,7 @@ "previoustage": 0, "order": 1, "chapter": 1, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -10813,7 +10703,7 @@ "previoustage": 101, "order": 2, "chapter": 1, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -10902,7 +10792,7 @@ "previoustage": 102, "order": 4, "chapter": 1, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -10947,7 +10837,7 @@ "previoustage": 104, "order": 5, "chapter": 1, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -10992,7 +10882,7 @@ "previoustage": 105, "order": 6, "chapter": 1, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -11037,7 +10927,7 @@ "previoustage": 106, "order": 7, "chapter": 1, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -11082,7 +10972,7 @@ "previoustage": 107, "order": 8, "chapter": 1, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -11217,7 +11107,7 @@ "previoustage": 0, "order": 1, "chapter": 2, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -11261,7 +11151,7 @@ "previoustage": 201, "order": 2, "chapter": 2, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -11350,7 +11240,7 @@ "previoustage": 202, "order": 4, "chapter": 2, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -11395,7 +11285,7 @@ "previoustage": 204, "order": 5, "chapter": 2, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -11440,7 +11330,7 @@ "previoustage": 205, "order": 6, "chapter": 2, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -11485,7 +11375,7 @@ "previoustage": 206, "order": 7, "chapter": 2, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -11530,7 +11420,7 @@ "previoustage": 207, "order": 8, "chapter": 2, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -11665,7 +11555,7 @@ "previoustage": 0, "order": 1, "chapter": 3, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -11709,7 +11599,7 @@ "previoustage": 301, "order": 2, "chapter": 3, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -11798,7 +11688,7 @@ "previoustage": 302, "order": 4, "chapter": 3, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -11843,7 +11733,7 @@ "previoustage": 304, "order": 5, "chapter": 3, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -11888,7 +11778,7 @@ "previoustage": 305, "order": 6, "chapter": 3, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -11933,7 +11823,7 @@ "previoustage": 306, "order": 7, "chapter": 3, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -11978,7 +11868,7 @@ "previoustage": 307, "order": 8, "chapter": 3, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -12113,7 +12003,7 @@ "previoustage": 0, "order": 1, "chapter": 4, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -12157,7 +12047,7 @@ "previoustage": 401, "order": 2, "chapter": 4, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -12246,7 +12136,7 @@ "previoustage": 402, "order": 4, "chapter": 4, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -12291,7 +12181,7 @@ "previoustage": 404, "order": 5, "chapter": 4, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -12336,7 +12226,7 @@ "previoustage": 405, "order": 6, "chapter": 4, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -12381,7 +12271,7 @@ "previoustage": 406, "order": 7, "chapter": 4, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -12426,7 +12316,7 @@ "previoustage": 407, "order": 8, "chapter": 4, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -12561,7 +12451,7 @@ "previoustage": 0, "order": 1, "chapter": 5, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -12605,7 +12495,7 @@ "previoustage": 501, "order": 2, "chapter": 5, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -12694,7 +12584,7 @@ "previoustage": 502, "order": 4, "chapter": 5, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -12739,7 +12629,7 @@ "previoustage": 504, "order": 5, "chapter": 5, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -12784,7 +12674,7 @@ "previoustage": 505, "order": 6, "chapter": 5, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -12829,7 +12719,7 @@ "previoustage": 506, "order": 7, "chapter": 5, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -12874,7 +12764,7 @@ "previoustage": 507, "order": 8, "chapter": 5, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -13009,7 +12899,7 @@ "previoustage": 0, "order": 1, "chapter": 6, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -13053,7 +12943,7 @@ "previoustage": 601, "order": 2, "chapter": 6, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -13142,7 +13032,7 @@ "previoustage": 602, "order": 4, "chapter": 6, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -13187,7 +13077,7 @@ "previoustage": 604, "order": 5, "chapter": 6, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -13232,7 +13122,7 @@ "previoustage": 605, "order": 6, "chapter": 6, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -13277,7 +13167,7 @@ "previoustage": 606, "order": 7, "chapter": 6, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -13322,7 +13212,7 @@ "previoustage": 607, "order": 8, "chapter": 6, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -13457,7 +13347,7 @@ "previoustage": 0, "order": 1, "chapter": 7, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -13501,7 +13391,7 @@ "previoustage": 701, "order": 2, "chapter": 7, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -13590,7 +13480,7 @@ "previoustage": 702, "order": 4, "chapter": 7, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -13635,7 +13525,7 @@ "previoustage": 704, "order": 5, "chapter": 7, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -13680,7 +13570,7 @@ "previoustage": 705, "order": 6, "chapter": 7, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -13725,7 +13615,7 @@ "previoustage": 706, "order": 7, "chapter": 7, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -13770,7 +13660,7 @@ "previoustage": 707, "order": 8, "chapter": 7, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -13905,7 +13795,7 @@ "previoustage": 0, "order": 1, "chapter": 8, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -13949,7 +13839,7 @@ "previoustage": 801, "order": 2, "chapter": 8, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -14038,7 +13928,7 @@ "previoustage": 802, "order": 4, "chapter": 8, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -14083,7 +13973,7 @@ "previoustage": 804, "order": 5, "chapter": 8, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -14128,7 +14018,7 @@ "previoustage": 805, "order": 6, "chapter": 8, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -14173,7 +14063,7 @@ "previoustage": 806, "order": 7, "chapter": 8, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -14218,7 +14108,7 @@ "previoustage": 807, "order": 8, "chapter": 8, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -14353,7 +14243,7 @@ "previoustage": 0, "order": 1, "chapter": 9, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -14397,7 +14287,7 @@ "previoustage": 901, "order": 2, "chapter": 9, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -14486,7 +14376,7 @@ "previoustage": 902, "order": 4, "chapter": 9, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -14531,7 +14421,7 @@ "previoustage": 904, "order": 5, "chapter": 9, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -14576,7 +14466,7 @@ "previoustage": 905, "order": 6, "chapter": 9, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -14621,7 +14511,7 @@ "previoustage": 906, "order": 7, "chapter": 9, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -14666,7 +14556,7 @@ "previoustage": 907, "order": 8, "chapter": 9, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -14801,7 +14691,7 @@ "previoustage": 0, "order": 1, "chapter": 10, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -14845,7 +14735,7 @@ "previoustage": 1001, "order": 2, "chapter": 10, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -14934,7 +14824,7 @@ "previoustage": 1002, "order": 4, "chapter": 10, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -14979,7 +14869,7 @@ "previoustage": 1004, "order": 5, "chapter": 10, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -15024,7 +14914,7 @@ "previoustage": 1005, "order": 6, "chapter": 10, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -15069,7 +14959,7 @@ "previoustage": 1006, "order": 7, "chapter": 10, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -15114,7 +15004,7 @@ "previoustage": 1007, "order": 8, "chapter": 10, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -15249,7 +15139,7 @@ "previoustage": 0, "order": 1, "chapter": 11, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -15293,7 +15183,7 @@ "previoustage": 1101, "order": 2, "chapter": 11, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -15382,7 +15272,7 @@ "previoustage": 1102, "order": 4, "chapter": 11, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -15427,7 +15317,7 @@ "previoustage": 1104, "order": 5, "chapter": 11, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -15472,7 +15362,7 @@ "previoustage": 1105, "order": 6, "chapter": 11, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -15517,7 +15407,7 @@ "previoustage": 1106, "order": 7, "chapter": 11, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -15562,7 +15452,7 @@ "previoustage": 1107, "order": 8, "chapter": 11, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 @@ -15697,7 +15587,7 @@ "previoustage": 0, "order": 1, "chapter": 12, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1045, "y": 1389 @@ -15741,7 +15631,7 @@ "previoustage": 1201, "order": 2, "chapter": 12, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1367, "y": 1371 @@ -15830,7 +15720,7 @@ "previoustage": 1202, "order": 4, "chapter": 12, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1907, "y": 1453 @@ -15875,7 +15765,7 @@ "previoustage": 1204, "order": 5, "chapter": 12, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1961, "y": 1173 @@ -15920,7 +15810,7 @@ "previoustage": 1205, "order": 6, "chapter": 12, - "Episodetype": 5, + "Episodetype": 1, "Episodelocation": { "x": 1479, "y": 1041 @@ -15965,7 +15855,7 @@ "previoustage": 1206, "order": 7, "chapter": 12, - "Episodetype": 1, + "Episodetype": 7, "Episodelocation": { "x": 1209, "y": 979 @@ -16010,7 +15900,7 @@ "previoustage": 1207, "order": 8, "chapter": 12, - "Episodetype": 7, + "Episodetype": 1, "Episodelocation": { "x": 1051, "y": 665 diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 789e6236c..da671aaa4 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -1586,7 +1586,7 @@ { "id": "44005", "preson": "44005", - "presonshow": "44005", + "presonshow": "44005_exhibition", "presonstory": "44005_story", "height": 1.5, "weight": 0.3, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 9c00c6b76..118f6182d 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -2690,7 +2690,7 @@ "ExecuteCnt": 1, "Type": 1, "Argu": [ - 1, + 2, 4, 300, 1, @@ -2734,7 +2734,7 @@ "ExecuteCnt": 1, "Type": 1, "Argu": [ - 1, + 2, 4, 300, 1, @@ -2778,7 +2778,7 @@ "ExecuteCnt": 1, "Type": 1, "Argu": [ - 1, + 2, 4, 300, 1, @@ -2822,7 +2822,7 @@ "ExecuteCnt": 1, "Type": 1, "Argu": [ - 1, + 2, 4, 300, 1, @@ -2866,7 +2866,7 @@ "ExecuteCnt": 1, "Type": 1, "Argu": [ - 1, + 2, 4, 300, 1, diff --git a/sys/configure/structs/Game.Ip.go b/sys/configure/structs/Game.Ip.go new file mode 100644 index 000000000..5ded32dd8 --- /dev/null +++ b/sys/configure/structs/Game.Ip.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameIp struct { + _dataMap map[int32]*GameIpData + _dataList []*GameIpData +} + +func NewGameIp(_buf []map[string]interface{}) (*GameIp, error) { + _dataList := make([]*GameIpData, 0, len(_buf)) + dataMap := make(map[int32]*GameIpData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameIpData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.IpId] = _v + } + } + return &GameIp{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameIp) GetDataMap() map[int32]*GameIpData { + return table._dataMap +} + +func (table *GameIp) GetDataList() []*GameIpData { + return table._dataList +} + +func (table *GameIp) Get(key int32) *GameIpData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.IpData.go b/sys/configure/structs/Game.IpData.go new file mode 100644 index 000000000..2b5815a81 --- /dev/null +++ b/sys/configure/structs/Game.IpData.go @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameIpData struct { + IpId int32 + IpIcon string +} + +const TypeId_GameIpData = -59343123 + +func (*GameIpData) GetTypeId() int32 { + return -59343123 +} + +func (_v *GameIpData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ip_id"].(float64); !_ok_ { err = errors.New("ip_id error"); return }; _v.IpId = int32(_tempNum_) } + { var _ok_ bool; if _v.IpIcon, _ok_ = _buf["ip_icon"].(string); !_ok_ { err = errors.New("ip_icon error"); return } } + return +} + +func DeserializeGameIpData(_buf map[string]interface{}) (*GameIpData, error) { + v := &GameIpData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 14355461e..a97ba2c59 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -98,6 +98,7 @@ type Tables struct { LibraryHistory *GameLibraryHistory LibraryFavor *GameLibraryFavor Robot *GameRobot + Ip *GameIp } func NewTables(loader JsonLoader) (*Tables, error) { @@ -627,5 +628,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.Robot, err = NewGameRobot(buf) ; err != nil { return nil, err } + if buf, err = loader("game_ip") ; err != nil { + return nil, err + } + if tables.Ip, err = NewGameIp(buf) ; err != nil { + return nil, err + } return tables, nil } From 484d889c57ff9df78a48c5783cea96e56be8f465 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 16 Sep 2022 21:18:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=87=91=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/robot/hero.go | 11 +---------- modules/hero/hero_test.go | 41 +++++++++++++++++++++++++++++++++++++++ modules/user/api_login.go | 6 +++--- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index 520787e47..708b03ba8 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -41,22 +41,13 @@ var ( }, }, }, - rsp: &pb.HeroStrengthenUplvResp{}, + rsp: &pb.HeroStrengthenUplvResp{}, // enabled: true, } tcs = append(tcs, tc) } robot.addBuilders(tcs) }, - }, { - desc: "抽卡", - mainType: string(comm.ModuleHero), - subType: hero.HeroSubTypeChouka, - req: &pb.HeroChoukaReq{ - HeroIds: []string{"14001"}, - }, - rsp: &pb.HeroChoukaResp{}, - // enabled: true, }, { desc: "英雄列表", mainType: string(comm.ModuleHero), diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index 9ebf8b116..619b2f6e6 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -18,11 +18,14 @@ import ( "go_dreamfactory/sys/configure" "go_dreamfactory/sys/db" "reflect" + "strings" "testing" "time" "github.com/golang/protobuf/ptypes" "go.mongodb.org/mongo-driver/bson/primitive" + + flag "github.com/spf13/pflag" ) var service core.IService @@ -108,7 +111,45 @@ func CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) { newHero.Id = primitive.NewObjectID().Hex() return } +func wordSepNormalizeFunc(f *flag.FlagSet, name string) flag.NormalizedName { + from := []string{"-", "_"} + to := "." + for _, sep := range from { + name = strings.Replace(name, sep, to, -1) + } + return flag.NormalizedName(name) +} func Test_Modules(t *testing.T) { + var cliName = flag.StringP("name", "n", "nick", "Input Your Name") + var cliAge = flag.IntP("age", "a", 22, "Input Your Age") + var cliGender = flag.StringP("gender", "g", "male", "Input Your Gender") + var cliOK = flag.BoolP("ok", "o", false, "Input Are You OK") + var cliDes = flag.StringP("des-detail", "d", "", "Input Description") + var cliOldFlag = flag.StringP("badflag", "b", "just for test", "Input badflag") + flag.CommandLine.SetNormalizeFunc(wordSepNormalizeFunc) + + // 为 age 参数设置 NoOptDefVal 默认值，通过简便的方式为参数设置默认值之外的值 + flag.Lookup("age").NoOptDefVal = "25" + + // 把 badflag 参数标记为即将废弃的，请用户使用 des-detail 参数 + flag.CommandLine.MarkDeprecated("badflag", "please use --des-detail instead") + + // 把 badflag 参数的 shorthand 标记为即将废弃的，请用户使用 des-detail 的 shorthand 参数 + flag.CommandLine.MarkShorthandDeprecated("badflag", "please use -d instead") + + // 在帮助文档中隐藏参数 gender + flag.CommandLine.MarkHidden("badflag") + + // 把用户传递的命令行参数解析为对应变量的值 + flag.Parse() + + fmt.Println("name=", *cliName) + fmt.Println("age=", *cliAge) + fmt.Println("gender=", *cliGender) + fmt.Println("ok=", *cliOK) + fmt.Println("des=", *cliDes) + fmt.Println("cliOldFlag=", *cliOldFlag) + oldHero := new(pb.DBHero) new := copyPoint(oldHero) fmt.Printf("%v", new) diff --git a/modules/user/api_login.go b/modules/user/api_login.go index f87141b85..8df29b6d9 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -153,9 +153,9 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod N: 1, } atn2 := &pb.UserAssets{ - A: "item", - T: "10001", - N: 100, + A: "attr", + T: "gold", + N: 10000, } fj = append(fj, atn1) fj = append(fj, atn2) From 451ce531ba325f22ad959bcb14ba2810c14d02f0 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 16 Sep 2022 21:35:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_heroskilllevel.json | 396 +++++++++++++++++--- bin/json/game_herostarup.json | 468 +++++++++++++++++------ bin/json/game_item.json | 68 +++- bin/json/game_mainlinechapter.json | 72 ++-- bin/json/game_model.json | 4 +- bin/json/game_skillatk.json | 582 ++++++++++++++--------------- 6 files changed, 1080 insertions(+), 510 deletions(-) diff --git a/bin/json/game_heroskilllevel.json b/bin/json/game_heroskilllevel.json index d786c0f10..fd13dc0a0 100644 --- a/bin/json/game_heroskilllevel.json +++ b/bin/json/game_heroskilllevel.json @@ -1,6 +1,6 @@ [ { - "id": 125004011, + "id": 125001111, "probability": [ 300, 255, @@ -24,7 +24,7 @@ ] }, { - "id": 125004211, + "id": 144006111, "probability": [ 300, 255, @@ -36,7 +36,7 @@ ] }, { - "id": 125004311, + "id": 135001111, "probability": [ 300, 255, @@ -48,7 +48,7 @@ ] }, { - "id": 125001011, + "id": 144005111, "probability": [ 300, 255, @@ -60,7 +60,7 @@ ] }, { - "id": 125001111, + "id": 115004111, "probability": [ 300, 255, @@ -72,7 +72,7 @@ ] }, { - "id": 125001211, + "id": 124002111, "probability": [ 300, 255, @@ -84,7 +84,7 @@ ] }, { - "id": 125001311, + "id": 114007111, "probability": [ 300, 255, @@ -96,7 +96,7 @@ ] }, { - "id": 135002011, + "id": 145003111, "probability": [ 300, 255, @@ -108,7 +108,7 @@ ] }, { - "id": 135002111, + "id": 124004111, "probability": [ 300, 255, @@ -120,7 +120,7 @@ ] }, { - "id": 135002211, + "id": 114003111, "probability": [ 300, 255, @@ -132,7 +132,7 @@ ] }, { - "id": 135002311, + "id": 135003111, "probability": [ 300, 255, @@ -144,7 +144,7 @@ ] }, { - "id": 134006011, + "id": 115005111, "probability": [ 300, 255, @@ -167,42 +167,6 @@ 100 ] }, - { - "id": 134006211, - "probability": [ - 300, - 255, - 200, - 100, - 100, - 100, - 100 - ] - }, - { - "id": 134006311, - "probability": [ - 300, - 255, - 200, - 100, - 100, - 100, - 100 - ] - }, - { - "id": 124003011, - "probability": [ - 300, - 255, - 200, - 100, - 100, - 100, - 100 - ] - }, { "id": 124003111, "probability": [ @@ -215,6 +179,174 @@ 100 ] }, + { + "id": 125001211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 125004211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 144006211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 135001211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 144005211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 115004211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 124002211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 114007211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 145003211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 124004211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 114003211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 135003211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 115005211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 134006211, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, { "id": 124003211, "probability": [ @@ -227,6 +359,174 @@ 100 ] }, + { + "id": 125001311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 125004311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 144006311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 135001311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 144005311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 115004311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 124002311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 114007311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 145003311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 124004311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 114003311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 135003311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 115005311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, + { + "id": 134006311, + "probability": [ + 300, + 255, + 200, + 100, + 100, + 100, + 100 + ] + }, { "id": 124003311, "probability": [ diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index f7c9886c4..ac1fdb2ba 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -2,86 +2,81 @@ { "key": 1, "id": "25001", - "star": 4, - "needhero": "25001", - "needherostar": 4, - "needheronum": 1, + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, "needrace": [ - 2 + 1, + 2, + 3, + 4 ], - "needracestar": 4, - "needracenum": 4, + "needracestar": 5, + "needracenum": 5, "gold": 10000 }, { "key": 2, "id": "25001", - "star": 5, - "needhero": "25001", - "needherostar": 5, - "needheronum": 1, - "needrace": [ - 2 - ], - "needracestar": 5, - "needracenum": 4, - "gold": 10000 + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 }, { "key": 3, - "id": "25001", - "star": 6, + "id": "14003", + "star": 5, "needhero": "", "needherostar": 0, "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0 + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 }, { "key": 4, - "id": "25002", - "star": 5, - "needhero": "25002", - "needherostar": 5, - "needheronum": 1, - "needrace": [ - 2 - ], - "needracestar": 5, - "needracenum": 4, - "gold": 10000 + "id": "14003", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 }, { "key": 5, - "id": "25002", - "star": 6, + "id": "14007", + "star": 5, "needhero": "", "needherostar": 0, "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0 - }, - { - "key": 6, - "id": "25003", - "star": 5, - "needhero": "25003", - "needherostar": 5, - "needheronum": 1, "needrace": [ - 2 + 1, + 2, + 3, + 4 ], "needracestar": 5, - "needracenum": 4, + "needracenum": 5, "gold": 10000 }, { - "key": 7, - "id": "25003", + "key": 6, + "id": "14007", "star": 6, "needhero": "", "needherostar": 0, @@ -91,23 +86,26 @@ "needracenum": 0, "gold": 0 }, + { + "key": 7, + "id": "15004", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, { "key": 8, "id": "15004", - "star": 5, - "needhero": "15004", - "needherostar": 5, - "needheronum": 1, - "needrace": [ - 1 - ], - "needracestar": 5, - "needracenum": 4, - "gold": 10000 - }, - { - "key": 9, - "id": "15004", "star": 6, "needhero": "", "needherostar": 0, @@ -118,46 +116,12 @@ "gold": 0 }, { - "key": 10, - "id": "43901", - "star": 3, - "needhero": "43901", - "needherostar": 3, - "needheronum": 1, - "needrace": [ - 1, - 2, - 3, - 4 - ], - "needracestar": 3, - "needracenum": 4, - "gold": 10000 - }, - { - "key": 11, - "id": "43901", - "star": 4, - "needhero": "43901", - "needherostar": 4, - "needheronum": 1, - "needrace": [ - 1, - 2, - 3, - 4 - ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000 - }, - { - "key": 12, - "id": "43901", + "key": 9, + "id": "15005", "star": 5, - "needhero": "43901", - "needherostar": 5, - "needheronum": 1, + "needhero": "", + "needherostar": 0, + "needheronum": 0, "needrace": [ 1, 2, @@ -165,12 +129,302 @@ 4 ], "needracestar": 5, - "needracenum": 4, + "needracenum": 5, "gold": 10000 }, + { + "key": 10, + "id": "15005", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, + { + "key": 11, + "id": "24002", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 12, + "id": "24002", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, { "key": 13, - "id": "43901", + "id": "24003", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 14, + "id": "24003", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, + { + "key": 15, + "id": "24004", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 16, + "id": "24004", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, + { + "key": 17, + "id": "25004", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 18, + "id": "25004", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, + { + "key": 19, + "id": "34006", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 20, + "id": "34006", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, + { + "key": 21, + "id": "35001", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 22, + "id": "35001", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, + { + "key": 23, + "id": "35003", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 24, + "id": "35003", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, + { + "key": 25, + "id": "44005", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 26, + "id": "44005", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, + { + "key": 27, + "id": "44006", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 28, + "id": "44006", + "star": 6, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [], + "needracestar": 0, + "needracenum": 0, + "gold": 0 + }, + { + "key": 29, + "id": "45003", + "star": 5, + "needhero": "", + "needherostar": 0, + "needheronum": 0, + "needrace": [ + 1, + 2, + 3, + 4 + ], + "needracestar": 5, + "needracenum": 5, + "gold": 10000 + }, + { + "key": 30, + "id": "45003", "star": 6, "needhero": "", "needherostar": 0, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index d6172c8bb..842840df3 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -57,7 +57,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -98,7 +100,9 @@ "effects": "", "box_id": 10002, "synthetize_num": 50, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": -1, "uselv": 0, @@ -139,7 +143,9 @@ "effects": "", "box_id": 20001, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -180,7 +186,9 @@ "effects": "", "box_id": 20002, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -221,7 +229,9 @@ "effects": "", "box_id": 20003, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -262,7 +272,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -303,7 +315,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -344,7 +358,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -385,7 +401,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -426,7 +444,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -467,7 +487,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -508,7 +530,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -549,7 +573,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -590,7 +616,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -631,7 +659,9 @@ "effects": "", "box_id": 0, "synthetize_num": 0, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": 999, "uselv": 0, @@ -672,7 +702,9 @@ "effects": "", "box_id": 10001, "synthetize_num": 50, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": -1, "uselv": 0, @@ -713,7 +745,9 @@ "effects": "", "box_id": 10002, "synthetize_num": 50, - "access": [], + "access": [ + 122 + ], "use_skip": 0, "upper_limit": -1, "uselv": 0, diff --git a/bin/json/game_mainlinechapter.json b/bin/json/game_mainlinechapter.json index c40043f82..b2619dead 100644 --- a/bin/json/game_mainlinechapter.json +++ b/bin/json/game_mainlinechapter.json @@ -18,7 +18,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10001", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 101, @@ -34,8 +34,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -63,7 +63,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10002", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 201, @@ -79,8 +79,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -108,7 +108,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10003", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 301, @@ -124,8 +124,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -153,7 +153,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10004", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 401, @@ -169,8 +169,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -198,7 +198,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10005", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 501, @@ -214,8 +214,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -243,7 +243,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10006", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 601, @@ -259,8 +259,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -288,7 +288,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10007", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 701, @@ -304,8 +304,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -333,7 +333,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10008", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 801, @@ -349,8 +349,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -378,7 +378,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10009", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 901, @@ -394,8 +394,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -423,7 +423,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10010", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 1001, @@ -439,8 +439,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -468,7 +468,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10009", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 1101, @@ -484,8 +484,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", @@ -513,7 +513,7 @@ "icon": "wp_icon_0002", "text": { "key": "mainline_text_10010", - "text": "金币5000" + "text": "金币40000" }, "Episode": [ 1201, @@ -529,8 +529,8 @@ "award": [ { "a": "item", - "t": "1", - "n": 1 + "t": "diamond", + "n": 50 }, { "a": "attr", diff --git a/bin/json/game_model.json b/bin/json/game_model.json index da671aaa4..698cfcd15 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -602,7 +602,7 @@ { "id": "24004", "preson": "24004", - "presonshow": "24004", + "presonshow": "24004_exhibition", "presonstory": "24004", "height": 1, "weight": 1, @@ -1178,7 +1178,7 @@ { "id": "35001", "preson": "35001", - "presonshow": "35001", + "presonshow": "35001_exhibition", "presonstory": "35001_story", "height": 1, "weight": 1, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 48d0b44b2..b95394514 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -756,7 +756,7 @@ ] }, "Desc": { - "key": "skill_9350023211", + "key": "skill_9350024111", "text": "攻击全体敌方3次，每次伤害为自身攻击力35%。每次有80%概率驱散目标1个增益，为目标附加2回合【失手率提升】。延迟目标减益状态1回合。" }, "buffid": [], @@ -781,7 +781,7 @@ ] }, "Desc": { - "key": "skill_9350023212", + "key": "skill_9350024112", "text": "伤害提升至37" }, "buffid": [], @@ -806,7 +806,7 @@ ] }, "Desc": { - "key": "skill_9350023213", + "key": "skill_9350024113", "text": "效果触发几率提升至90%" }, "buffid": [], @@ -831,7 +831,7 @@ ] }, "Desc": { - "key": "skill_9350023214", + "key": "skill_9350024114", "text": "伤害提升至40%" }, "buffid": [], @@ -856,7 +856,7 @@ ] }, "Desc": { - "key": "skill_9350023215", + "key": "skill_9350024115", "text": "效果触发几率提升至100%" }, "buffid": [], @@ -881,7 +881,7 @@ ] }, "Desc": { - "key": "skill_9350023216", + "key": "skill_9350024116", "text": "冷却时间减少1回合" }, "buffid": [], @@ -1062,8 +1062,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1240032111", + "text": "二技能：睡神沙人为我方全体各净化1个减益状态，并附加2回合【速度提升】。" }, "buffid": [], "map": "" @@ -1088,8 +1088,8 @@ ] }, "Desc": { - "key": "skill_1240032111", - "text": "二技能：睡神沙人为我方全体各净化1个减益状态，并附加2回合【速度提升】。" + "key": "skill_1240032112", + "text": "冷却时间减少1回合" }, "buffid": [], "map": "" @@ -1115,8 +1115,8 @@ ] }, "Desc": { - "key": "skill_1240032112", - "text": "冷却时间减少1回合" + "key": "skill_1240033111", + "text": "三技能：睡神沙人对敌方全体造成攻击力80%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合【睡眠】状态。" }, "buffid": [], "map": "" @@ -1142,8 +1142,8 @@ ] }, "Desc": { - "key": "skill_1240033111", - "text": "三技能：睡神沙人对敌方全体造成攻击力80%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合【睡眠】状态。" + "key": "skill_1240033112", + "text": "等级2 降低的行动值提升至25%" }, "buffid": [], "map": "" @@ -1169,8 +1169,8 @@ ] }, "Desc": { - "key": "skill_1240033112", - "text": "等级2 降低的行动值提升至25%" + "key": "skill_1240033113", + "text": "等级3 效果触发几率提升至90%" }, "buffid": [], "map": "" @@ -1196,8 +1196,8 @@ ] }, "Desc": { - "key": "skill_1240033113", - "text": "等级3 效果触发几率提升至90%" + "key": "skill_1240033114", + "text": "等级4 降低的行动值提升至30%" }, "buffid": [], "map": "" @@ -1223,8 +1223,8 @@ ] }, "Desc": { - "key": "skill_1240033114", - "text": "等级4 降低的行动值提升至30%" + "key": "skill_1240033115", + "text": "等级5 效果触发几率提升至100%" }, "buffid": [], "map": "" @@ -1250,8 +1250,8 @@ ] }, "Desc": { - "key": "skill_1240033115", - "text": "等级5 效果触发几率提升至100%" + "key": "skill_1240033116", + "text": "等级6 冷却时间减少1回合" }, "buffid": [], "map": "" @@ -1277,8 +1277,8 @@ ] }, "Desc": { - "key": "skill_1240033116", - "text": "等级6 冷却时间减少1回合" + "key": "skill_9240034111", + "text": "二技能：睡神沙人为我方全体各净化1个减益状态，并附加2回合【速度提升】和1回合【防御提升】状态。" }, "buffid": [], "map": "" @@ -1304,8 +1304,8 @@ ] }, "Desc": { - "key": "skill_9240034111", - "text": "二技能：睡神沙人为我方全体各净化1个减益状态，并附加2回合【速度提升】和1回合【防御提升】状态。" + "key": "skill_9240034112", + "text": "冷却时间减少1回合" }, "buffid": [], "map": "" @@ -1329,8 +1329,8 @@ ] }, "Desc": { - "key": "skill_9240034112", - "text": "冷却时间减少1回合" + "key": "skill_1340060111", + "text": "全体速度提升20%" }, "buffid": [], "map": "" @@ -1354,8 +1354,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340061111", + "text": "对敌方1个目标造成2次攻击力50%的伤害,有60%概率为目标附加2回合【速度下降】" }, "buffid": [], "map": "" @@ -1379,8 +1379,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340061112", + "text": "伤害提升至55%" }, "buffid": [], "map": "" @@ -1404,8 +1404,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340061113", + "text": "效果触发几率提升至70%" }, "buffid": [], "map": "" @@ -1429,8 +1429,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340061114", + "text": "伤害提升至60%" }, "buffid": [], "map": "" @@ -1454,8 +1454,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340061115", + "text": "效果触发几率提升至80%" }, "buffid": [], "map": "" @@ -1479,8 +1479,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340062111", + "text": "攻击全体敌方，伤害为自身攻击力70%，70%概率降低目标30%行动值；" }, "buffid": [], "map": "" @@ -1504,8 +1504,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340062112", + "text": "伤害提升至75%" }, "buffid": [], "map": "" @@ -1529,8 +1529,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340062113", + "text": "效果触发几率提升至80%" }, "buffid": [], "map": "" @@ -1554,8 +1554,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340062114", + "text": "伤害提升至80%" }, "buffid": [], "map": "" @@ -1579,8 +1579,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340062115", + "text": "冷却时间减少1回合" }, "buffid": [], "map": "" @@ -1604,8 +1604,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340063111", + "text": "攻击敌方全体，伤害为自身攻击力100%，90%概率为目标附加2回合【速度下降】和1回合【冰冻】" }, "buffid": [], "map": "" @@ -1629,8 +1629,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340063112", + "text": "伤害提升至105%" }, "buffid": [], "map": "" @@ -1654,8 +1654,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340063113", + "text": "效果触发几率提升至100%" }, "buffid": [], "map": "" @@ -1679,8 +1679,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340063114", + "text": "伤害提升至110%" }, "buffid": [], "map": "" @@ -1704,8 +1704,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1340063115", + "text": "冷却时间减少1回合" }, "buffid": [], "map": "" @@ -1729,8 +1729,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_9340064111", + "text": "攻击全体敌方，伤害为自身攻击力70%，70%概率降低目标30%行动值；目标有【速度下降】时，降低行动值翻倍。" }, "buffid": [], "map": "" @@ -1754,8 +1754,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_9340064112", + "text": "伤害提升至75%" }, "buffid": [], "map": "" @@ -1779,8 +1779,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_9340064113", + "text": "效果触发几率提升至80%" }, "buffid": [], "map": "" @@ -1804,8 +1804,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_9340064114", + "text": "伤害提升至80%" }, "buffid": [], "map": "" @@ -1829,8 +1829,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_9340064115", + "text": "冷却时间减少1回合" }, "buffid": [], "map": "" @@ -1854,8 +1854,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250010111", + "text": "我方全体防御增加30%" }, "buffid": [], "map": "" @@ -1879,8 +1879,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250011111", + "text": "对敌方1个目标造成2次攻击力30%及防御力50%的伤害,有50%概率为目标附加2回合【攻击下降】" }, "buffid": [], "map": "" @@ -1904,8 +1904,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250011112", + "text": "防御伤害比例提升至60%" }, "buffid": [], "map": "" @@ -1929,8 +1929,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250011113", + "text": "效果触发几率提升至60%" }, "buffid": [], "map": "" @@ -1954,8 +1954,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250011114", + "text": "防御伤害比例提升至70%" }, "buffid": [], "map": "" @@ -1979,8 +1979,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250011115", + "text": "效果触发几率提升至75%" }, "buffid": [], "map": "" @@ -2004,8 +2004,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250012111", + "text": "回合结束时获得1回合【引雷】，效果期间回合开始时攻击全体敌方，伤害为自身防御力90%。" }, "buffid": [], "map": "" @@ -2029,8 +2029,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250012112", + "text": "防御伤害比例提升至95%" }, "buffid": [], "map": "" @@ -2054,8 +2054,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250012113", + "text": "防御伤害比例提升至100%" }, "buffid": [], "map": "" @@ -2079,8 +2079,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250012114", + "text": "防御伤害比例提升至110%" }, "buffid": [], "map": "" @@ -2104,8 +2104,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250012115", + "text": "冷却时间减少1回合" }, "buffid": [], "map": "" @@ -2129,8 +2129,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013121", + "text": "回合结束时获得1回合【引雷】，效果期间回合开始时攻击全体敌方，伤害为自身防御力90%。任一技能暴击时冷却时间减少1回合" }, "buffid": [], "map": "" @@ -2154,8 +2154,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013122", + "text": "防御伤害比例提升至95%" }, "buffid": [], "map": "" @@ -2179,8 +2179,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013123", + "text": "防御伤害比例提升至100%" }, "buffid": [], "map": "" @@ -2204,8 +2204,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013124", + "text": "防御伤害比例提升至110%" }, "buffid": [], "map": "" @@ -2229,8 +2229,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013125", + "text": "冷却时间减少1回合" }, "buffid": [], "map": "" @@ -2256,8 +2256,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013111", + "text": "攻击1个敌方，伤害为自身攻击力80%及防御力100%，为自身附加2回合【防御提升】和【免疫】。" }, "buffid": [], "map": "" @@ -2283,8 +2283,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013112", + "text": "防御伤害比例提升至110%" }, "buffid": [], "map": "" @@ -2310,8 +2310,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013113", + "text": "防御伤害比例提升至120%" }, "buffid": [], "map": "" @@ -2337,8 +2337,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013114", + "text": "防御伤害比例提升至140%" }, "buffid": [], "map": "" @@ -2364,8 +2364,8 @@ ] }, "Desc": { - "key": "", - "text": "" + "key": "skill_1250013115", + "text": "冷却时间减少1回合" }, "buffid": [], "map": "" @@ -2390,7 +2390,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9250014111", "text": "" }, "buffid": [], @@ -2416,7 +2416,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9250014112", "text": "" }, "buffid": [], @@ -2442,7 +2442,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9250014113", "text": "" }, "buffid": [], @@ -2468,7 +2468,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9250014114", "text": "" }, "buffid": [], @@ -2494,7 +2494,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9250014115", "text": "" }, "buffid": [], @@ -2519,7 +2519,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440050111", "text": "" }, "buffid": [], @@ -2544,7 +2544,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440051111", "text": "" }, "buffid": [], @@ -2569,7 +2569,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440051112", "text": "" }, "buffid": [], @@ -2594,7 +2594,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440051113", "text": "" }, "buffid": [], @@ -2619,7 +2619,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440051114", "text": "" }, "buffid": [], @@ -2644,7 +2644,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440051115", "text": "" }, "buffid": [], @@ -2669,7 +2669,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440052111", "text": "" }, "buffid": [], @@ -2694,7 +2694,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440052112", "text": "" }, "buffid": [], @@ -2719,7 +2719,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440052113", "text": "" }, "buffid": [], @@ -2744,7 +2744,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440052114", "text": "" }, "buffid": [], @@ -2769,7 +2769,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440052115", "text": "" }, "buffid": [], @@ -2796,7 +2796,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440053111", "text": "" }, "buffid": [], @@ -2823,7 +2823,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440053112", "text": "" }, "buffid": [], @@ -2850,7 +2850,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440053113", "text": "" }, "buffid": [], @@ -2877,7 +2877,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440053114", "text": "" }, "buffid": [], @@ -2904,7 +2904,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440053115", "text": "" }, "buffid": [], @@ -2932,7 +2932,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440054111", "text": "" }, "buffid": [], @@ -2960,7 +2960,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440054112", "text": "" }, "buffid": [], @@ -2988,7 +2988,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440054113", "text": "" }, "buffid": [], @@ -3016,7 +3016,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440054114", "text": "" }, "buffid": [], @@ -3044,7 +3044,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440054115", "text": "" }, "buffid": [], @@ -3069,7 +3069,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350010111", "text": "" }, "buffid": [], @@ -3092,14 +3092,11 @@ "Id": [ 235001111, 235001112, - 235001113, - 235001114, - 235001115, - 235001116 + 235001113 ] }, "Desc": { - "key": "", + "key": "skill_1350011111", "text": "" }, "buffid": [], @@ -3122,14 +3119,11 @@ "Id": [ 235001111, 235001122, - 235001123, - 235001114, - 235001115, - 235001116 + 235001123 ] }, "Desc": { - "key": "", + "key": "skill_1350011112", "text": "" }, "buffid": [], @@ -3152,14 +3146,11 @@ "Id": [ 235001111, 235001132, - 235001133, - 235001114, - 235001115, - 235001116 + 235001133 ] }, "Desc": { - "key": "", + "key": "skill_1350011113", "text": "" }, "buffid": [], @@ -3182,14 +3173,11 @@ "Id": [ 235001111, 235001142, - 235001143, - 235001114, - 235001115, - 235001116 + 235001143 ] }, "Desc": { - "key": "", + "key": "skill_1350011114", "text": "" }, "buffid": [], @@ -3212,14 +3200,11 @@ "Id": [ 235001111, 235001152, - 235001153, - 235001114, - 235001115, - 235001116 + 235001153 ] }, "Desc": { - "key": "", + "key": "skill_1350011115", "text": "" }, "buffid": [], @@ -3242,14 +3227,11 @@ "Id": [ 235001111, 235001152, - 235001153, - 235001114, - 235001115, - 235001116 + 235001153 ] }, "Desc": { - "key": "", + "key": "skill_1350011116", "text": "" }, "buffid": [], @@ -3275,7 +3257,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350012111", "text": "" }, "buffid": [], @@ -3301,7 +3283,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350012112", "text": "" }, "buffid": [], @@ -3327,7 +3309,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350012113", "text": "" }, "buffid": [], @@ -3353,7 +3335,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350012114", "text": "" }, "buffid": [], @@ -3379,7 +3361,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350012115", "text": "" }, "buffid": [], @@ -3407,7 +3389,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350013111", "text": "" }, "buffid": [], @@ -3435,7 +3417,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350013112", "text": "" }, "buffid": [], @@ -3463,7 +3445,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350013113", "text": "" }, "buffid": [], @@ -3491,7 +3473,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1350013114", "text": "" }, "buffid": [], @@ -3519,7 +3501,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9350014111", "text": "" }, "buffid": [], @@ -3547,7 +3529,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9350014112", "text": "" }, "buffid": [], @@ -3575,7 +3557,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9350014113", "text": "" }, "buffid": [], @@ -3603,7 +3585,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9350014114", "text": "" }, "buffid": [], @@ -3629,7 +3611,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9350014115", "text": "" }, "buffid": [], @@ -3654,7 +3636,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240040111", "text": "" }, "buffid": [], @@ -3679,7 +3661,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240041111", "text": "" }, "buffid": [], @@ -3704,7 +3686,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240041112", "text": "" }, "buffid": [], @@ -3729,7 +3711,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240041113", "text": "" }, "buffid": [], @@ -3754,7 +3736,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240041114", "text": "" }, "buffid": [], @@ -3779,7 +3761,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240041115", "text": "" }, "buffid": [], @@ -3804,7 +3786,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240042111", "text": "" }, "buffid": [], @@ -3831,7 +3813,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240043111", "text": "" }, "buffid": [], @@ -3858,7 +3840,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240043112", "text": "" }, "buffid": [], @@ -3885,7 +3867,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240043113", "text": "" }, "buffid": [], @@ -3912,7 +3894,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240043114", "text": "" }, "buffid": [], @@ -3939,7 +3921,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240043115", "text": "" }, "buffid": [], @@ -3966,7 +3948,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240043116", "text": "" }, "buffid": [], @@ -3993,7 +3975,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240043117", "text": "" }, "buffid": [], @@ -4018,7 +4000,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9240044111", "text": "" }, "buffid": [], @@ -4043,7 +4025,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440060111", "text": "" }, "buffid": [], @@ -4069,7 +4051,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440061111", "text": "" }, "buffid": [], @@ -4095,7 +4077,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440061112", "text": "" }, "buffid": [], @@ -4121,7 +4103,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440061113", "text": "" }, "buffid": [], @@ -4147,7 +4129,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440061114", "text": "" }, "buffid": [], @@ -4173,7 +4155,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440061115", "text": "" }, "buffid": [], @@ -4199,7 +4181,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440061116", "text": "" }, "buffid": [], @@ -4224,7 +4206,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440062111", "text": "" }, "buffid": [], @@ -4253,7 +4235,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440063111", "text": "" }, "buffid": [], @@ -4282,7 +4264,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440063112", "text": "" }, "buffid": [], @@ -4311,7 +4293,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440063113", "text": "" }, "buffid": [], @@ -4340,7 +4322,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440063114", "text": "" }, "buffid": [], @@ -4369,7 +4351,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440063115", "text": "" }, "buffid": [], @@ -4398,7 +4380,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1440063116", "text": "" }, "buffid": [], @@ -4431,7 +4413,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440064111", "text": "" }, "buffid": [], @@ -4464,7 +4446,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440064112", "text": "" }, "buffid": [], @@ -4497,7 +4479,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440064113", "text": "" }, "buffid": [], @@ -4530,7 +4512,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440064114", "text": "" }, "buffid": [], @@ -4563,7 +4545,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440064115", "text": "" }, "buffid": [], @@ -4596,7 +4578,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9440064116", "text": "" }, "buffid": [], @@ -4621,7 +4603,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150050111", "text": "" }, "buffid": [], @@ -4647,7 +4629,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150051111", "text": "" }, "buffid": [], @@ -4673,7 +4655,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150051112", "text": "" }, "buffid": [], @@ -4699,7 +4681,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150051113", "text": "" }, "buffid": [], @@ -4725,7 +4707,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150051114", "text": "" }, "buffid": [], @@ -4751,7 +4733,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150051115", "text": "" }, "buffid": [], @@ -4776,7 +4758,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150052111", "text": "" }, "buffid": [], @@ -4804,7 +4786,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150053111", "text": "" }, "buffid": [], @@ -4832,7 +4814,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150053112", "text": "" }, "buffid": [], @@ -4860,7 +4842,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150053113", "text": "" }, "buffid": [], @@ -4888,7 +4870,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150053114", "text": "" }, "buffid": [], @@ -4916,7 +4898,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150053115", "text": "" }, "buffid": [], @@ -4943,7 +4925,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150054111", "text": "" }, "buffid": [], @@ -4968,7 +4950,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150040111", "text": "" }, "buffid": [], @@ -4994,7 +4976,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150041111", "text": "" }, "buffid": [], @@ -5020,7 +5002,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150041112", "text": "" }, "buffid": [], @@ -5046,7 +5028,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150041113", "text": "" }, "buffid": [], @@ -5072,7 +5054,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150041114", "text": "" }, "buffid": [], @@ -5098,7 +5080,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150042111", "text": "" }, "buffid": [], @@ -5124,7 +5106,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150042112", "text": "" }, "buffid": [], @@ -5150,7 +5132,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150042113", "text": "" }, "buffid": [], @@ -5176,7 +5158,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150042114", "text": "" }, "buffid": [], @@ -5202,7 +5184,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150042115", "text": "" }, "buffid": [], @@ -5228,7 +5210,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150043111", "text": "" }, "buffid": [], @@ -5254,7 +5236,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150043112", "text": "" }, "buffid": [], @@ -5280,7 +5262,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150043113", "text": "" }, "buffid": [], @@ -5306,7 +5288,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150043114", "text": "" }, "buffid": [], @@ -5332,7 +5314,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150043115", "text": "" }, "buffid": [], @@ -5358,7 +5340,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1150043116", "text": "" }, "buffid": [], @@ -5384,7 +5366,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9150042111", "text": "" }, "buffid": [], @@ -5410,7 +5392,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9150042112", "text": "" }, "buffid": [], @@ -5436,7 +5418,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9150042113", "text": "" }, "buffid": [], @@ -5462,7 +5444,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9150042114", "text": "" }, "buffid": [], @@ -5488,7 +5470,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_9150042115", "text": "" }, "buffid": [], @@ -5513,7 +5495,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240020111", "text": "" }, "buffid": [], @@ -5539,7 +5521,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240021111", "text": "" }, "buffid": [], @@ -5565,7 +5547,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240021112", "text": "" }, "buffid": [], @@ -5591,7 +5573,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240021113", "text": "" }, "buffid": [], @@ -5617,7 +5599,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240021114", "text": "" }, "buffid": [], @@ -5643,7 +5625,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240021115", "text": "" }, "buffid": [], @@ -5669,7 +5651,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240021116", "text": "" }, "buffid": [], @@ -5695,7 +5677,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240022111", "text": "" }, "buffid": [], @@ -5721,7 +5703,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240023111", "text": "" }, "buffid": [], @@ -5747,7 +5729,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240023112", "text": "" }, "buffid": [], @@ -5773,7 +5755,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240023113", "text": "" }, "buffid": [], @@ -5799,7 +5781,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240023114", "text": "" }, "buffid": [], @@ -5825,7 +5807,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240023115", "text": "" }, "buffid": [], @@ -5851,7 +5833,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1240023116", "text": "" }, "buffid": [], @@ -5876,7 +5858,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140070111", "text": "" }, "buffid": [], @@ -5901,7 +5883,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140071111", "text": "" }, "buffid": [], @@ -5926,7 +5908,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140071112", "text": "" }, "buffid": [], @@ -5951,7 +5933,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140071113", "text": "" }, "buffid": [], @@ -5976,7 +5958,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140071114", "text": "" }, "buffid": [], @@ -6001,7 +5983,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140071115", "text": "" }, "buffid": [], @@ -6026,7 +6008,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140071116", "text": "" }, "buffid": [], @@ -6052,7 +6034,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140072111", "text": "" }, "buffid": [], @@ -6078,7 +6060,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140072112", "text": "" }, "buffid": [], @@ -6104,7 +6086,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140072113", "text": "" }, "buffid": [], @@ -6131,7 +6113,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140073111", "text": "" }, "buffid": [], @@ -6158,7 +6140,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140073112", "text": "" }, "buffid": [], @@ -6185,7 +6167,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140073113", "text": "" }, "buffid": [], @@ -6212,7 +6194,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140073114", "text": "" }, "buffid": [], @@ -6239,7 +6221,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140073115", "text": "" }, "buffid": [], @@ -6266,7 +6248,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140073116", "text": "" }, "buffid": [], @@ -6291,7 +6273,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140030111", "text": "" }, "buffid": [], @@ -6317,7 +6299,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140031111", "text": "" }, "buffid": [], @@ -6343,7 +6325,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140031112", "text": "" }, "buffid": [], @@ -6369,7 +6351,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140031113", "text": "" }, "buffid": [], @@ -6395,7 +6377,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140031114", "text": "" }, "buffid": [], @@ -6421,7 +6403,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140031115", "text": "" }, "buffid": [], @@ -6448,7 +6430,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140032111", "text": "" }, "buffid": [], @@ -6475,7 +6457,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140032112", "text": "" }, "buffid": [], @@ -6502,7 +6484,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140032113", "text": "" }, "buffid": [], @@ -6529,7 +6511,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140032114", "text": "" }, "buffid": [], @@ -6556,7 +6538,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140032115", "text": "" }, "buffid": [], @@ -6582,7 +6564,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140033111", "text": "" }, "buffid": [], @@ -6608,7 +6590,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140033112", "text": "" }, "buffid": [], @@ -6634,7 +6616,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140033113", "text": "" }, "buffid": [], @@ -6660,7 +6642,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140033114", "text": "" }, "buffid": [], @@ -6686,7 +6668,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1140033115", "text": "" }, "buffid": [], @@ -6711,7 +6693,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1450030111", "text": "" }, "buffid": [], @@ -6737,7 +6719,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1450031111", "text": "" }, "buffid": [], @@ -6762,7 +6744,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1450032111", "text": "" }, "buffid": [], @@ -6789,7 +6771,7 @@ ] }, "Desc": { - "key": "", + "key": "skill_1450033111", "text": "" }, "buffid": [], From c20099a71575580b699b06436337e19e5da03e3b Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 16 Sep 2022 23:28:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_initial.json | 40 -- bin/json/game_model.json | 674 +++++++++++++++---------------- bin/json/game_skillafteratk.json | 36 +- 3 files changed, 355 insertions(+), 395 deletions(-) diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index 28186a23f..8f46a1d80 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -539,16 +539,6 @@ } ] }, - { - "index": "58", - "var": [ - { - "a": "hero", - "t": "24002", - "n": 5 - } - ] - }, { "index": "59", "var": [ @@ -579,36 +569,6 @@ } ] }, - { - "index": "62", - "var": [ - { - "a": "hero", - "t": "14003", - "n": 5 - } - ] - }, - { - "index": "63", - "var": [ - { - "a": "hero", - "t": "35003", - "n": 5 - } - ] - }, - { - "index": "64", - "var": [ - { - "a": "hero", - "t": "15005", - "n": 5 - } - ] - }, { "index": "65", "var": [ diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 698cfcd15..d11c99fbe 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -6,10 +6,10 @@ "presonstory": "12003", "height": 1, "weight": 0.1, - "ico": "tx_js_25004", - "fight": "ytx_js_25004", + "ico": "tx_js_12003", + "fight": "ytx_js_12003", "img": "sbkp_js_12003", - "heroimg": "hbkp_js_25004", + "heroimg": "hbkp_js_12003", "portrait": "portrait_12003", "bust": "bust_25004", "postxyz": [ @@ -30,10 +30,10 @@ "presonstory": "13001", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_13001", "fight": "ytx_js_13001", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_13001", + "heroimg": "hbkp_js_13001", "portrait": "portrait_13001", "bust": "bust_13001", "postxyz": [ @@ -54,10 +54,10 @@ "presonstory": "13002", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_13002", "fight": "ytx_js_13002", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_13002", + "heroimg": "hbkp_js_13002", "portrait": "portrait_13002", "bust": "bust_13002", "postxyz": [ @@ -78,10 +78,10 @@ "presonstory": "13003", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_13003", "fight": "ytx_js_13003", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_13003", + "heroimg": "hbkp_js_13003", "portrait": "portrait_13003", "bust": "bust_13003", "postxyz": [ @@ -102,10 +102,10 @@ "presonstory": "13004", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_13004", "fight": "ytx_js_13004", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_13004", + "heroimg": "hbkp_js_13004", "portrait": "portrait_13004", "bust": "bust_13004", "postxyz": [ @@ -126,10 +126,10 @@ "presonstory": "13005", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_13005", "fight": "ytx_js_13005", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_13005", + "heroimg": "hbkp_js_13005", "portrait": "portrait_13005", "bust": "bust_13005", "postxyz": [ @@ -150,10 +150,10 @@ "presonstory": "14001", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_14001", "fight": "ytx_js_14001", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_14001", + "heroimg": "hbkp_js_14001", "portrait": "portrait_14001", "bust": "bust_14001", "postxyz": [ @@ -174,10 +174,10 @@ "presonstory": "14002", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_14002", "fight": "ytx_js_14002", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_14002", + "heroimg": "hbkp_js_14002", "portrait": "portrait_14002", "bust": "bust_14002", "postxyz": [ @@ -198,10 +198,10 @@ "presonstory": "14003", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_14003", "fight": "ytx_js_14003", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_14003", + "heroimg": "hbkp_js_14003", "portrait": "portrait_14003", "bust": "bust_14003", "postxyz": [ @@ -222,10 +222,10 @@ "presonstory": "14004", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_14004", "fight": "ytx_js_14004", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_14004", + "heroimg": "hbkp_js_14004", "portrait": "portrait_14004", "bust": "bust_14004", "postxyz": [ @@ -246,10 +246,10 @@ "presonstory": "14005", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_14005", "fight": "ytx_js_14005", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_14005", + "heroimg": "hbkp_js_14005", "portrait": "portrait_14005", "bust": "bust_14005", "postxyz": [ @@ -270,10 +270,10 @@ "presonstory": "14006", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_14006", "fight": "ytx_js_14006", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_14006", + "heroimg": "hbkp_js_14006", "portrait": "portrait_14006", "bust": "bust_14006", "postxyz": [ @@ -294,10 +294,10 @@ "presonstory": "14007", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_14007", "fight": "ytx_js_14007", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_14007", + "heroimg": "hbkp_js_14007", "portrait": "portrait_14007", "bust": "bust_14007", "postxyz": [ @@ -318,10 +318,10 @@ "presonstory": "15001", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_15001", "fight": "ytx_js_15001", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_15001", + "heroimg": "hbkp_js_15001", "portrait": "portrait_15001", "bust": "bust_15001", "postxyz": [ @@ -342,10 +342,10 @@ "presonstory": "15002", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_15002", "fight": "ytx_js_15002", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_15002", + "heroimg": "hbkp_js_15002", "portrait": "portrait_15002", "bust": "bust_15002", "postxyz": [ @@ -366,10 +366,10 @@ "presonstory": "15003", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_15003", "fight": "ytx_js_15003", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_15003", + "heroimg": "hbkp_js_15003", "portrait": "portrait_15003", "bust": "bust_15003", "postxyz": [ @@ -390,10 +390,10 @@ "presonstory": "15004", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_15004", "fight": "ytx_js_15004", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_15004", + "heroimg": "hbkp_js_15004", "portrait": "portrait_15004", "bust": "bust_15004", "postxyz": [ @@ -414,10 +414,10 @@ "presonstory": "15005", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_15005", "fight": "ytx_js_15005", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_15005", + "heroimg": "hbkp_js_15005", "portrait": "portrait_15005", "bust": "bust_15005", "postxyz": [ @@ -438,10 +438,10 @@ "presonstory": "23001", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_23001", "fight": "ytx_js_23001", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_23001", + "heroimg": "hbkp_js_23001", "portrait": "portrait_23001", "bust": "bust_23001", "postxyz": [ @@ -462,10 +462,10 @@ "presonstory": "23002", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_23002", "fight": "ytx_js_23002", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_23002", + "heroimg": "hbkp_js_23002", "portrait": "portrait_23002", "bust": "bust_23002", "postxyz": [ @@ -486,10 +486,10 @@ "presonstory": "23003", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_23003", "fight": "ytx_js_23003", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_23003", + "heroimg": "hbkp_js_23003", "portrait": "portrait_23003", "bust": "bust_23003", "postxyz": [ @@ -510,10 +510,10 @@ "presonstory": "23004", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_23004", "fight": "ytx_js_23004", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_23004", + "heroimg": "hbkp_js_23004", "portrait": "portrait_23004", "bust": "bust_23004", "postxyz": [ @@ -534,10 +534,10 @@ "presonstory": "24001", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_24001", "fight": "ytx_js_24001", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_24001", + "heroimg": "hbkp_js_24001", "portrait": "portrait_24001", "bust": "bust_24001", "postxyz": [ @@ -558,10 +558,10 @@ "presonstory": "24002", "height": 1, "weight": 1, - "ico": "tx_hhjs_24003", + "ico": "tx_js_24002", "fight": "ytx_js_24002", - "img": "sbkp_js_24003", - "heroimg": "hbkp_js_24003", + "img": "sbkp_js_24002", + "heroimg": "hbkp_js_24002", "portrait": "portrait_24002", "bust": "bust_24002", "postxyz": [ @@ -606,10 +606,10 @@ "presonstory": "24004", "height": 1, "weight": 1, - "ico": "tx_js_25001", + "ico": "tx_js_24004", "fight": "ytx_js_24004", - "img": "sbkp_js_25001", - "heroimg": "hbkp_js_25001", + "img": "sbkp_js_24004", + "heroimg": "hbkp_js_24004", "portrait": "portrait_24004", "bust": "bust_24004", "postxyz": [ @@ -630,10 +630,10 @@ "presonstory": "24005", "height": 1, "weight": 1, - "ico": "tx_js_25001", + "ico": "tx_js_24005", "fight": "ytx_js_24005", - "img": "sbkp_js_25001", - "heroimg": "hbkp_js_25001", + "img": "sbkp_js_24005", + "heroimg": "hbkp_js_24005", "portrait": "portrait_24005", "bust": "bust_24005", "postxyz": [ @@ -654,10 +654,10 @@ "presonstory": "24006", "height": 1, "weight": 1, - "ico": "tx_js_25001", + "ico": "tx_js_24006", "fight": "ytx_js_24006", - "img": "sbkp_js_25001", - "heroimg": "hbkp_js_25001", + "img": "sbkp_js_24006", + "heroimg": "hbkp_js_24006", "portrait": "portrait_24006", "bust": "bust_24006", "postxyz": [ @@ -678,10 +678,10 @@ "presonstory": "24007", "height": 1, "weight": 1, - "ico": "tx_js_25001", + "ico": "tx_js_24007", "fight": "ytx_js_24007", - "img": "sbkp_js_25001", - "heroimg": "hbkp_js_25001", + "img": "sbkp_js_24007", + "heroimg": "hbkp_js_24007", "portrait": "portrait_24007", "bust": "bust_24007", "postxyz": [ @@ -702,10 +702,10 @@ "presonstory": "24008", "height": 1, "weight": 1, - "ico": "tx_js_25001", + "ico": "tx_js_24008", "fight": "ytx_js_24008", - "img": "sbkp_js_25001", - "heroimg": "hbkp_js_25001", + "img": "sbkp_js_24008", + "heroimg": "hbkp_js_24008", "portrait": "portrait_24008", "bust": "bust_24008", "postxyz": [ @@ -726,10 +726,10 @@ "presonstory": "24009", "height": 1, "weight": 1, - "ico": "tx_js_25001", + "ico": "tx_js_24009", "fight": "ytx_js_24009", - "img": "sbkp_js_25001", - "heroimg": "hbkp_js_25001", + "img": "sbkp_js_24009", + "heroimg": "hbkp_js_24009", "portrait": "portrait_24009", "bust": "bust_24009", "postxyz": [ @@ -774,10 +774,10 @@ "presonstory": "25002", "height": 1, "weight": 1, - "ico": "tx_js_25004", + "ico": "tx_js_25002", "fight": "ytx_js_25002", - "img": "sbkp_js_25004", - "heroimg": "hbkp_js_25004", + "img": "sbkp_js_25002", + "heroimg": "hbkp_js_25002", "portrait": "portrait_25002", "bust": "bust_25002", "postxyz": [ @@ -798,10 +798,10 @@ "presonstory": "25003", "height": 1, "weight": 1, - "ico": "tx_js_25004", + "ico": "tx_js_25003", "fight": "ytx_js_25003", - "img": "sbkp_js_25004", - "heroimg": "hbkp_js_25004", + "img": "sbkp_js_25003", + "heroimg": "hbkp_js_25003", "portrait": "portrait_25003", "bust": "bust_25003", "postxyz": [ @@ -846,10 +846,10 @@ "presonstory": "33001", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_33001", "fight": "ytx_js_33001", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_33001", + "heroimg": "hbkp_js_33001", "portrait": "portrait_33001", "bust": "bust_33001", "postxyz": [ @@ -870,10 +870,10 @@ "presonstory": "33002", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_33002", "fight": "ytx_js_33002", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_33002", + "heroimg": "hbkp_js_33002", "portrait": "portrait_33002", "bust": "bust_33002", "postxyz": [ @@ -894,10 +894,10 @@ "presonstory": "33003", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_33003", "fight": "ytx_js_33003", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_33003", + "heroimg": "hbkp_js_33003", "portrait": "portrait_33003", "bust": "bust_33003", "postxyz": [ @@ -918,10 +918,10 @@ "presonstory": "33004", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_33004", "fight": "ytx_js_33004", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_33004", + "heroimg": "hbkp_js_33004", "portrait": "portrait_33004", "bust": "bust_33004", "postxyz": [ @@ -942,10 +942,10 @@ "presonstory": "33005", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_33005", "fight": "ytx_js_33005", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_33005", + "heroimg": "hbkp_js_33005", "portrait": "portrait_33005", "bust": "bust_33005", "postxyz": [ @@ -966,10 +966,10 @@ "presonstory": "33006", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_33006", "fight": "ytx_js_33006", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_33006", + "heroimg": "hbkp_js_33006", "portrait": "portrait_33006", "bust": "bust_33006", "postxyz": [ @@ -990,10 +990,10 @@ "presonstory": "34001", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_34001", "fight": "ytx_js_34001", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_34001", + "heroimg": "hbkp_js_34001", "portrait": "portrait_34001", "bust": "bust_34001", "postxyz": [ @@ -1014,10 +1014,10 @@ "presonstory": "34002", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_34002", "fight": "ytx_js_34002", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_34002", + "heroimg": "hbkp_js_34002", "portrait": "portrait_34002", "bust": "bust_34002", "postxyz": [ @@ -1038,10 +1038,10 @@ "presonstory": "34003", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_34003", "fight": "ytx_js_34003", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_34003", + "heroimg": "hbkp_js_34003", "portrait": "portrait_34003", "bust": "bust_34003", "postxyz": [ @@ -1062,10 +1062,10 @@ "presonstory": "34004", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_34004", "fight": "ytx_js_34004", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_34004", + "heroimg": "hbkp_js_34004", "portrait": "portrait_34004", "bust": "bust_34004", "postxyz": [ @@ -1086,10 +1086,10 @@ "presonstory": "34005", "height": 1, "weight": 1, - "ico": "tx_hhjs_34006", + "ico": "tx_js_34005", "fight": "ytx_js_34005", - "img": "sbkp_js_34006", - "heroimg": "hbkp_js_34006", + "img": "sbkp_js_34005", + "heroimg": "hbkp_js_34005", "portrait": "portrait_34005", "bust": "bust_34005", "postxyz": [ @@ -1134,10 +1134,10 @@ "presonstory": "34007", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_34007", "fight": "ytx_js_34007", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_34007", + "heroimg": "hbkp_js_34007", "portrait": "portrait_34007", "bust": "bust_34007", "postxyz": [ @@ -1158,10 +1158,10 @@ "presonstory": "34008", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_34008", "fight": "ytx_js_34008", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_34008", + "heroimg": "hbkp_js_34008", "portrait": "portrait_34008", "bust": "bust_34008", "postxyz": [ @@ -1230,10 +1230,10 @@ "presonstory": "35003", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_35003", "fight": "ytx_js_35003", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_35003", + "heroimg": "hbkp_js_35003", "portrait": "portrait_35003", "bust": "bust_35003", "postxyz": [ @@ -1254,10 +1254,10 @@ "presonstory": "35004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_35004", "fight": "ytx_js_35004", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_35004", + "heroimg": "hbkp_js_35004", "portrait": "portrait_35004", "bust": "bust_35004", "postxyz": [ @@ -1278,10 +1278,10 @@ "presonstory": "35005", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_35005", "fight": "ytx_js_35005", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_35005", + "heroimg": "hbkp_js_35005", "portrait": "portrait_35005", "bust": "bust_35005", "postxyz": [ @@ -1302,10 +1302,10 @@ "presonstory": "35006", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_35006", "fight": "ytx_js_35006", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_35006", + "heroimg": "hbkp_js_35006", "portrait": "portrait_35006", "bust": "bust_35006", "postxyz": [ @@ -1326,10 +1326,10 @@ "presonstory": "43001", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_43001", "fight": "ytx_js_43001", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_43001", + "heroimg": "hbkp_js_43001", "portrait": "portrait_43001", "bust": "bust_43001", "postxyz": [ @@ -1350,10 +1350,10 @@ "presonstory": "43002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_43002", "fight": "ytx_js_43002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_43002", + "heroimg": "hbkp_js_43002", "portrait": "portrait_43002", "bust": "bust_43002", "postxyz": [ @@ -1374,10 +1374,10 @@ "presonstory": "43003", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_43003", "fight": "ytx_js_43003", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_43003", + "heroimg": "hbkp_js_43003", "portrait": "portrait_43003", "bust": "bust_43003", "postxyz": [ @@ -1398,10 +1398,10 @@ "presonstory": "43004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_43004", "fight": "ytx_js_43004", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_43004", + "heroimg": "hbkp_js_43004", "portrait": "portrait_43004", "bust": "bust_43004", "postxyz": [ @@ -1422,10 +1422,10 @@ "presonstory": "43005", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_43005", "fight": "ytx_js_43005", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_43005", + "heroimg": "hbkp_js_43005", "portrait": "portrait_43005", "bust": "bust_43005", "postxyz": [ @@ -1446,10 +1446,10 @@ "presonstory": "43006", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_43006", "fight": "ytx_js_43006", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_43006", + "heroimg": "hbkp_js_43006", "portrait": "portrait_43006", "bust": "bust_43006", "postxyz": [ @@ -1470,10 +1470,10 @@ "presonstory": "43007", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_43007", "fight": "ytx_js_43007", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_43007", + "heroimg": "hbkp_js_43007", "portrait": "portrait_43007", "bust": "bust_43007", "postxyz": [ @@ -1494,10 +1494,10 @@ "presonstory": "44001", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_44001", "fight": "ytx_js_44001", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_44001", + "heroimg": "hbkp_js_44001", "portrait": "portrait_44001", "bust": "bust_44001", "postxyz": [ @@ -1518,10 +1518,10 @@ "presonstory": "44002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_44002", "fight": "ytx_js_44002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_44002", + "heroimg": "hbkp_js_44002", "portrait": "portrait_44002", "bust": "bust_44002", "postxyz": [ @@ -1542,10 +1542,10 @@ "presonstory": "44003", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_44003", "fight": "ytx_js_44003", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_44003", + "heroimg": "hbkp_js_44003", "portrait": "portrait_44003", "bust": "bust_44003", "postxyz": [ @@ -1566,10 +1566,10 @@ "presonstory": "44004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_44004", "fight": "ytx_js_44004", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_44004", + "heroimg": "hbkp_js_44004", "portrait": "portrait_44004", "bust": "bust_44004", "postxyz": [ @@ -1614,10 +1614,10 @@ "presonstory": "44006", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_44006", "fight": "ytx_js_44006", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_44006", + "heroimg": "hbkp_js_44006", "portrait": "portrait_44006", "bust": "bust_44006", "postxyz": [ @@ -1638,10 +1638,10 @@ "presonstory": "45001", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_45001", "fight": "ytx_js_45001", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_45001", + "heroimg": "hbkp_js_45001", "portrait": "portrait_45001", "bust": "bust_45001", "postxyz": [ @@ -1662,10 +1662,10 @@ "presonstory": "45002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_45002", "fight": "ytx_js_45002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_45002", + "heroimg": "hbkp_js_45002", "portrait": "portrait_45002", "bust": "bust_45002", "postxyz": [ @@ -1686,7 +1686,7 @@ "presonstory": "45003", "height": 1, "weight": 1, - "ico": "tx_hhjs_45003", + "ico": "tx_js_45003", "fight": "ytx_js_45003", "img": "sbkp_js_45003", "heroimg": "hbkp_js_45003", @@ -1710,10 +1710,10 @@ "presonstory": "45004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_45004", "fight": "ytx_js_45004", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_45004", + "heroimg": "hbkp_js_45004", "portrait": "portrait_45004", "bust": "bust_45004", "postxyz": [ @@ -1734,10 +1734,10 @@ "presonstory": "43901", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_43901", "fight": "ytx_js_43901", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_43901", + "heroimg": "hbkp_js_43901", "portrait": "portrait_43901", "bust": "bust_43901", "postxyz": [ @@ -1758,10 +1758,10 @@ "presonstory": "42911", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_42911", "fight": "ytx_js_42911", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_42911", + "heroimg": "hbkp_js_42911", "portrait": "portrait_42911", "bust": "bust_42911", "postxyz": [ @@ -1782,10 +1782,10 @@ "presonstory": "43911", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_43911", "fight": "ytx_js_43911", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_43911", + "heroimg": "hbkp_js_43911", "portrait": "portrait_43911", "bust": "bust_43911", "postxyz": [ @@ -1806,10 +1806,10 @@ "presonstory": "44911", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_44911", "fight": "ytx_js_44911", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_44911", + "heroimg": "hbkp_js_44911", "portrait": "portrait_44911", "bust": "bust_44911", "postxyz": [ @@ -1830,10 +1830,10 @@ "presonstory": "43921", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", - "fight": "ytx_js_35002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "ico": "tx_js_43921", + "fight": "ytx_js_43921", + "img": "sbkp_js_43921", + "heroimg": "hbkp_js_43921", "portrait": "portrait_35002", "bust": "bust_43921", "postxyz": [ @@ -1854,10 +1854,10 @@ "presonstory": "44921", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", - "fight": "ytx_js_35002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "ico": "tx_js_44921", + "fight": "ytx_js_44921", + "img": "sbkp_js_44921", + "heroimg": "hbkp_js_44921", "portrait": "portrait_35002", "bust": "bust_44921", "postxyz": [ @@ -1878,10 +1878,10 @@ "presonstory": "45921", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", - "fight": "ytx_js_35002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "ico": "tx_js_45921", + "fight": "ytx_js_45921", + "img": "sbkp_js_45921", + "heroimg": "hbkp_js_45921", "portrait": "portrait_35002", "bust": "bust_45921", "postxyz": [ @@ -1902,10 +1902,10 @@ "presonstory": "51001", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51001", "fight": "ytx_js_51001", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51001", + "heroimg": "hbkp_js_51001", "portrait": "portrait_51001", "bust": "bust_51001", "postxyz": [ @@ -1926,10 +1926,10 @@ "presonstory": "51002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51002", "fight": "ytx_js_51002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51002", + "heroimg": "hbkp_js_51002", "portrait": "portrait_51002", "bust": "bust_51002", "postxyz": [ @@ -1950,10 +1950,10 @@ "presonstory": "51003", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51003", "fight": "ytx_js_51003", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51003", + "heroimg": "hbkp_js_51003", "portrait": "portrait_51003", "bust": "bust_51003", "postxyz": [ @@ -1974,10 +1974,10 @@ "presonstory": "51004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51004", "fight": "ytx_js_51004", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51004", + "heroimg": "hbkp_js_51004", "portrait": "portrait_51004", "bust": "bust_51004", "postxyz": [ @@ -1998,10 +1998,10 @@ "presonstory": "51005", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51005", "fight": "ytx_js_51005", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51005", + "heroimg": "hbkp_js_51005", "portrait": "portrait_51005", "bust": "bust_51005", "postxyz": [ @@ -2022,10 +2022,10 @@ "presonstory": "51006", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51006", "fight": "ytx_js_51006", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51006", + "heroimg": "hbkp_js_51006", "portrait": "portrait_51006", "bust": "bust_51006", "postxyz": [ @@ -2046,10 +2046,10 @@ "presonstory": "51007", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51007", "fight": "ytx_js_51007", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51007", + "heroimg": "hbkp_js_51007", "portrait": "portrait_51007", "bust": "bust_51007", "postxyz": [ @@ -2070,10 +2070,10 @@ "presonstory": "51008", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51008", "fight": "ytx_js_51008", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51008", + "heroimg": "hbkp_js_51008", "portrait": "portrait_51008", "bust": "bust_51008", "postxyz": [ @@ -2094,10 +2094,10 @@ "presonstory": "51009", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51009", "fight": "ytx_js_51009", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51009", + "heroimg": "hbkp_js_51009", "portrait": "portrait_51009", "bust": "bust_51009", "postxyz": [ @@ -2118,10 +2118,10 @@ "presonstory": "51010", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51010", "fight": "ytx_js_51010", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51010", + "heroimg": "hbkp_js_51010", "portrait": "portrait_51010", "bust": "bust_51010", "postxyz": [ @@ -2142,10 +2142,10 @@ "presonstory": "51011", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51011", "fight": "ytx_js_51011", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51011", + "heroimg": "hbkp_js_51011", "portrait": "portrait_51011", "bust": "bust_51011", "postxyz": [ @@ -2166,10 +2166,10 @@ "presonstory": "51012", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51012", "fight": "ytx_js_51012", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51012", + "heroimg": "hbkp_js_51012", "portrait": "portrait_51012", "bust": "bust_51012", "postxyz": [ @@ -2190,10 +2190,10 @@ "presonstory": "51013", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51013", "fight": "ytx_js_51013", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51013", + "heroimg": "hbkp_js_51013", "portrait": "portrait_51013", "bust": "bust_51013", "postxyz": [ @@ -2214,10 +2214,10 @@ "presonstory": "51014", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_51014", "fight": "ytx_js_51014", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_51014", + "heroimg": "hbkp_js_51014", "portrait": "portrait_51014", "bust": "bust_51014", "postxyz": [ @@ -2238,10 +2238,10 @@ "presonstory": "53001", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_53001", "fight": "ytx_js_53001", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_53001", + "heroimg": "hbkp_js_53001", "portrait": "portrait_53001", "bust": "bust_53001", "postxyz": [ @@ -2262,10 +2262,10 @@ "presonstory": "53002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_53002", "fight": "ytx_js_53002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_53002", + "heroimg": "hbkp_js_53002", "portrait": "portrait_53002", "bust": "bust_53002", "postxyz": [ @@ -2286,10 +2286,10 @@ "presonstory": "53003", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_53003", "fight": "ytx_js_53003", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_53003", + "heroimg": "hbkp_js_53003", "portrait": "portrait_53003", "bust": "bust_53003", "postxyz": [ @@ -2310,10 +2310,10 @@ "presonstory": "53004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_53004", "fight": "ytx_js_53004", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_53004", + "heroimg": "hbkp_js_53004", "portrait": "portrait_53004", "bust": "bust_53004", "postxyz": [ @@ -2334,10 +2334,10 @@ "presonstory": "53005", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_53005", "fight": "ytx_js_53005", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_53005", + "heroimg": "hbkp_js_53005", "portrait": "portrait_53005", "bust": "bust_53005", "postxyz": [ @@ -2358,10 +2358,10 @@ "presonstory": "53006", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_53006", "fight": "ytx_js_53006", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_53006", + "heroimg": "hbkp_js_53006", "portrait": "portrait_53006", "bust": "bust_53006", "postxyz": [ @@ -2382,10 +2382,10 @@ "presonstory": "55001", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_55001", "fight": "ytx_js_55001", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_55001", + "heroimg": "hbkp_js_55001", "portrait": "portrait_55001", "bust": "bust_55001", "postxyz": [ @@ -2406,10 +2406,10 @@ "presonstory": "55002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_55002", "fight": "ytx_js_55002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_55002", + "heroimg": "hbkp_js_55002", "portrait": "portrait_55002", "bust": "bust_55002", "postxyz": [ @@ -2430,10 +2430,10 @@ "presonstory": "55002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_55003", "fight": "ytx_js_55003", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_55003", + "heroimg": "hbkp_js_55003", "portrait": "portrait_55003", "bust": "bust_55003", "postxyz": [ @@ -2454,10 +2454,10 @@ "presonstory": "55004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_55004", "fight": "ytx_js_55004", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_55004", + "heroimg": "hbkp_js_55004", "portrait": "portrait_55004", "bust": "bust_55004", "postxyz": [ @@ -2478,10 +2478,10 @@ "presonstory": "55004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_55005", "fight": "ytx_js_55005", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_55005", + "heroimg": "hbkp_js_55005", "portrait": "portrait_55005", "bust": "bust_55005", "postxyz": [ @@ -2502,10 +2502,10 @@ "presonstory": "55006", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_55006", "fight": "ytx_js_55006", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_55006", + "heroimg": "hbkp_js_55006", "portrait": "portrait_55006", "bust": "bust_55006", "postxyz": [ @@ -2526,10 +2526,10 @@ "presonstory": "55007", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_55007", "fight": "ytx_js_55007", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_55007", + "heroimg": "hbkp_js_55007", "portrait": "portrait_55007", "bust": "bust_55007", "postxyz": [ @@ -2550,10 +2550,10 @@ "presonstory": "63002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_63002", "fight": "ytx_js_63002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_63002", + "heroimg": "hbkp_js_63002", "portrait": "portrait_63002", "bust": "bust_55008", "postxyz": [ @@ -2574,10 +2574,10 @@ "presonstory": "63003", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_63003", "fight": "ytx_js_63003", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_63003", + "heroimg": "hbkp_js_63003", "portrait": "portrait_63003", "bust": "bust_55009", "postxyz": [ @@ -2598,10 +2598,10 @@ "presonstory": "63004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_63004", "fight": "ytx_js_63004", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_63004", + "heroimg": "hbkp_js_63004", "portrait": "portrait_63004", "bust": "bust_55010", "postxyz": [ @@ -2622,10 +2622,10 @@ "presonstory": "64003", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_64003", "fight": "ytx_js_64003", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_64003", + "heroimg": "hbkp_js_64003", "portrait": "portrait_64003", "bust": "bust_55011", "postxyz": [ @@ -2646,10 +2646,10 @@ "presonstory": "74002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_74002", "fight": "ytx_js_74002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_74002", + "heroimg": "hbkp_js_74002", "portrait": "portrait_74002", "bust": "bust_55012", "postxyz": [ @@ -2670,10 +2670,10 @@ "presonstory": "74003", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_74003", "fight": "ytx_js_74003", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_74003", + "heroimg": "hbkp_js_74003", "portrait": "portrait_74003", "bust": "bust_55013", "postxyz": [ @@ -2694,10 +2694,10 @@ "presonstory": "74004", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_74004", "fight": "ytx_js_74004", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_74004", + "heroimg": "hbkp_js_74004", "portrait": "portrait_74004", "bust": "bust_55014", "postxyz": [ @@ -2718,10 +2718,10 @@ "presonstory": "83002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_83002", "fight": "ytx_js_83002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_83002", + "heroimg": "hbkp_js_83002", "portrait": "portrait_83002", "bust": "bust_55015", "postxyz": [ @@ -2742,10 +2742,10 @@ "presonstory": "83006", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_83006", "fight": "ytx_js_83006", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_83006", + "heroimg": "hbkp_js_83006", "portrait": "portrait_83006", "bust": "bust_55016", "postxyz": [ @@ -2766,10 +2766,10 @@ "presonstory": "84002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_84002", "fight": "ytx_js_84002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_84002", + "heroimg": "hbkp_js_84002", "portrait": "portrait_84002", "bust": "bust_55017", "postxyz": [ @@ -2790,10 +2790,10 @@ "presonstory": "94002", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_94002", "fight": "ytx_js_94002", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_94002", + "heroimg": "hbkp_js_94002", "portrait": "portrait_94002", "bust": "bust_55018", "postxyz": [ @@ -2814,10 +2814,10 @@ "presonstory": "94005", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_94005", "fight": "ytx_js_94005", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_94005", + "heroimg": "hbkp_js_94005", "portrait": "portrait_94005", "bust": "bust_55019", "postxyz": [ @@ -2838,10 +2838,10 @@ "presonstory": "64007", "height": 1, "weight": 1, - "ico": "tx_hhjs_35002", + "ico": "tx_js_64007", "fight": "ytx_js_64007", - "img": "sbkp_js_35002", - "heroimg": "hbkp_js_35002", + "img": "sbkp_js_64007", + "heroimg": "hbkp_js_64007", "portrait": "portrait_64007", "bust": "bust_55020", "postxyz": [ diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 118f6182d..875d047e0 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -2687,10 +2687,10 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ - 2, + 1, 4, 300, 1, @@ -2731,10 +2731,10 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ - 2, + 1, 4, 300, 1, @@ -2775,10 +2775,10 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ - 2, + 1, 4, 300, 1, @@ -2819,10 +2819,10 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ - 2, + 1, 4, 300, 1, @@ -2863,10 +2863,10 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ - 2, + 1, 4, 300, 1, @@ -3236,7 +3236,7 @@ "Where": "", "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, @@ -6475,7 +6475,7 @@ 500 ], "FollowSK": [ - 215005112 + 215005113 ], "SucFollowSK": [], "FailFollowSK": [], @@ -6496,7 +6496,7 @@ 400 ], "FollowSK": [ - 215005112 + 215005113 ], "SucFollowSK": [], "FailFollowSK": [], @@ -6507,7 +6507,7 @@ "EmitPR": 1000, "From": 1, "Where": "", - "Order": "Type=NowHp,Asce=Down", + "Order": "", "Limit": 2, "ExecuteCnt": 1, "Type": 4, @@ -6536,7 +6536,7 @@ 400 ], "FollowSK": [ - 215005112 + 215005113 ], "SucFollowSK": [], "FailFollowSK": [], @@ -6557,7 +6557,7 @@ 400 ], "FollowSK": [ - 215005112 + 215005113 ], "SucFollowSK": [], "FailFollowSK": [], @@ -6578,7 +6578,7 @@ 400 ], "FollowSK": [ - 215005112 + 215005113 ], "SucFollowSK": [], "FailFollowSK": [], @@ -6599,7 +6599,7 @@ 400 ], "FollowSK": [ - 215005112 + 215005113 ], "SucFollowSK": [], "FailFollowSK": [], From 977c128f946e1a8da0e4280f04e4dca1181b3172 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 19 Sep 2022 09:47:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_skillafteratk.json | 420 ++++++++++++++++++++++++++++++- bin/json/game_skillatk.json | 181 +++++++++++++ bin/json/game_skillbuff.json | 50 ++++ bin/json/game_skillpassive.json | 53 +++- 4 files changed, 689 insertions(+), 15 deletions(-) diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 875d047e0..8baf84d9d 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -3236,7 +3236,7 @@ "Where": "", "Order": "", "Limit": 10, - "ExecuteCnt": 2, + "ExecuteCnt": 1, "Type": 1, "Argu": [ 1, @@ -3487,7 +3487,7 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, @@ -3549,7 +3549,7 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, @@ -3571,7 +3571,7 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, @@ -3593,7 +3593,7 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, @@ -9278,7 +9278,7 @@ "ExecuteCnt": 1, "Type": 4, "Argu": [ - 1, + 2, 1, 150 ], @@ -9376,7 +9376,7 @@ "ExecuteCnt": 1, "Type": 4, "Argu": [ - 2, + 1, 1, 350 ], @@ -9384,5 +9384,411 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false + }, + { + "Id": 253001111, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1500 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 253001112, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "Type=Rand", + "Limit": 2, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1500 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 253001211, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 5, + "Type": 1, + "Argu": [ + 1, + 4, + 600 + ], + "FollowSK": [], + "SucFollowSK": [ + 253001212 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 253001212, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 12, + "Argu": [ + 100 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 253001311, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 600 + ], + "FollowSK": [], + "SucFollowSK": [ + 253001312 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 253001312, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001008, + 1000, + 1, + 3 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003011, + "EmitPR": 1000, + "From": 1, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001327, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003111, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 650 + ], + "FollowSK": [], + "SucFollowSK": [ + 235003112, + 235003113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003112, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 7, + "Argu": [ + 0, + 0, + 1, + 1000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003113, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 17, + "Argu": [ + 1000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003211, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001115, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003212, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001126, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003213, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 435003211 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003214, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 435003212 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003215, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001212, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003216, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 435003213 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003217, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001126, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003218, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 4, + "Argu": [ + 1, + 1, + 100 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003311, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 7, + "Argu": [ + 0, + 0, + 1, + 1000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003312, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1100 + ], + "FollowSK": [], + "SucFollowSK": [ + 235003313 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 235003313, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 4, + "Argu": [ + 1, + 1, + 300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index b95394514..b18dd5567 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -6776,5 +6776,186 @@ }, "buffid": [], "map": "" + }, + { + "id": 153001111, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_153001111", + "text": "埃雷特1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 253001111, + 253001112 + ] + }, + "Desc": { + "key": "skill_1530011111", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 153001211, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_153001211", + "text": "埃雷特2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 253001211 + ] + }, + "Desc": { + "key": "skill_1530012111", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 153001311, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_153001311", + "text": "埃雷特3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 253001311 + ] + }, + "Desc": { + "key": "skill_1530013111", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 135003011, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_135003011", + "text": "漆黑队长技" + }, + "ico": "jn_dzj_01", + "act": "", + "Type": 3, + "CD": -1, + "Target": 1, + "ChildSkill": { + "Id": [ + 235003011 + ] + }, + "Desc": { + "key": "skill_1350030111", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 135003111, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_135003111", + "text": "漆黑1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 235003111 + ] + }, + "Desc": { + "key": "skill_1350031111", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 135003211, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_135003211", + "text": "漆黑2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 2, + "CD": -1, + "Target": 3, + "ChildSkill": { + "Id": [ + 235003211, + 235003212, + 235003213, + 235003214, + 235003216 + ] + }, + "Desc": { + "key": "skill_1350032111", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 135003311, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_135003311", + "text": "漆黑3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Target": 1, + "ChildSkill": { + "Id": [ + 235003311, + 235003312 + ] + }, + "Desc": { + "key": "skill_1350033111", + "text": "" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index fce53bc39..a02087bfa 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -907,6 +907,30 @@ "buffeffect": "", "buffpos": "" }, + { + "Id": 390001126, + "Name": { + "key": "skill_buff_390001126", + "text": "无法获得减益" + }, + "Desc": { + "key": "skill_buffdes_390001126", + "text": "无法附加减益状态" + }, + "BuffType": 0, + "EffectArgu": [], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": 3, + "AddEffect": false, + "RemoveType": false, + "OverlayTimes": 1, + "SameID": false, + "buffIcon": "", + "buffeffect": "", + "buffpos": "" + }, { "Id": 390001201, "Name": { @@ -1157,6 +1181,32 @@ "buffeffect": "", "buffpos": "" }, + { + "Id": 390001212, + "Name": { + "key": "skill_buff_390001212", + "text": "梦魇之惧" + }, + "Desc": { + "key": "skill_buffdes_390001212", + "text": "检测效果，最多叠加50层" + }, + "BuffType": 1, + "EffectArgu": [ + 10 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": 0, + "AddEffect": false, + "RemoveType": false, + "OverlayTimes": 50, + "SameID": false, + "buffIcon": "", + "buffeffect": "", + "buffpos": "" + }, { "Id": 390001301, "Name": { diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index a421f8e53..3387014bf 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -283,7 +283,7 @@ "AddCon": "", "PasPr": 1000, "Type": "CallSkillPas", - "MaxEmitTimes": 0, + "MaxEmitTimes": 1, "Callback": [ 244006212, 244006213 @@ -296,7 +296,7 @@ "AddCon": "SkillID=944006313", "PasPr": 1000, "Type": "CallSkillPas", - "MaxEmitTimes": 0, + "MaxEmitTimes": 1, "Callback": [ 944006318 ] @@ -308,7 +308,7 @@ "AddCon": "SkillID=944006323", "PasPr": 1000, "Type": "CallSkillPas", - "MaxEmitTimes": 0, + "MaxEmitTimes": 1, "Callback": [ 944006328 ] @@ -320,7 +320,7 @@ "AddCon": "SkillID=944006333", "PasPr": 1000, "Type": "CallSkillPas", - "MaxEmitTimes": 0, + "MaxEmitTimes": 1, "Callback": [ 944006338 ] @@ -332,7 +332,7 @@ "AddCon": "SkillID=944006343", "PasPr": 1000, "Type": "CallSkillPas", - "MaxEmitTimes": 0, + "MaxEmitTimes": 1, "Callback": [ 944006348 ] @@ -344,7 +344,7 @@ "AddCon": "SkillID=944006353", "PasPr": 1000, "Type": "CallSkillPas", - "MaxEmitTimes": 0, + "MaxEmitTimes": 1, "Callback": [ 944006358 ] @@ -356,7 +356,7 @@ "AddCon": "", "PasPr": 1000, "Type": "CallSkillPas", - "MaxEmitTimes": 0, + "MaxEmitTimes": 1, "Callback": [ 215005212 ] @@ -368,7 +368,7 @@ "AddCon": "BeyondHp=1000", "PasPr": 1000, "Type": "CallSkillPas", - "MaxEmitTimes": 0, + "MaxEmitTimes": 1, "Callback": [ 915005214 ] @@ -434,5 +434,42 @@ "Callback": [ 245003212 ] + }, + { + "Id": 435003211, + "When": "SufEff", + "TargetCheck": 3, + "AddCon": "EffType=0,Result=1", + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 99, + "Callback": [ + 235003215 + ] + }, + { + "Id": 435003212, + "When": "SufEff", + "TargetCheck": 3, + "AddCon": "EffType=0,Result=0", + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 99, + "Callback": [ + 235003215 + ] + }, + { + "Id": 435003213, + "When": "SufEnd", + "TargetCheck": 3, + "AddCon": "", + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 1, + "Callback": [ + 235003217, + 235003218 + ] } ] \ No newline at end of file