diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 2a6c2c692..530b1d2e1 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -2,7 +2,7 @@ { "id": 101, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -20,7 +20,7 @@ { "id": 102, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -38,7 +38,7 @@ { "id": 103, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -56,7 +56,7 @@ { "id": 104, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -74,7 +74,7 @@ { "id": 105, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -92,7 +92,7 @@ { "id": 106, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -110,7 +110,7 @@ { "id": 107, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -126,7 +126,7 @@ { "id": 108, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -142,7 +142,7 @@ { "id": 109, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -158,7 +158,7 @@ { "id": 110, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -174,7 +174,7 @@ { "id": 111, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -190,7 +190,7 @@ { "id": 112, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -206,7 +206,7 @@ { "id": 113, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -222,7 +222,7 @@ { "id": 114, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -238,7 +238,7 @@ { "id": 115, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -254,7 +254,7 @@ { "id": 116, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -272,7 +272,7 @@ { "id": 117, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -290,7 +290,7 @@ { "id": 118, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -306,7 +306,7 @@ { "id": 119, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -322,7 +322,7 @@ { "id": 120, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -338,7 +338,7 @@ { "id": 121, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -354,7 +354,7 @@ { "id": 122, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -372,7 +372,7 @@ { "id": 123, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -391,7 +391,7 @@ { "id": 124, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -407,7 +407,7 @@ { "id": 125, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -426,7 +426,7 @@ { "id": 126, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -442,7 +442,7 @@ { "id": 127, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -458,7 +458,7 @@ { "id": 128, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -474,7 +474,7 @@ { "id": 129, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -493,7 +493,7 @@ { "id": 130, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -511,7 +511,7 @@ { "id": 131, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -529,7 +529,7 @@ { "id": 132, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -548,7 +548,7 @@ { "id": 133, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -567,7 +567,7 @@ { "id": 134, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -585,7 +585,7 @@ { "id": 135, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -603,7 +603,7 @@ { "id": 136, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -624,7 +624,7 @@ { "id": 137, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -642,7 +642,7 @@ { "id": 138, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -658,7 +658,7 @@ { "id": 139, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -674,7 +674,7 @@ { "id": 140, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -692,7 +692,7 @@ { "id": 141, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -711,7 +711,7 @@ { "id": 142, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -730,7 +730,7 @@ { "id": 143, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -748,7 +748,7 @@ { "id": 144, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -764,7 +764,7 @@ { "id": 145, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -784,7 +784,7 @@ { "id": 146, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -803,7 +803,7 @@ { "id": 147, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -819,7 +819,7 @@ { "id": 148, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -838,7 +838,7 @@ { "id": 149, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -857,7 +857,7 @@ { "id": 150, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -875,7 +875,7 @@ { "id": 151, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -893,7 +893,7 @@ { "id": 152, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -911,7 +911,7 @@ { "id": 153, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -927,7 +927,7 @@ { "id": 154, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -943,7 +943,7 @@ { "id": 155, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -961,7 +961,7 @@ { "id": 156, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -980,7 +980,7 @@ { "id": 157, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -996,7 +996,7 @@ { "id": 158, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1012,7 +1012,7 @@ { "id": 159, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1028,7 +1028,7 @@ { "id": 160, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1044,7 +1044,7 @@ { "id": 161, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1062,7 +1062,7 @@ { "id": 162, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1078,7 +1078,7 @@ { "id": 163, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1094,7 +1094,7 @@ { "id": 164, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1110,7 +1110,7 @@ { "id": 165, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1128,7 +1128,7 @@ { "id": 166, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1146,7 +1146,7 @@ { "id": 167, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1164,7 +1164,7 @@ { "id": 168, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1180,7 +1180,7 @@ { "id": 169, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1196,7 +1196,7 @@ { "id": 170, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1214,7 +1214,7 @@ { "id": 171, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1232,7 +1232,7 @@ { "id": 172, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1248,7 +1248,7 @@ { "id": 173, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1264,7 +1264,7 @@ { "id": 174, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1282,7 +1282,7 @@ { "id": 175, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1300,7 +1300,7 @@ { "id": 176, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1318,7 +1318,7 @@ { "id": 177, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1336,7 +1336,7 @@ { "id": 178, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1354,7 +1354,7 @@ { "id": 179, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1372,7 +1372,7 @@ { "id": 180, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1390,7 +1390,7 @@ { "id": 181, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1408,7 +1408,7 @@ { "id": 182, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1426,7 +1426,7 @@ { "id": 183, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1444,7 +1444,7 @@ { "id": 184, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1462,7 +1462,7 @@ { "id": 185, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1480,7 +1480,7 @@ { "id": 186, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1498,7 +1498,7 @@ { "id": 187, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1514,7 +1514,7 @@ { "id": 188, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1530,7 +1530,7 @@ { "id": 189, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1548,7 +1548,7 @@ { "id": 190, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1566,7 +1566,7 @@ { "id": 191, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1584,7 +1584,7 @@ { "id": 192, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1602,7 +1602,7 @@ { "id": 193, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1620,7 +1620,7 @@ { "id": 195, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1638,7 +1638,7 @@ { "id": 196, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1656,7 +1656,7 @@ { "id": 197, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1674,7 +1674,7 @@ { "id": 198, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1692,7 +1692,7 @@ { "id": 199, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1710,7 +1710,7 @@ { "id": 200, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1728,7 +1728,7 @@ { "id": 201, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1746,7 +1746,7 @@ { "id": 202, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1764,7 +1764,7 @@ { "id": 203, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1780,7 +1780,7 @@ { "id": 301, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1798,7 +1798,7 @@ { "id": 302, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1816,7 +1816,7 @@ { "id": 303, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1834,7 +1834,7 @@ { "id": 304, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1853,7 +1853,7 @@ { "id": 305, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1871,7 +1871,7 @@ { "id": 306, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1887,7 +1887,7 @@ { "id": 307, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1905,7 +1905,7 @@ { "id": 308, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1924,7 +1924,7 @@ { "id": 309, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1943,7 +1943,7 @@ { "id": 10001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1959,7 +1959,7 @@ { "id": 10002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1975,7 +1975,7 @@ { "id": 10003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -1991,7 +1991,7 @@ { "id": 10004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2007,7 +2007,7 @@ { "id": 10005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2023,7 +2023,7 @@ { "id": 10006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2039,7 +2039,7 @@ { "id": 10007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2055,7 +2055,7 @@ { "id": 10008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2071,7 +2071,7 @@ { "id": 10009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2087,7 +2087,7 @@ { "id": 10010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2103,7 +2103,7 @@ { "id": 10101, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2119,7 +2119,7 @@ { "id": 10201, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2135,7 +2135,7 @@ { "id": 10202, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2151,7 +2151,7 @@ { "id": 10203, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2167,7 +2167,7 @@ { "id": 10204, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2183,7 +2183,7 @@ { "id": 10205, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2199,7 +2199,7 @@ { "id": 10206, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2215,7 +2215,7 @@ { "id": 10207, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2231,7 +2231,7 @@ { "id": 10208, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2247,7 +2247,7 @@ { "id": 10209, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2263,7 +2263,7 @@ { "id": 10210, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2279,7 +2279,7 @@ { "id": 10301, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2295,7 +2295,7 @@ { "id": 10302, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2313,7 +2313,7 @@ { "id": 10303, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2331,7 +2331,7 @@ { "id": 10304, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2349,7 +2349,7 @@ { "id": 10305, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2367,7 +2367,7 @@ { "id": 10306, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2385,7 +2385,7 @@ { "id": 10307, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2403,7 +2403,7 @@ { "id": 10308, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2421,7 +2421,7 @@ { "id": 10309, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2439,7 +2439,7 @@ { "id": 10310, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2457,7 +2457,7 @@ { "id": 10401, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2475,7 +2475,7 @@ { "id": 10402, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2493,7 +2493,7 @@ { "id": 10403, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2511,7 +2511,7 @@ { "id": 10404, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2529,7 +2529,7 @@ { "id": 10405, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2547,7 +2547,7 @@ { "id": 10406, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2565,7 +2565,7 @@ { "id": 10407, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2583,7 +2583,7 @@ { "id": 10408, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2601,7 +2601,7 @@ { "id": 10409, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2619,7 +2619,7 @@ { "id": 10410, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2637,7 +2637,7 @@ { "id": 10501, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2653,7 +2653,7 @@ { "id": 10502, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2669,7 +2669,7 @@ { "id": 10503, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2685,7 +2685,7 @@ { "id": 10504, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2701,7 +2701,7 @@ { "id": 10505, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2717,7 +2717,7 @@ { "id": 10506, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2733,7 +2733,7 @@ { "id": 10507, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2749,7 +2749,7 @@ { "id": 10508, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2765,7 +2765,7 @@ { "id": 10601, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2781,7 +2781,7 @@ { "id": 10602, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2797,7 +2797,7 @@ { "id": 10603, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2813,7 +2813,7 @@ { "id": 10701, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2829,7 +2829,7 @@ { "id": 10702, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2845,7 +2845,7 @@ { "id": 10703, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2861,7 +2861,7 @@ { "id": 10704, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2877,7 +2877,7 @@ { "id": 10705, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2893,7 +2893,7 @@ { "id": 10706, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2909,7 +2909,7 @@ { "id": 10707, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2925,7 +2925,7 @@ { "id": 10708, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2941,7 +2941,7 @@ { "id": 10709, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2957,7 +2957,7 @@ { "id": 10710, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2973,7 +2973,7 @@ { "id": 10801, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -2989,7 +2989,7 @@ { "id": 10802, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3005,7 +3005,7 @@ { "id": 10803, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3021,7 +3021,7 @@ { "id": 10804, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3037,7 +3037,7 @@ { "id": 10805, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3053,7 +3053,7 @@ { "id": 10806, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3069,7 +3069,7 @@ { "id": 10807, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3085,7 +3085,7 @@ { "id": 10808, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3101,7 +3101,7 @@ { "id": 10809, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3117,7 +3117,7 @@ { "id": 10810, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3133,7 +3133,7 @@ { "id": 2008001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3149,7 +3149,7 @@ { "id": 2012001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3165,7 +3165,7 @@ { "id": 2018001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3181,7 +3181,7 @@ { "id": 2024001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3197,7 +3197,7 @@ { "id": 2047001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3213,7 +3213,7 @@ { "id": 2062001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3229,7 +3229,7 @@ { "id": 2064001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3245,7 +3245,7 @@ { "id": 2130001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3261,7 +3261,7 @@ { "id": 3008001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3277,7 +3277,7 @@ { "id": 3012001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3293,7 +3293,7 @@ { "id": 3018001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3309,7 +3309,7 @@ { "id": 3024001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3325,7 +3325,7 @@ { "id": 3047001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3341,7 +3341,7 @@ { "id": 3061001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3357,7 +3357,7 @@ { "id": 3064001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3373,7 +3373,7 @@ { "id": 3088001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3389,7 +3389,7 @@ { "id": 3105001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3405,7 +3405,7 @@ { "id": 3104001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3421,7 +3421,7 @@ { "id": 3130001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3437,7 +3437,7 @@ { "id": 4008001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3453,7 +3453,7 @@ { "id": 4008002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3469,7 +3469,7 @@ { "id": 4008003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3485,7 +3485,7 @@ { "id": 4008004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3501,7 +3501,7 @@ { "id": 4008005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3517,7 +3517,7 @@ { "id": 4008006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3533,7 +3533,7 @@ { "id": 4008007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3549,7 +3549,7 @@ { "id": 4008008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3565,7 +3565,7 @@ { "id": 4008009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3581,7 +3581,7 @@ { "id": 4008010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3597,7 +3597,7 @@ { "id": 4010001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3613,7 +3613,7 @@ { "id": 4010002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3629,7 +3629,7 @@ { "id": 4010003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3645,7 +3645,7 @@ { "id": 4010004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3661,7 +3661,7 @@ { "id": 4010005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3677,7 +3677,7 @@ { "id": 4010006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3693,7 +3693,7 @@ { "id": 4011001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3709,7 +3709,7 @@ { "id": 4011002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3725,7 +3725,7 @@ { "id": 4011003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3741,7 +3741,7 @@ { "id": 4011004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3757,7 +3757,7 @@ { "id": 4011005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3773,7 +3773,7 @@ { "id": 4011006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3789,7 +3789,7 @@ { "id": 4011007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3805,7 +3805,7 @@ { "id": 4011008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3821,7 +3821,7 @@ { "id": 4011009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3837,7 +3837,7 @@ { "id": 4011010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3853,7 +3853,7 @@ { "id": 4011011, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3869,7 +3869,7 @@ { "id": 4012001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3885,7 +3885,7 @@ { "id": 4012002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3901,7 +3901,7 @@ { "id": 4012003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3917,7 +3917,7 @@ { "id": 4012004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3933,7 +3933,7 @@ { "id": 4012005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3949,7 +3949,7 @@ { "id": 4012006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3965,7 +3965,7 @@ { "id": 4012007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3981,7 +3981,7 @@ { "id": 4012008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -3997,7 +3997,7 @@ { "id": 4012009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4013,7 +4013,7 @@ { "id": 4016001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4031,7 +4031,7 @@ { "id": 4016002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4049,7 +4049,7 @@ { "id": 4016003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4067,7 +4067,7 @@ { "id": 4016004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4085,7 +4085,7 @@ { "id": 4016005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4103,7 +4103,7 @@ { "id": 4016006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4121,7 +4121,7 @@ { "id": 4016007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4139,7 +4139,7 @@ { "id": 4016008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4157,7 +4157,7 @@ { "id": 4016009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4175,7 +4175,7 @@ { "id": 4018001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4191,7 +4191,7 @@ { "id": 4018002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4207,7 +4207,7 @@ { "id": 4018003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4223,7 +4223,7 @@ { "id": 4018004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4239,7 +4239,7 @@ { "id": 4018005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4255,7 +4255,7 @@ { "id": 4018006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4271,7 +4271,7 @@ { "id": 4018007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4287,7 +4287,7 @@ { "id": 4018008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4303,7 +4303,7 @@ { "id": 4018009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4319,7 +4319,7 @@ { "id": 4018010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4335,7 +4335,7 @@ { "id": 4018011, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4351,7 +4351,7 @@ { "id": 4018012, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4367,7 +4367,7 @@ { "id": 4020001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4383,7 +4383,7 @@ { "id": 4020002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4399,7 +4399,7 @@ { "id": 4020003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4415,7 +4415,7 @@ { "id": 4020004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4431,7 +4431,7 @@ { "id": 4020005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4447,7 +4447,7 @@ { "id": 4020006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4463,7 +4463,7 @@ { "id": 4043001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4481,7 +4481,7 @@ { "id": 4043002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4499,7 +4499,7 @@ { "id": 4043003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4517,7 +4517,7 @@ { "id": 4043004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4535,7 +4535,7 @@ { "id": 4043005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4553,7 +4553,7 @@ { "id": 4043006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4571,7 +4571,7 @@ { "id": 4043007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4589,7 +4589,7 @@ { "id": 4043008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4607,7 +4607,7 @@ { "id": 4043009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4625,7 +4625,7 @@ { "id": 4043010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4643,7 +4643,7 @@ { "id": 4047001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4659,7 +4659,7 @@ { "id": 4047002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4675,7 +4675,7 @@ { "id": 4047003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4691,7 +4691,7 @@ { "id": 4047004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4707,7 +4707,7 @@ { "id": 4047005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4723,7 +4723,7 @@ { "id": 4047006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4739,7 +4739,7 @@ { "id": 4047007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4755,7 +4755,7 @@ { "id": 4047008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4771,7 +4771,7 @@ { "id": 4047009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4787,7 +4787,7 @@ { "id": 4047010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4803,7 +4803,7 @@ { "id": 4047011, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4819,7 +4819,7 @@ { "id": 4047012, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4835,7 +4835,7 @@ { "id": 4047013, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4851,7 +4851,7 @@ { "id": 4064001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4867,7 +4867,7 @@ { "id": 4064002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4883,7 +4883,7 @@ { "id": 4064003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4899,7 +4899,7 @@ { "id": 4064004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4915,7 +4915,7 @@ { "id": 4064005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4931,7 +4931,7 @@ { "id": 4064006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4947,7 +4947,7 @@ { "id": 4064007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4963,7 +4963,7 @@ { "id": 4068001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4979,7 +4979,7 @@ { "id": 4068002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -4995,7 +4995,7 @@ { "id": 4068003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5011,7 +5011,7 @@ { "id": 4068004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5027,7 +5027,7 @@ { "id": 4084001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5043,7 +5043,7 @@ { "id": 4084002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5059,7 +5059,7 @@ { "id": 4084003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5075,7 +5075,7 @@ { "id": 4084004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5091,7 +5091,7 @@ { "id": 4085001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5107,7 +5107,7 @@ { "id": 4085002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5123,7 +5123,7 @@ { "id": 4085003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5139,7 +5139,7 @@ { "id": 4085004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5155,7 +5155,7 @@ { "id": 4085005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5171,7 +5171,7 @@ { "id": 4096001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5187,7 +5187,7 @@ { "id": 4096002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5203,7 +5203,7 @@ { "id": 4096003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5219,7 +5219,7 @@ { "id": 4096004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5235,7 +5235,7 @@ { "id": 4096005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5251,7 +5251,7 @@ { "id": 4096006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5267,7 +5267,7 @@ { "id": 4096007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5283,7 +5283,7 @@ { "id": 4096008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5299,7 +5299,7 @@ { "id": 4096009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5315,7 +5315,7 @@ { "id": 4096010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5331,7 +5331,7 @@ { "id": 4096011, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5347,7 +5347,7 @@ { "id": 4096012, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5363,7 +5363,7 @@ { "id": 4104001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5379,7 +5379,7 @@ { "id": 4104002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5395,7 +5395,7 @@ { "id": 4104003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5411,7 +5411,7 @@ { "id": 4104004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5427,7 +5427,7 @@ { "id": 4104005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5443,7 +5443,7 @@ { "id": 4104006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5459,7 +5459,7 @@ { "id": 4104007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5475,7 +5475,7 @@ { "id": 4104008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5491,7 +5491,7 @@ { "id": 4104009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5507,7 +5507,7 @@ { "id": 4104010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5523,7 +5523,7 @@ { "id": 4104011, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5539,7 +5539,7 @@ { "id": 4128001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5555,7 +5555,7 @@ { "id": 4128002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5571,7 +5571,7 @@ { "id": 4128003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5587,7 +5587,7 @@ { "id": 4128004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5603,7 +5603,7 @@ { "id": 4128005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5619,7 +5619,7 @@ { "id": 4128006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5635,7 +5635,7 @@ { "id": 4128007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5651,7 +5651,7 @@ { "id": 4128008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5667,7 +5667,7 @@ { "id": 4128009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5683,7 +5683,7 @@ { "id": 4128010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5699,7 +5699,7 @@ { "id": 4131001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5715,7 +5715,7 @@ { "id": 4131002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5731,7 +5731,7 @@ { "id": 4131003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5747,7 +5747,7 @@ { "id": 4131004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5763,7 +5763,7 @@ { "id": 4131005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5779,7 +5779,7 @@ { "id": 4131006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5795,7 +5795,7 @@ { "id": 4131007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5811,7 +5811,7 @@ { "id": 4131008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5827,7 +5827,7 @@ { "id": 4131009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5843,7 +5843,7 @@ { "id": 4131010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5859,7 +5859,7 @@ { "id": 5011001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5875,7 +5875,7 @@ { "id": 5012001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5891,7 +5891,7 @@ { "id": 5018001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5907,7 +5907,7 @@ { "id": 5024001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5923,7 +5923,7 @@ { "id": 5047001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5939,7 +5939,7 @@ { "id": 5063001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5955,7 +5955,7 @@ { "id": 5068001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5971,7 +5971,7 @@ { "id": 5104001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -5987,7 +5987,7 @@ { "id": 20001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6005,7 +6005,7 @@ { "id": 20002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6023,7 +6023,7 @@ { "id": 30001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6041,7 +6041,7 @@ { "id": 30002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6059,7 +6059,7 @@ { "id": 30003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6077,7 +6077,7 @@ { "id": 30004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6095,7 +6095,7 @@ { "id": 30005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6113,7 +6113,7 @@ { "id": 30006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6131,7 +6131,7 @@ { "id": 600001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6149,7 +6149,7 @@ { "id": 600002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6165,7 +6165,7 @@ { "id": 600003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6184,7 +6184,7 @@ { "id": 600004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6203,7 +6203,7 @@ { "id": 600005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6222,7 +6222,7 @@ { "id": 600006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6240,7 +6240,7 @@ { "id": 600007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6258,7 +6258,7 @@ { "id": 600008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6274,7 +6274,7 @@ { "id": 600009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6293,7 +6293,7 @@ { "id": 600010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6311,7 +6311,7 @@ { "id": 600011, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6329,7 +6329,7 @@ { "id": 600012, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6347,7 +6347,7 @@ { "id": 600013, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6366,7 +6366,7 @@ { "id": 600014, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6384,7 +6384,7 @@ { "id": 600015, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6402,7 +6402,7 @@ { "id": 600016, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6420,7 +6420,7 @@ { "id": 600017, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6439,7 +6439,7 @@ { "id": 600018, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6457,7 +6457,7 @@ { "id": 600019, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6473,7 +6473,7 @@ { "id": 600020, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6491,7 +6491,7 @@ { "id": 600021, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6509,7 +6509,7 @@ { "id": 600022, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6525,7 +6525,7 @@ { "id": 600023, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6541,7 +6541,7 @@ { "id": 600024, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6560,7 +6560,7 @@ { "id": 600025, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6579,7 +6579,7 @@ { "id": 600026, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6597,7 +6597,7 @@ { "id": 600027, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6615,7 +6615,7 @@ { "id": 600028, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6633,7 +6633,7 @@ { "id": 600029, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6651,7 +6651,7 @@ { "id": 600030, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6667,7 +6667,7 @@ { "id": 600031, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6686,7 +6686,7 @@ { "id": 600032, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6704,7 +6704,7 @@ { "id": 600033, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6722,7 +6722,7 @@ { "id": 600034, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6740,7 +6740,7 @@ { "id": 600035, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6758,7 +6758,7 @@ { "id": 600036, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6776,7 +6776,7 @@ { "id": 600037, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6795,7 +6795,7 @@ { "id": 600038, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6813,7 +6813,7 @@ { "id": 600039, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6831,7 +6831,7 @@ { "id": 600040, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6849,7 +6849,7 @@ { "id": 600041, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6867,7 +6867,7 @@ { "id": 600042, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6886,7 +6886,7 @@ { "id": 600043, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6904,7 +6904,7 @@ { "id": 600044, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6922,7 +6922,7 @@ { "id": 600045, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6938,7 +6938,7 @@ { "id": 600046, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6956,7 +6956,7 @@ { "id": 600047, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6974,7 +6974,7 @@ { "id": 600048, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -6992,7 +6992,7 @@ { "id": 600049, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7010,7 +7010,7 @@ { "id": 600050, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7028,7 +7028,7 @@ { "id": 600051, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7046,7 +7046,7 @@ { "id": 600052, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7064,7 +7064,7 @@ { "id": 600053, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7082,7 +7082,7 @@ { "id": 600054, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7100,7 +7100,7 @@ { "id": 600055, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7118,7 +7118,7 @@ { "id": 600056, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7136,7 +7136,7 @@ { "id": 600057, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7154,7 +7154,7 @@ { "id": 600058, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7172,7 +7172,7 @@ { "id": 600059, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7190,7 +7190,7 @@ { "id": 600060, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7208,7 +7208,7 @@ { "id": 600061, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7226,7 +7226,7 @@ { "id": 600062, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7244,7 +7244,7 @@ { "id": 600063, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7262,7 +7262,7 @@ { "id": 600064, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7280,7 +7280,7 @@ { "id": 600065, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7298,7 +7298,7 @@ { "id": 600066, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7316,7 +7316,7 @@ { "id": 600067, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7334,7 +7334,7 @@ { "id": 600068, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7352,7 +7352,7 @@ { "id": 600069, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7370,7 +7370,7 @@ { "id": 600070, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7388,7 +7388,7 @@ { "id": 700001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7404,7 +7404,7 @@ { "id": 700002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7420,7 +7420,7 @@ { "id": 700003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7436,7 +7436,7 @@ { "id": 700004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7454,7 +7454,7 @@ { "id": 700005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7472,7 +7472,7 @@ { "id": 700006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7488,7 +7488,7 @@ { "id": 700007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7504,7 +7504,7 @@ { "id": 700008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7520,7 +7520,7 @@ { "id": 700009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7536,7 +7536,7 @@ { "id": 700010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7555,7 +7555,7 @@ { "id": 700011, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7571,7 +7571,7 @@ { "id": 700012, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7589,7 +7589,7 @@ { "id": 700013, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7605,7 +7605,7 @@ { "id": 700014, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7621,7 +7621,7 @@ { "id": 700015, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7637,7 +7637,7 @@ { "id": 700016, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7655,7 +7655,7 @@ { "id": 700017, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7673,7 +7673,7 @@ { "id": 700018, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7691,7 +7691,7 @@ { "id": 700019, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7709,7 +7709,7 @@ { "id": 700020, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7725,7 +7725,7 @@ { "id": 700021, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7743,7 +7743,7 @@ { "id": 700022, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7761,7 +7761,7 @@ { "id": 700023, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7779,7 +7779,7 @@ { "id": 700024, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7797,7 +7797,7 @@ { "id": 700025, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7815,7 +7815,7 @@ { "id": 700026, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7834,7 +7834,7 @@ { "id": 700027, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7850,7 +7850,7 @@ { "id": 700028, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7866,7 +7866,7 @@ { "id": 700029, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7882,7 +7882,7 @@ { "id": 700030, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7898,7 +7898,7 @@ { "id": 700031, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7914,7 +7914,7 @@ { "id": 700032, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7930,7 +7930,7 @@ { "id": 700033, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7946,7 +7946,7 @@ { "id": 700034, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7962,7 +7962,7 @@ { "id": 700035, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7980,7 +7980,7 @@ { "id": 700036, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -7998,7 +7998,7 @@ { "id": 700037, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8016,7 +8016,7 @@ { "id": 700038, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8034,7 +8034,7 @@ { "id": 700039, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8053,7 +8053,7 @@ { "id": 700040, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8071,7 +8071,7 @@ { "id": 700041, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8090,7 +8090,7 @@ { "id": 700042, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8109,7 +8109,7 @@ { "id": 700043, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8127,7 +8127,7 @@ { "id": 700044, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8146,7 +8146,7 @@ { "id": 700045, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8165,7 +8165,7 @@ { "id": 700046, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8184,7 +8184,7 @@ { "id": 700047, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8203,7 +8203,7 @@ { "id": 700048, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8221,7 +8221,7 @@ { "id": 700049, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8240,7 +8240,7 @@ { "id": 700050, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8259,7 +8259,7 @@ { "id": 700052, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8277,7 +8277,7 @@ { "id": 700053, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8296,7 +8296,7 @@ { "id": 700054, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8315,7 +8315,7 @@ { "id": 700056, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8333,7 +8333,7 @@ { "id": 700057, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8352,7 +8352,7 @@ { "id": 700058, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8371,7 +8371,7 @@ { "id": 700060, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8389,7 +8389,7 @@ { "id": 700061, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8408,7 +8408,7 @@ { "id": 700062, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8427,7 +8427,7 @@ { "id": 700064, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8445,7 +8445,7 @@ { "id": 700065, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8461,7 +8461,7 @@ { "id": 700066, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8477,7 +8477,7 @@ { "id": 700067, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8493,7 +8493,7 @@ { "id": 700068, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8509,7 +8509,7 @@ { "id": 700069, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8525,7 +8525,7 @@ { "id": 700070, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8541,7 +8541,7 @@ { "id": 700071, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8557,7 +8557,7 @@ { "id": 700072, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8573,7 +8573,7 @@ { "id": 700073, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8589,7 +8589,7 @@ { "id": 700074, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8605,7 +8605,7 @@ { "id": 700075, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8621,7 +8621,7 @@ { "id": 700076, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8640,7 +8640,7 @@ { "id": 700077, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8659,7 +8659,7 @@ { "id": 700078, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8677,7 +8677,7 @@ { "id": 700079, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8695,7 +8695,7 @@ { "id": 700080, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8713,7 +8713,7 @@ { "id": 700081, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8729,7 +8729,7 @@ { "id": 700082, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8745,7 +8745,7 @@ { "id": 700083, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8764,7 +8764,7 @@ { "id": 700084, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8783,7 +8783,7 @@ { "id": 700085, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8799,7 +8799,7 @@ { "id": 700086, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8818,7 +8818,7 @@ { "id": 700087, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8836,7 +8836,7 @@ { "id": 700088, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8855,7 +8855,7 @@ { "id": 700089, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8874,7 +8874,7 @@ { "id": 700090, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8893,7 +8893,7 @@ { "id": 700091, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -8912,7 +8912,7 @@ { "id": 11187001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -8932,7 +8932,7 @@ { "id": 11187002, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -8952,7 +8952,7 @@ { "id": 11187003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -8972,7 +8972,7 @@ { "id": 11187004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -8992,7 +8992,7 @@ { "id": 11187005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9012,7 +9012,7 @@ { "id": 11187006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9032,7 +9032,7 @@ { "id": 11187007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9052,7 +9052,7 @@ { "id": 11187008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9072,7 +9072,7 @@ { "id": 11187009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9092,7 +9092,7 @@ { "id": 11187010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9112,7 +9112,7 @@ { "id": 11187011, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9132,7 +9132,7 @@ { "id": 11187012, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9152,7 +9152,7 @@ { "id": 11187013, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9172,7 +9172,7 @@ { "id": 11187014, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9192,7 +9192,7 @@ { "id": 11187015, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9212,7 +9212,7 @@ { "id": 11187016, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9232,7 +9232,7 @@ { "id": 11187017, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9252,7 +9252,7 @@ { "id": 11187018, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9272,7 +9272,7 @@ { "id": 11187019, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9292,7 +9292,7 @@ { "id": 11187020, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9312,7 +9312,7 @@ { "id": 11187021, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9332,7 +9332,7 @@ { "id": 11187022, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9352,7 +9352,7 @@ { "id": 11187023, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9372,7 +9372,7 @@ { "id": 11187024, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9392,7 +9392,7 @@ { "id": 11187025, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9412,7 +9412,7 @@ { "id": 11187026, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9432,7 +9432,7 @@ { "id": 11187027, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9452,7 +9452,7 @@ { "id": 11187028, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9472,7 +9472,7 @@ { "id": 11187029, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9492,7 +9492,7 @@ { "id": 11187030, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9512,7 +9512,7 @@ { "id": 11187031, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9532,7 +9532,7 @@ { "id": 11187032, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9552,7 +9552,7 @@ { "id": 11187033, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9572,7 +9572,7 @@ { "id": 11187034, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9592,7 +9592,7 @@ { "id": 11187035, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9612,7 +9612,7 @@ { "id": 11187036, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9632,7 +9632,7 @@ { "id": 11187037, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9652,7 +9652,7 @@ { "id": 11187038, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9672,7 +9672,7 @@ { "id": 11187039, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9692,7 +9692,7 @@ { "id": 11187040, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9712,7 +9712,7 @@ { "id": 11187041, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9732,7 +9732,7 @@ { "id": 11187042, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9752,7 +9752,7 @@ { "id": 11187043, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9772,7 +9772,7 @@ { "id": 11187044, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9792,7 +9792,7 @@ { "id": 11187045, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9812,7 +9812,7 @@ { "id": 11187046, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9832,7 +9832,7 @@ { "id": 11187047, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9852,7 +9852,7 @@ { "id": 11187048, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9872,7 +9872,7 @@ { "id": 11187049, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9892,7 +9892,7 @@ { "id": 11187050, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9912,7 +9912,7 @@ { "id": 11187051, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9932,7 +9932,7 @@ { "id": 11187052, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9952,7 +9952,7 @@ { "id": 11187053, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9972,7 +9972,7 @@ { "id": 11187054, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -9992,7 +9992,7 @@ { "id": 11187055, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10012,7 +10012,7 @@ { "id": 11187056, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10032,7 +10032,7 @@ { "id": 11187057, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10052,7 +10052,7 @@ { "id": 11187058, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10072,7 +10072,7 @@ { "id": 11187059, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10092,7 +10092,7 @@ { "id": 11187060, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10112,7 +10112,7 @@ { "id": 11187061, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10132,7 +10132,7 @@ { "id": 11187062, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10152,7 +10152,7 @@ { "id": 11187063, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10172,7 +10172,7 @@ { "id": 11187064, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10192,7 +10192,7 @@ { "id": 11187065, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10212,7 +10212,7 @@ { "id": 11187066, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10232,7 +10232,7 @@ { "id": 11187067, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10252,7 +10252,7 @@ { "id": 11187068, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10272,7 +10272,7 @@ { "id": 11187069, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10292,7 +10292,7 @@ { "id": 11187070, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10312,7 +10312,7 @@ { "id": 11187071, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10332,7 +10332,7 @@ { "id": 11187072, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10352,7 +10352,7 @@ { "id": 11187073, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10372,7 +10372,7 @@ { "id": 11187074, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10392,7 +10392,7 @@ { "id": 11187075, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10412,7 +10412,7 @@ { "id": 11187076, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10432,7 +10432,7 @@ { "id": 11187077, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10452,7 +10452,7 @@ { "id": 11187078, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [ "combat" ], @@ -10472,7 +10472,7 @@ { "id": 110001, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10490,7 +10490,7 @@ { "id": 110003, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10508,7 +10508,7 @@ { "id": 110004, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10526,7 +10526,7 @@ { "id": 110005, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10544,7 +10544,7 @@ { "id": 110006, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10562,7 +10562,7 @@ { "id": 110007, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10578,7 +10578,7 @@ { "id": 110008, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10594,7 +10594,7 @@ { "id": 110009, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10610,7 +10610,7 @@ { "id": 110010, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10626,7 +10626,7 @@ { "id": 110012, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10642,7 +10642,7 @@ { "id": 110013, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10658,7 +10658,7 @@ { "id": 110014, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10674,7 +10674,7 @@ { "id": 110015, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10690,7 +10690,7 @@ { "id": 110016, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10708,7 +10708,7 @@ { "id": 110017, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10726,7 +10726,7 @@ { "id": 110018, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10742,7 +10742,7 @@ { "id": 110019, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10758,7 +10758,7 @@ { "id": 110020, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10774,7 +10774,7 @@ { "id": 110023, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10793,7 +10793,7 @@ { "id": 110024, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10809,7 +10809,7 @@ { "id": 110025, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10828,7 +10828,7 @@ { "id": 110026, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10844,7 +10844,7 @@ { "id": 110027, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10860,7 +10860,7 @@ { "id": 110028, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10876,7 +10876,7 @@ { "id": 110030, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10894,7 +10894,7 @@ { "id": 110032, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10913,7 +10913,7 @@ { "id": 110033, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10932,7 +10932,7 @@ { "id": 110034, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10950,7 +10950,7 @@ { "id": 110035, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10968,7 +10968,7 @@ { "id": 110036, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -10989,7 +10989,7 @@ { "id": 110037, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11007,7 +11007,7 @@ { "id": 110038, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11023,7 +11023,7 @@ { "id": 110039, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11039,7 +11039,7 @@ { "id": 110040, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11057,7 +11057,7 @@ { "id": 110041, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11076,7 +11076,7 @@ { "id": 110042, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11095,7 +11095,7 @@ { "id": 110043, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11113,7 +11113,7 @@ { "id": 110046, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11132,7 +11132,7 @@ { "id": 110047, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11148,7 +11148,7 @@ { "id": 110050, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11166,7 +11166,7 @@ { "id": 110051, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11184,7 +11184,7 @@ { "id": 110052, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11202,7 +11202,7 @@ { "id": 110053, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11218,7 +11218,7 @@ { "id": 110054, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11234,7 +11234,7 @@ { "id": 110055, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11252,7 +11252,7 @@ { "id": 110056, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11271,7 +11271,7 @@ { "id": 110057, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11287,7 +11287,7 @@ { "id": 110060, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11303,7 +11303,7 @@ { "id": 110061, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11321,7 +11321,7 @@ { "id": 110062, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11337,7 +11337,7 @@ { "id": 110064, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11353,7 +11353,7 @@ { "id": 110065, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11371,7 +11371,7 @@ { "id": 110066, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11389,7 +11389,7 @@ { "id": 110067, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11407,7 +11407,7 @@ { "id": 110068, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11423,7 +11423,7 @@ { "id": 110070, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11441,7 +11441,7 @@ { "id": 110072, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11460,7 +11460,7 @@ { "id": 110073, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11479,7 +11479,7 @@ { "id": 110074, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11498,7 +11498,7 @@ { "id": 110075, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11516,7 +11516,7 @@ { "id": 110076, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11535,7 +11535,7 @@ { "id": 110077, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11555,7 +11555,7 @@ { "id": 110078, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11573,7 +11573,7 @@ { "id": 110079, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11592,7 +11592,7 @@ { "id": 110080, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11610,7 +11610,7 @@ { "id": 110081, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11628,7 +11628,7 @@ { "id": 110082, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11647,7 +11647,7 @@ { "id": 110086, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11663,7 +11663,7 @@ { "id": 110087, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11679,7 +11679,7 @@ { "id": 110088, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11695,7 +11695,7 @@ { "id": 110089, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11711,7 +11711,7 @@ { "id": 110090, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11727,7 +11727,7 @@ { "id": 110091, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11743,7 +11743,7 @@ { "id": 110092, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11762,7 +11762,7 @@ { "id": 110093, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11778,7 +11778,7 @@ { "id": 110094, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11794,7 +11794,7 @@ { "id": 110095, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11810,7 +11810,7 @@ { "id": 110096, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11829,7 +11829,7 @@ { "id": 110097, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11847,7 +11847,7 @@ { "id": 110098, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11866,7 +11866,7 @@ { "id": 110101, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11882,7 +11882,7 @@ { "id": 110102, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11900,7 +11900,7 @@ { "id": 110103, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11916,7 +11916,7 @@ { "id": 110104, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11932,7 +11932,7 @@ { "id": 110105, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11948,7 +11948,7 @@ { "id": 110106, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11964,7 +11964,7 @@ { "id": 110107, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11980,7 +11980,7 @@ { "id": 110109, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -11998,7 +11998,7 @@ { "id": 110110, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12016,7 +12016,7 @@ { "id": 110111, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12032,7 +12032,7 @@ { "id": 110112, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12050,7 +12050,7 @@ { "id": 110113, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12068,7 +12068,7 @@ { "id": 110114, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12086,7 +12086,7 @@ { "id": 110115, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12104,7 +12104,7 @@ { "id": 110116, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12123,7 +12123,7 @@ { "id": 110117, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12141,7 +12141,7 @@ { "id": 110118, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12157,7 +12157,7 @@ { "id": 110119, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12175,7 +12175,7 @@ { "id": 110120, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12193,7 +12193,7 @@ { "id": 110121, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12212,7 +12212,7 @@ { "id": 110122, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12228,7 +12228,7 @@ { "id": 110123, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12246,7 +12246,7 @@ { "id": 110124, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12264,7 +12264,7 @@ { "id": 110125, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12282,7 +12282,7 @@ { "id": 110126, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12298,7 +12298,7 @@ { "id": 110127, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12314,7 +12314,7 @@ { "id": 110128, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12330,7 +12330,7 @@ { "id": 110129, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12346,7 +12346,7 @@ { "id": 110130, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12364,7 +12364,7 @@ { "id": 110131, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12382,7 +12382,7 @@ { "id": 110132, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12398,7 +12398,7 @@ { "id": 110133, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12414,7 +12414,7 @@ { "id": 110136, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12430,7 +12430,7 @@ { "id": 110138, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12448,7 +12448,7 @@ { "id": 110145, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12466,7 +12466,7 @@ { "id": 110146, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12482,7 +12482,7 @@ { "id": 110147, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12498,7 +12498,7 @@ { "id": 110150, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12514,7 +12514,7 @@ { "id": 110151, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12530,7 +12530,7 @@ { "id": 110152, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12546,7 +12546,7 @@ { "id": 110153, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12562,7 +12562,7 @@ { "id": 110154, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12578,7 +12578,7 @@ { "id": 110156, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12597,7 +12597,7 @@ { "id": 110157, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12615,7 +12615,7 @@ { "id": 110158, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12633,7 +12633,7 @@ { "id": 110159, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12649,7 +12649,7 @@ { "id": 110160, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12665,7 +12665,7 @@ { "id": 110161, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12681,7 +12681,7 @@ { "id": 110162, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12697,7 +12697,7 @@ { "id": 110163, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12713,7 +12713,7 @@ { "id": 110164, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12729,7 +12729,7 @@ { "id": 110165, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12745,7 +12745,7 @@ { "id": 110166, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12763,7 +12763,7 @@ { "id": 110167, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12779,7 +12779,7 @@ { "id": 110168, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12797,7 +12797,7 @@ { "id": 110169, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12813,7 +12813,7 @@ { "id": 110170, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12829,7 +12829,7 @@ { "id": 110171, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12845,7 +12845,7 @@ { "id": 110172, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12863,7 +12863,7 @@ { "id": 110173, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12879,7 +12879,7 @@ { "id": 110174, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12895,7 +12895,7 @@ { "id": 110175, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12913,7 +12913,7 @@ { "id": 110176, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12931,7 +12931,7 @@ { "id": 110177, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12950,7 +12950,7 @@ { "id": 110178, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12966,7 +12966,7 @@ { "id": 110179, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12982,7 +12982,7 @@ { "id": 110180, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -12998,7 +12998,7 @@ { "id": 110181, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -13014,7 +13014,7 @@ { "id": 110182, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { @@ -13030,7 +13030,7 @@ { "id": 110183, "rtype": 1, - "lock": 1, + "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json index c6b566330..af3d66d5f 100644 --- a/bin/json/game_caravancity.json +++ b/bin/json/game_caravancity.json @@ -173,7 +173,7 @@ "cityexlock": [ 0 ], - "citylvlock": 2, + "citylvlock": 1, "citymainlock": 0, "cityman": 45001, "cityname": { @@ -225,7 +225,7 @@ "cityexlock": [ 0 ], - "citylvlock": 2, + "citylvlock": 1, "citymainlock": 0, "cityman": 14007, "cityname": { diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index 1ffa69ac2..968ca5415 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -33,7 +33,7 @@ "n": 1 } ], - "debrisitemid": "16004002", + "debrisitemid": 11187022, "scenemusic": "scenemusic_leveldemo_fcamer_1_1", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_1" }, @@ -71,7 +71,7 @@ "n": 1 } ], - "debrisitemid": "16001002", + "debrisitemid": 11187004, "scenemusic": "scenemusic_leveldemo_fcamer_1_3", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_3" }, @@ -109,7 +109,7 @@ "n": 1 } ], - "debrisitemid": "16001003", + "debrisitemid": 11187006, "scenemusic": "scenemusic_leveldemo_fcamer_1_2", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_2" }, @@ -147,7 +147,7 @@ "n": 1 } ], - "debrisitemid": "16002001", + "debrisitemid": 11187008, "scenemusic": "scenemusic_leveldemo_fcamer_1_4", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_4" }, @@ -185,7 +185,7 @@ "n": 1 } ], - "debrisitemid": "16002002", + "debrisitemid": 11187010, "scenemusic": "scenemusic_leveldemo_fcamer_1_5", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_5" }, @@ -223,7 +223,7 @@ "n": 1 } ], - "debrisitemid": "16002003", + "debrisitemid": 11187012, "scenemusic": "scenemusic_leveldemo_fcamer_1_6", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_6" }, @@ -261,7 +261,7 @@ "n": 1 } ], - "debrisitemid": "16003001", + "debrisitemid": 11187014, "scenemusic": "scenemusic_leveldemo_fcamer_1_7", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_7" }, @@ -299,7 +299,7 @@ "n": 1 } ], - "debrisitemid": "16001001", + "debrisitemid": 11187002, "scenemusic": "scenemusic_leveldemo_fcamer_1_8", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_8" }, @@ -337,7 +337,7 @@ "n": 1 } ], - "debrisitemid": "16003003", + "debrisitemid": 11187018, "scenemusic": "scenemusic_leveldemo_fcamer_1_9", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_9" }, @@ -375,7 +375,7 @@ "n": 1 } ], - "debrisitemid": "16004001", + "debrisitemid": 11187020, "scenemusic": "scenemusic_leveldemo_fcamer_1_10", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_10" } diff --git a/bin/json/game_heroawaken.json b/bin/json/game_heroawaken.json index 3a2545271..d7640fdda 100644 --- a/bin/json/game_heroawaken.json +++ b/bin/json/game_heroawaken.json @@ -3,6 +3,10 @@ "key": 1, "hid": "13001", "phase": 1, + "name": { + "key": "hero_awaken_name_1", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -27,6 +31,10 @@ "key": 2, "hid": "13001", "phase": 2, + "name": { + "key": "hero_awaken_name_2", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -51,6 +59,10 @@ "key": 3, "hid": "13001", "phase": 3, + "name": { + "key": "hero_awaken_name_3", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -75,6 +87,10 @@ "key": 4, "hid": "13001", "phase": 4, + "name": { + "key": "hero_awaken_name_4", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -99,6 +115,10 @@ "key": 5, "hid": "13001", "phase": 5, + "name": { + "key": "hero_awaken_name_5", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -123,6 +143,10 @@ "key": 6, "hid": "13001", "phase": 6, + "name": { + "key": "hero_awaken_name_6", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -147,6 +171,10 @@ "key": 7, "hid": "13002", "phase": 1, + "name": { + "key": "hero_awaken_name_7", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -171,6 +199,10 @@ "key": 8, "hid": "13002", "phase": 2, + "name": { + "key": "hero_awaken_name_8", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -195,6 +227,10 @@ "key": 9, "hid": "13002", "phase": 3, + "name": { + "key": "hero_awaken_name_9", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -219,6 +255,10 @@ "key": 10, "hid": "13002", "phase": 4, + "name": { + "key": "hero_awaken_name_10", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -243,6 +283,10 @@ "key": 11, "hid": "13002", "phase": 5, + "name": { + "key": "hero_awaken_name_11", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -267,6 +311,10 @@ "key": 12, "hid": "13002", "phase": 6, + "name": { + "key": "hero_awaken_name_12", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -291,6 +339,10 @@ "key": 13, "hid": "13003", "phase": 1, + "name": { + "key": "hero_awaken_name_13", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -315,6 +367,10 @@ "key": 14, "hid": "13003", "phase": 2, + "name": { + "key": "hero_awaken_name_14", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -339,6 +395,10 @@ "key": 15, "hid": "13003", "phase": 3, + "name": { + "key": "hero_awaken_name_15", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -363,6 +423,10 @@ "key": 16, "hid": "13003", "phase": 4, + "name": { + "key": "hero_awaken_name_16", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -387,6 +451,10 @@ "key": 17, "hid": "13003", "phase": 5, + "name": { + "key": "hero_awaken_name_17", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -411,6 +479,10 @@ "key": 18, "hid": "13003", "phase": 6, + "name": { + "key": "hero_awaken_name_18", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -435,6 +507,10 @@ "key": 19, "hid": "13004", "phase": 1, + "name": { + "key": "hero_awaken_name_19", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -459,6 +535,10 @@ "key": 20, "hid": "13004", "phase": 2, + "name": { + "key": "hero_awaken_name_20", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -483,6 +563,10 @@ "key": 21, "hid": "13004", "phase": 3, + "name": { + "key": "hero_awaken_name_21", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -507,6 +591,10 @@ "key": 22, "hid": "13004", "phase": 4, + "name": { + "key": "hero_awaken_name_22", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -531,6 +619,10 @@ "key": 23, "hid": "13004", "phase": 5, + "name": { + "key": "hero_awaken_name_23", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -555,6 +647,10 @@ "key": 24, "hid": "13004", "phase": 6, + "name": { + "key": "hero_awaken_name_24", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -579,6 +675,10 @@ "key": 25, "hid": "13005", "phase": 1, + "name": { + "key": "hero_awaken_name_25", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -603,6 +703,10 @@ "key": 26, "hid": "13005", "phase": 2, + "name": { + "key": "hero_awaken_name_26", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -627,6 +731,10 @@ "key": 27, "hid": "13005", "phase": 3, + "name": { + "key": "hero_awaken_name_27", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -651,6 +759,10 @@ "key": 28, "hid": "13005", "phase": 4, + "name": { + "key": "hero_awaken_name_28", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -675,6 +787,10 @@ "key": 29, "hid": "13005", "phase": 5, + "name": { + "key": "hero_awaken_name_29", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -699,6 +815,10 @@ "key": 30, "hid": "13005", "phase": 6, + "name": { + "key": "hero_awaken_name_30", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -723,6 +843,10 @@ "key": 31, "hid": "14001", "phase": 1, + "name": { + "key": "hero_awaken_name_31", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -747,6 +871,10 @@ "key": 32, "hid": "14001", "phase": 2, + "name": { + "key": "hero_awaken_name_32", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -771,6 +899,10 @@ "key": 33, "hid": "14001", "phase": 3, + "name": { + "key": "hero_awaken_name_33", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -795,6 +927,10 @@ "key": 34, "hid": "14001", "phase": 4, + "name": { + "key": "hero_awaken_name_34", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -819,6 +955,10 @@ "key": 35, "hid": "14001", "phase": 5, + "name": { + "key": "hero_awaken_name_35", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -843,6 +983,10 @@ "key": 36, "hid": "14001", "phase": 6, + "name": { + "key": "hero_awaken_name_36", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -867,6 +1011,10 @@ "key": 37, "hid": "14002", "phase": 1, + "name": { + "key": "hero_awaken_name_37", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -891,6 +1039,10 @@ "key": 38, "hid": "14002", "phase": 2, + "name": { + "key": "hero_awaken_name_38", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -915,6 +1067,10 @@ "key": 39, "hid": "14002", "phase": 3, + "name": { + "key": "hero_awaken_name_39", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -939,6 +1095,10 @@ "key": 40, "hid": "14002", "phase": 4, + "name": { + "key": "hero_awaken_name_40", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -963,6 +1123,10 @@ "key": 41, "hid": "14002", "phase": 5, + "name": { + "key": "hero_awaken_name_41", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -987,6 +1151,10 @@ "key": 42, "hid": "14002", "phase": 6, + "name": { + "key": "hero_awaken_name_42", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -1011,6 +1179,10 @@ "key": 43, "hid": "14003", "phase": 1, + "name": { + "key": "hero_awaken_name_43", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -1035,6 +1207,10 @@ "key": 44, "hid": "14003", "phase": 2, + "name": { + "key": "hero_awaken_name_44", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -1059,6 +1235,10 @@ "key": 45, "hid": "14003", "phase": 3, + "name": { + "key": "hero_awaken_name_45", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -1083,6 +1263,10 @@ "key": 46, "hid": "14003", "phase": 4, + "name": { + "key": "hero_awaken_name_46", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -1107,6 +1291,10 @@ "key": 47, "hid": "14003", "phase": 5, + "name": { + "key": "hero_awaken_name_47", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -1131,6 +1319,10 @@ "key": 48, "hid": "14003", "phase": 6, + "name": { + "key": "hero_awaken_name_48", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -1155,6 +1347,10 @@ "key": 49, "hid": "14004", "phase": 1, + "name": { + "key": "hero_awaken_name_49", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -1179,6 +1375,10 @@ "key": 50, "hid": "14004", "phase": 2, + "name": { + "key": "hero_awaken_name_50", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -1203,6 +1403,10 @@ "key": 51, "hid": "14004", "phase": 3, + "name": { + "key": "hero_awaken_name_51", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -1227,6 +1431,10 @@ "key": 52, "hid": "14004", "phase": 4, + "name": { + "key": "hero_awaken_name_52", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -1251,6 +1459,10 @@ "key": 53, "hid": "14004", "phase": 5, + "name": { + "key": "hero_awaken_name_53", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -1275,6 +1487,10 @@ "key": 54, "hid": "14004", "phase": 6, + "name": { + "key": "hero_awaken_name_54", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -1299,6 +1515,10 @@ "key": 55, "hid": "14005", "phase": 1, + "name": { + "key": "hero_awaken_name_55", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -1323,6 +1543,10 @@ "key": 56, "hid": "14005", "phase": 2, + "name": { + "key": "hero_awaken_name_56", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -1347,6 +1571,10 @@ "key": 57, "hid": "14005", "phase": 3, + "name": { + "key": "hero_awaken_name_57", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -1371,6 +1599,10 @@ "key": 58, "hid": "14005", "phase": 4, + "name": { + "key": "hero_awaken_name_58", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -1395,6 +1627,10 @@ "key": 59, "hid": "14005", "phase": 5, + "name": { + "key": "hero_awaken_name_59", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -1419,6 +1655,10 @@ "key": 60, "hid": "14005", "phase": 6, + "name": { + "key": "hero_awaken_name_60", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -1443,6 +1683,10 @@ "key": 61, "hid": "14006", "phase": 1, + "name": { + "key": "hero_awaken_name_61", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -1467,6 +1711,10 @@ "key": 62, "hid": "14006", "phase": 2, + "name": { + "key": "hero_awaken_name_62", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -1491,6 +1739,10 @@ "key": 63, "hid": "14006", "phase": 3, + "name": { + "key": "hero_awaken_name_63", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -1515,6 +1767,10 @@ "key": 64, "hid": "14006", "phase": 4, + "name": { + "key": "hero_awaken_name_64", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -1539,6 +1795,10 @@ "key": 65, "hid": "14006", "phase": 5, + "name": { + "key": "hero_awaken_name_65", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -1563,6 +1823,10 @@ "key": 66, "hid": "14006", "phase": 6, + "name": { + "key": "hero_awaken_name_66", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -1587,6 +1851,10 @@ "key": 67, "hid": "14007", "phase": 1, + "name": { + "key": "hero_awaken_name_67", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -1611,6 +1879,10 @@ "key": 68, "hid": "14007", "phase": 2, + "name": { + "key": "hero_awaken_name_68", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -1635,6 +1907,10 @@ "key": 69, "hid": "14007", "phase": 3, + "name": { + "key": "hero_awaken_name_69", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -1659,6 +1935,10 @@ "key": 70, "hid": "14007", "phase": 4, + "name": { + "key": "hero_awaken_name_70", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -1683,6 +1963,10 @@ "key": 71, "hid": "14007", "phase": 5, + "name": { + "key": "hero_awaken_name_71", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -1707,6 +1991,10 @@ "key": 72, "hid": "14007", "phase": 6, + "name": { + "key": "hero_awaken_name_72", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -1731,6 +2019,10 @@ "key": 73, "hid": "15001", "phase": 1, + "name": { + "key": "hero_awaken_name_73", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -1755,6 +2047,10 @@ "key": 74, "hid": "15001", "phase": 2, + "name": { + "key": "hero_awaken_name_74", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -1779,6 +2075,10 @@ "key": 75, "hid": "15001", "phase": 3, + "name": { + "key": "hero_awaken_name_75", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -1803,6 +2103,10 @@ "key": 76, "hid": "15001", "phase": 4, + "name": { + "key": "hero_awaken_name_76", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -1827,6 +2131,10 @@ "key": 77, "hid": "15001", "phase": 5, + "name": { + "key": "hero_awaken_name_77", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -1851,6 +2159,10 @@ "key": 78, "hid": "15001", "phase": 6, + "name": { + "key": "hero_awaken_name_78", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -1875,6 +2187,10 @@ "key": 79, "hid": "15002", "phase": 1, + "name": { + "key": "hero_awaken_name_79", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -1899,6 +2215,10 @@ "key": 80, "hid": "15002", "phase": 2, + "name": { + "key": "hero_awaken_name_80", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -1923,6 +2243,10 @@ "key": 81, "hid": "15002", "phase": 3, + "name": { + "key": "hero_awaken_name_81", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -1947,6 +2271,10 @@ "key": 82, "hid": "15002", "phase": 4, + "name": { + "key": "hero_awaken_name_82", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -1971,6 +2299,10 @@ "key": 83, "hid": "15002", "phase": 5, + "name": { + "key": "hero_awaken_name_83", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -1995,6 +2327,10 @@ "key": 84, "hid": "15002", "phase": 6, + "name": { + "key": "hero_awaken_name_84", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -2019,6 +2355,10 @@ "key": 85, "hid": "15003", "phase": 1, + "name": { + "key": "hero_awaken_name_85", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -2043,6 +2383,10 @@ "key": 86, "hid": "15003", "phase": 2, + "name": { + "key": "hero_awaken_name_86", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -2067,6 +2411,10 @@ "key": 87, "hid": "15003", "phase": 3, + "name": { + "key": "hero_awaken_name_87", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -2091,6 +2439,10 @@ "key": 88, "hid": "15003", "phase": 4, + "name": { + "key": "hero_awaken_name_88", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -2115,6 +2467,10 @@ "key": 89, "hid": "15003", "phase": 5, + "name": { + "key": "hero_awaken_name_89", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -2139,6 +2495,10 @@ "key": 90, "hid": "15003", "phase": 6, + "name": { + "key": "hero_awaken_name_90", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -2163,6 +2523,10 @@ "key": 91, "hid": "15004", "phase": 1, + "name": { + "key": "hero_awaken_name_91", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -2187,6 +2551,10 @@ "key": 92, "hid": "15004", "phase": 2, + "name": { + "key": "hero_awaken_name_92", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -2211,6 +2579,10 @@ "key": 93, "hid": "15004", "phase": 3, + "name": { + "key": "hero_awaken_name_93", + "text": "暴君" + }, "phasebonus": [ "915004211", "1" @@ -2235,6 +2607,10 @@ "key": 94, "hid": "15004", "phase": 4, + "name": { + "key": "hero_awaken_name_94", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -2259,6 +2635,10 @@ "key": 95, "hid": "15004", "phase": 5, + "name": { + "key": "hero_awaken_name_95", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -2283,6 +2663,10 @@ "key": 96, "hid": "15004", "phase": 6, + "name": { + "key": "hero_awaken_name_96", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -2307,6 +2691,10 @@ "key": 97, "hid": "23001", "phase": 1, + "name": { + "key": "hero_awaken_name_97", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -2331,6 +2719,10 @@ "key": 98, "hid": "23001", "phase": 2, + "name": { + "key": "hero_awaken_name_98", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -2355,6 +2747,10 @@ "key": 99, "hid": "23001", "phase": 3, + "name": { + "key": "hero_awaken_name_99", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -2379,6 +2775,10 @@ "key": 100, "hid": "23001", "phase": 4, + "name": { + "key": "hero_awaken_name_100", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -2403,6 +2803,10 @@ "key": 101, "hid": "23001", "phase": 5, + "name": { + "key": "hero_awaken_name_101", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -2427,6 +2831,10 @@ "key": 102, "hid": "23001", "phase": 6, + "name": { + "key": "hero_awaken_name_102", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -2451,6 +2859,10 @@ "key": 103, "hid": "23002", "phase": 1, + "name": { + "key": "hero_awaken_name_103", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -2475,6 +2887,10 @@ "key": 104, "hid": "23002", "phase": 2, + "name": { + "key": "hero_awaken_name_104", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -2499,6 +2915,10 @@ "key": 105, "hid": "23002", "phase": 3, + "name": { + "key": "hero_awaken_name_105", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -2523,6 +2943,10 @@ "key": 106, "hid": "23002", "phase": 4, + "name": { + "key": "hero_awaken_name_106", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -2547,6 +2971,10 @@ "key": 107, "hid": "23002", "phase": 5, + "name": { + "key": "hero_awaken_name_107", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -2571,6 +2999,10 @@ "key": 108, "hid": "23002", "phase": 6, + "name": { + "key": "hero_awaken_name_108", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -2595,6 +3027,10 @@ "key": 109, "hid": "23003", "phase": 1, + "name": { + "key": "hero_awaken_name_109", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -2619,6 +3055,10 @@ "key": 110, "hid": "23003", "phase": 2, + "name": { + "key": "hero_awaken_name_110", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -2643,6 +3083,10 @@ "key": 111, "hid": "23003", "phase": 3, + "name": { + "key": "hero_awaken_name_111", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -2667,6 +3111,10 @@ "key": 112, "hid": "23003", "phase": 4, + "name": { + "key": "hero_awaken_name_112", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -2691,6 +3139,10 @@ "key": 113, "hid": "23003", "phase": 5, + "name": { + "key": "hero_awaken_name_113", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -2715,6 +3167,10 @@ "key": 114, "hid": "23003", "phase": 6, + "name": { + "key": "hero_awaken_name_114", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -2739,6 +3195,10 @@ "key": 115, "hid": "23004", "phase": 1, + "name": { + "key": "hero_awaken_name_115", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -2763,6 +3223,10 @@ "key": 116, "hid": "23004", "phase": 2, + "name": { + "key": "hero_awaken_name_116", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -2787,6 +3251,10 @@ "key": 117, "hid": "23004", "phase": 3, + "name": { + "key": "hero_awaken_name_117", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -2811,6 +3279,10 @@ "key": 118, "hid": "23004", "phase": 4, + "name": { + "key": "hero_awaken_name_118", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -2835,6 +3307,10 @@ "key": 119, "hid": "23004", "phase": 5, + "name": { + "key": "hero_awaken_name_119", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -2859,6 +3335,10 @@ "key": 120, "hid": "23004", "phase": 6, + "name": { + "key": "hero_awaken_name_120", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -2883,6 +3363,10 @@ "key": 121, "hid": "24001", "phase": 1, + "name": { + "key": "hero_awaken_name_121", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -2907,6 +3391,10 @@ "key": 122, "hid": "24001", "phase": 2, + "name": { + "key": "hero_awaken_name_122", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -2931,6 +3419,10 @@ "key": 123, "hid": "24001", "phase": 3, + "name": { + "key": "hero_awaken_name_123", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -2955,6 +3447,10 @@ "key": 124, "hid": "24001", "phase": 4, + "name": { + "key": "hero_awaken_name_124", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -2979,6 +3475,10 @@ "key": 125, "hid": "24001", "phase": 5, + "name": { + "key": "hero_awaken_name_125", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -3003,6 +3503,10 @@ "key": 126, "hid": "24001", "phase": 6, + "name": { + "key": "hero_awaken_name_126", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -3027,6 +3531,10 @@ "key": 127, "hid": "24002", "phase": 1, + "name": { + "key": "hero_awaken_name_127", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -3051,6 +3559,10 @@ "key": 128, "hid": "24002", "phase": 2, + "name": { + "key": "hero_awaken_name_128", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -3075,6 +3587,10 @@ "key": 129, "hid": "24002", "phase": 3, + "name": { + "key": "hero_awaken_name_129", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -3099,6 +3615,10 @@ "key": 130, "hid": "24002", "phase": 4, + "name": { + "key": "hero_awaken_name_130", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -3123,6 +3643,10 @@ "key": 131, "hid": "24002", "phase": 5, + "name": { + "key": "hero_awaken_name_131", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -3147,6 +3671,10 @@ "key": 132, "hid": "24002", "phase": 6, + "name": { + "key": "hero_awaken_name_132", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -3171,6 +3699,10 @@ "key": 133, "hid": "24003", "phase": 1, + "name": { + "key": "hero_awaken_name_133", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -3195,6 +3727,10 @@ "key": 134, "hid": "24003", "phase": 2, + "name": { + "key": "hero_awaken_name_134", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -3219,6 +3755,10 @@ "key": 135, "hid": "24003", "phase": 3, + "name": { + "key": "hero_awaken_name_135", + "text": "暴君" + }, "phasebonus": [ "924003411", "1" @@ -3243,6 +3783,10 @@ "key": 136, "hid": "24003", "phase": 4, + "name": { + "key": "hero_awaken_name_136", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -3267,6 +3811,10 @@ "key": 137, "hid": "24003", "phase": 5, + "name": { + "key": "hero_awaken_name_137", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -3291,6 +3839,10 @@ "key": 138, "hid": "24003", "phase": 6, + "name": { + "key": "hero_awaken_name_138", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -3315,6 +3867,10 @@ "key": 139, "hid": "24004", "phase": 1, + "name": { + "key": "hero_awaken_name_139", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -3339,6 +3895,10 @@ "key": 140, "hid": "24004", "phase": 2, + "name": { + "key": "hero_awaken_name_140", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -3363,6 +3923,10 @@ "key": 141, "hid": "24004", "phase": 3, + "name": { + "key": "hero_awaken_name_141", + "text": "暴君" + }, "phasebonus": [ "924004411", "1" @@ -3387,6 +3951,10 @@ "key": 142, "hid": "24004", "phase": 4, + "name": { + "key": "hero_awaken_name_142", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -3411,6 +3979,10 @@ "key": 143, "hid": "24004", "phase": 5, + "name": { + "key": "hero_awaken_name_143", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -3435,6 +4007,10 @@ "key": 144, "hid": "24004", "phase": 6, + "name": { + "key": "hero_awaken_name_144", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -3459,6 +4035,10 @@ "key": 145, "hid": "24005", "phase": 1, + "name": { + "key": "hero_awaken_name_145", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -3483,6 +4063,10 @@ "key": 146, "hid": "24005", "phase": 2, + "name": { + "key": "hero_awaken_name_146", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -3507,6 +4091,10 @@ "key": 147, "hid": "24005", "phase": 3, + "name": { + "key": "hero_awaken_name_147", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -3531,6 +4119,10 @@ "key": 148, "hid": "24005", "phase": 4, + "name": { + "key": "hero_awaken_name_148", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -3555,6 +4147,10 @@ "key": 149, "hid": "24005", "phase": 5, + "name": { + "key": "hero_awaken_name_149", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -3579,6 +4175,10 @@ "key": 150, "hid": "24005", "phase": 6, + "name": { + "key": "hero_awaken_name_150", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -3603,6 +4203,10 @@ "key": 151, "hid": "24006", "phase": 1, + "name": { + "key": "hero_awaken_name_151", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -3627,6 +4231,10 @@ "key": 152, "hid": "24006", "phase": 2, + "name": { + "key": "hero_awaken_name_152", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -3651,6 +4259,10 @@ "key": 153, "hid": "24006", "phase": 3, + "name": { + "key": "hero_awaken_name_153", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -3675,6 +4287,10 @@ "key": 154, "hid": "24006", "phase": 4, + "name": { + "key": "hero_awaken_name_154", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -3699,6 +4315,10 @@ "key": 155, "hid": "24006", "phase": 5, + "name": { + "key": "hero_awaken_name_155", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -3723,6 +4343,10 @@ "key": 156, "hid": "24006", "phase": 6, + "name": { + "key": "hero_awaken_name_156", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -3747,6 +4371,10 @@ "key": 157, "hid": "24007", "phase": 1, + "name": { + "key": "hero_awaken_name_157", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -3771,6 +4399,10 @@ "key": 158, "hid": "24007", "phase": 2, + "name": { + "key": "hero_awaken_name_158", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -3795,6 +4427,10 @@ "key": 159, "hid": "24007", "phase": 3, + "name": { + "key": "hero_awaken_name_159", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -3819,6 +4455,10 @@ "key": 160, "hid": "24007", "phase": 4, + "name": { + "key": "hero_awaken_name_160", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -3843,6 +4483,10 @@ "key": 161, "hid": "24007", "phase": 5, + "name": { + "key": "hero_awaken_name_161", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -3867,6 +4511,10 @@ "key": 162, "hid": "24007", "phase": 6, + "name": { + "key": "hero_awaken_name_162", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -3891,6 +4539,10 @@ "key": 163, "hid": "24008", "phase": 1, + "name": { + "key": "hero_awaken_name_163", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -3915,6 +4567,10 @@ "key": 164, "hid": "24008", "phase": 2, + "name": { + "key": "hero_awaken_name_164", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -3939,6 +4595,10 @@ "key": 165, "hid": "24008", "phase": 3, + "name": { + "key": "hero_awaken_name_165", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -3963,6 +4623,10 @@ "key": 166, "hid": "24008", "phase": 4, + "name": { + "key": "hero_awaken_name_166", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -3987,6 +4651,10 @@ "key": 167, "hid": "24008", "phase": 5, + "name": { + "key": "hero_awaken_name_167", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -4011,6 +4679,10 @@ "key": 168, "hid": "24008", "phase": 6, + "name": { + "key": "hero_awaken_name_168", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -4035,6 +4707,10 @@ "key": 169, "hid": "24009", "phase": 1, + "name": { + "key": "hero_awaken_name_169", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -4059,6 +4735,10 @@ "key": 170, "hid": "24009", "phase": 2, + "name": { + "key": "hero_awaken_name_170", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -4083,6 +4763,10 @@ "key": 171, "hid": "24009", "phase": 3, + "name": { + "key": "hero_awaken_name_171", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -4107,6 +4791,10 @@ "key": 172, "hid": "24009", "phase": 4, + "name": { + "key": "hero_awaken_name_172", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -4131,6 +4819,10 @@ "key": 173, "hid": "24009", "phase": 5, + "name": { + "key": "hero_awaken_name_173", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -4155,6 +4847,10 @@ "key": 174, "hid": "24009", "phase": 6, + "name": { + "key": "hero_awaken_name_174", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -4179,6 +4875,10 @@ "key": 175, "hid": "25001", "phase": 1, + "name": { + "key": "hero_awaken_name_175", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -4203,6 +4903,10 @@ "key": 176, "hid": "25001", "phase": 2, + "name": { + "key": "hero_awaken_name_176", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -4227,6 +4931,10 @@ "key": 177, "hid": "25001", "phase": 3, + "name": { + "key": "hero_awaken_name_177", + "text": "暴君" + }, "phasebonus": [ "925001411", "1" @@ -4251,6 +4959,10 @@ "key": 178, "hid": "25001", "phase": 4, + "name": { + "key": "hero_awaken_name_178", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -4275,6 +4987,10 @@ "key": 179, "hid": "25001", "phase": 5, + "name": { + "key": "hero_awaken_name_179", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -4299,6 +5015,10 @@ "key": 180, "hid": "25001", "phase": 6, + "name": { + "key": "hero_awaken_name_180", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -4323,6 +5043,10 @@ "key": 181, "hid": "25002", "phase": 1, + "name": { + "key": "hero_awaken_name_181", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -4347,6 +5071,10 @@ "key": 182, "hid": "25002", "phase": 2, + "name": { + "key": "hero_awaken_name_182", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -4371,6 +5099,10 @@ "key": 183, "hid": "25002", "phase": 3, + "name": { + "key": "hero_awaken_name_183", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -4395,6 +5127,10 @@ "key": 184, "hid": "25002", "phase": 4, + "name": { + "key": "hero_awaken_name_184", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -4419,6 +5155,10 @@ "key": 185, "hid": "25002", "phase": 5, + "name": { + "key": "hero_awaken_name_185", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -4443,6 +5183,10 @@ "key": 186, "hid": "25002", "phase": 6, + "name": { + "key": "hero_awaken_name_186", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -4467,6 +5211,10 @@ "key": 187, "hid": "25003", "phase": 1, + "name": { + "key": "hero_awaken_name_187", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -4491,6 +5239,10 @@ "key": 188, "hid": "25003", "phase": 2, + "name": { + "key": "hero_awaken_name_188", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -4515,6 +5267,10 @@ "key": 189, "hid": "25003", "phase": 3, + "name": { + "key": "hero_awaken_name_189", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -4539,6 +5295,10 @@ "key": 190, "hid": "25003", "phase": 4, + "name": { + "key": "hero_awaken_name_190", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -4563,6 +5323,10 @@ "key": 191, "hid": "25003", "phase": 5, + "name": { + "key": "hero_awaken_name_191", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -4587,6 +5351,10 @@ "key": 192, "hid": "25003", "phase": 6, + "name": { + "key": "hero_awaken_name_192", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -4611,6 +5379,10 @@ "key": 193, "hid": "25004", "phase": 1, + "name": { + "key": "hero_awaken_name_193", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -4635,6 +5407,10 @@ "key": 194, "hid": "25004", "phase": 2, + "name": { + "key": "hero_awaken_name_194", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -4659,6 +5435,10 @@ "key": 195, "hid": "25004", "phase": 3, + "name": { + "key": "hero_awaken_name_195", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -4683,6 +5463,10 @@ "key": 196, "hid": "25004", "phase": 4, + "name": { + "key": "hero_awaken_name_196", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -4707,6 +5491,10 @@ "key": 197, "hid": "25004", "phase": 5, + "name": { + "key": "hero_awaken_name_197", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -4731,6 +5519,10 @@ "key": 198, "hid": "25004", "phase": 6, + "name": { + "key": "hero_awaken_name_198", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -4755,6 +5547,10 @@ "key": 199, "hid": "33001", "phase": 1, + "name": { + "key": "hero_awaken_name_199", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -4779,6 +5575,10 @@ "key": 200, "hid": "33001", "phase": 2, + "name": { + "key": "hero_awaken_name_200", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -4803,6 +5603,10 @@ "key": 201, "hid": "33001", "phase": 3, + "name": { + "key": "hero_awaken_name_201", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -4827,6 +5631,10 @@ "key": 202, "hid": "33001", "phase": 4, + "name": { + "key": "hero_awaken_name_202", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -4851,6 +5659,10 @@ "key": 203, "hid": "33001", "phase": 5, + "name": { + "key": "hero_awaken_name_203", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -4875,6 +5687,10 @@ "key": 204, "hid": "33001", "phase": 6, + "name": { + "key": "hero_awaken_name_204", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -4899,6 +5715,10 @@ "key": 205, "hid": "33002", "phase": 1, + "name": { + "key": "hero_awaken_name_205", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -4923,6 +5743,10 @@ "key": 206, "hid": "33002", "phase": 2, + "name": { + "key": "hero_awaken_name_206", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -4947,6 +5771,10 @@ "key": 207, "hid": "33002", "phase": 3, + "name": { + "key": "hero_awaken_name_207", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -4971,6 +5799,10 @@ "key": 208, "hid": "33002", "phase": 4, + "name": { + "key": "hero_awaken_name_208", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -4995,6 +5827,10 @@ "key": 209, "hid": "33002", "phase": 5, + "name": { + "key": "hero_awaken_name_209", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -5019,6 +5855,10 @@ "key": 210, "hid": "33002", "phase": 6, + "name": { + "key": "hero_awaken_name_210", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -5043,6 +5883,10 @@ "key": 211, "hid": "33003", "phase": 1, + "name": { + "key": "hero_awaken_name_211", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -5067,6 +5911,10 @@ "key": 212, "hid": "33003", "phase": 2, + "name": { + "key": "hero_awaken_name_212", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -5091,6 +5939,10 @@ "key": 213, "hid": "33003", "phase": 3, + "name": { + "key": "hero_awaken_name_213", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -5115,6 +5967,10 @@ "key": 214, "hid": "33003", "phase": 4, + "name": { + "key": "hero_awaken_name_214", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -5139,6 +5995,10 @@ "key": 215, "hid": "33003", "phase": 5, + "name": { + "key": "hero_awaken_name_215", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -5163,6 +6023,10 @@ "key": 216, "hid": "33003", "phase": 6, + "name": { + "key": "hero_awaken_name_216", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -5187,6 +6051,10 @@ "key": 217, "hid": "33004", "phase": 1, + "name": { + "key": "hero_awaken_name_217", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -5211,6 +6079,10 @@ "key": 218, "hid": "33004", "phase": 2, + "name": { + "key": "hero_awaken_name_218", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -5235,6 +6107,10 @@ "key": 219, "hid": "33004", "phase": 3, + "name": { + "key": "hero_awaken_name_219", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -5259,6 +6135,10 @@ "key": 220, "hid": "33004", "phase": 4, + "name": { + "key": "hero_awaken_name_220", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -5283,6 +6163,10 @@ "key": 221, "hid": "33004", "phase": 5, + "name": { + "key": "hero_awaken_name_221", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -5307,6 +6191,10 @@ "key": 222, "hid": "33004", "phase": 6, + "name": { + "key": "hero_awaken_name_222", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -5331,6 +6219,10 @@ "key": 223, "hid": "33005", "phase": 1, + "name": { + "key": "hero_awaken_name_223", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -5355,6 +6247,10 @@ "key": 224, "hid": "33005", "phase": 2, + "name": { + "key": "hero_awaken_name_224", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -5379,6 +6275,10 @@ "key": 225, "hid": "33005", "phase": 3, + "name": { + "key": "hero_awaken_name_225", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -5403,6 +6303,10 @@ "key": 226, "hid": "33005", "phase": 4, + "name": { + "key": "hero_awaken_name_226", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -5427,6 +6331,10 @@ "key": 227, "hid": "33005", "phase": 5, + "name": { + "key": "hero_awaken_name_227", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -5451,6 +6359,10 @@ "key": 228, "hid": "33005", "phase": 6, + "name": { + "key": "hero_awaken_name_228", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -5475,6 +6387,10 @@ "key": 229, "hid": "33006", "phase": 1, + "name": { + "key": "hero_awaken_name_229", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -5499,6 +6415,10 @@ "key": 230, "hid": "33006", "phase": 2, + "name": { + "key": "hero_awaken_name_230", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -5523,6 +6443,10 @@ "key": 231, "hid": "33006", "phase": 3, + "name": { + "key": "hero_awaken_name_231", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -5547,6 +6471,10 @@ "key": 232, "hid": "33006", "phase": 4, + "name": { + "key": "hero_awaken_name_232", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -5571,6 +6499,10 @@ "key": 233, "hid": "33006", "phase": 5, + "name": { + "key": "hero_awaken_name_233", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -5595,6 +6527,10 @@ "key": 234, "hid": "33006", "phase": 6, + "name": { + "key": "hero_awaken_name_234", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -5619,6 +6555,10 @@ "key": 235, "hid": "34001", "phase": 1, + "name": { + "key": "hero_awaken_name_235", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -5643,6 +6583,10 @@ "key": 236, "hid": "34001", "phase": 2, + "name": { + "key": "hero_awaken_name_236", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -5667,6 +6611,10 @@ "key": 237, "hid": "34001", "phase": 3, + "name": { + "key": "hero_awaken_name_237", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -5691,6 +6639,10 @@ "key": 238, "hid": "34001", "phase": 4, + "name": { + "key": "hero_awaken_name_238", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -5715,6 +6667,10 @@ "key": 239, "hid": "34001", "phase": 5, + "name": { + "key": "hero_awaken_name_239", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -5739,6 +6695,10 @@ "key": 240, "hid": "34001", "phase": 6, + "name": { + "key": "hero_awaken_name_240", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -5763,6 +6723,10 @@ "key": 241, "hid": "34002", "phase": 1, + "name": { + "key": "hero_awaken_name_241", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -5787,6 +6751,10 @@ "key": 242, "hid": "34002", "phase": 2, + "name": { + "key": "hero_awaken_name_242", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -5811,6 +6779,10 @@ "key": 243, "hid": "34002", "phase": 3, + "name": { + "key": "hero_awaken_name_243", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -5835,6 +6807,10 @@ "key": 244, "hid": "34002", "phase": 4, + "name": { + "key": "hero_awaken_name_244", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -5859,6 +6835,10 @@ "key": 245, "hid": "34002", "phase": 5, + "name": { + "key": "hero_awaken_name_245", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -5883,6 +6863,10 @@ "key": 246, "hid": "34002", "phase": 6, + "name": { + "key": "hero_awaken_name_246", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -5907,6 +6891,10 @@ "key": 247, "hid": "34003", "phase": 1, + "name": { + "key": "hero_awaken_name_247", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -5931,6 +6919,10 @@ "key": 248, "hid": "34003", "phase": 2, + "name": { + "key": "hero_awaken_name_248", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -5955,6 +6947,10 @@ "key": 249, "hid": "34003", "phase": 3, + "name": { + "key": "hero_awaken_name_249", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -5979,6 +6975,10 @@ "key": 250, "hid": "34003", "phase": 4, + "name": { + "key": "hero_awaken_name_250", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -6003,6 +7003,10 @@ "key": 251, "hid": "34003", "phase": 5, + "name": { + "key": "hero_awaken_name_251", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -6027,6 +7031,10 @@ "key": 252, "hid": "34003", "phase": 6, + "name": { + "key": "hero_awaken_name_252", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -6051,6 +7059,10 @@ "key": 253, "hid": "34004", "phase": 1, + "name": { + "key": "hero_awaken_name_253", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -6075,6 +7087,10 @@ "key": 254, "hid": "34004", "phase": 2, + "name": { + "key": "hero_awaken_name_254", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -6099,6 +7115,10 @@ "key": 255, "hid": "34004", "phase": 3, + "name": { + "key": "hero_awaken_name_255", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -6123,6 +7143,10 @@ "key": 256, "hid": "34004", "phase": 4, + "name": { + "key": "hero_awaken_name_256", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -6147,6 +7171,10 @@ "key": 257, "hid": "34004", "phase": 5, + "name": { + "key": "hero_awaken_name_257", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -6171,6 +7199,10 @@ "key": 258, "hid": "34004", "phase": 6, + "name": { + "key": "hero_awaken_name_258", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -6195,6 +7227,10 @@ "key": 259, "hid": "34005", "phase": 1, + "name": { + "key": "hero_awaken_name_259", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -6219,6 +7255,10 @@ "key": 260, "hid": "34005", "phase": 2, + "name": { + "key": "hero_awaken_name_260", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -6243,6 +7283,10 @@ "key": 261, "hid": "34005", "phase": 3, + "name": { + "key": "hero_awaken_name_261", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -6267,6 +7311,10 @@ "key": 262, "hid": "34005", "phase": 4, + "name": { + "key": "hero_awaken_name_262", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -6291,6 +7339,10 @@ "key": 263, "hid": "34005", "phase": 5, + "name": { + "key": "hero_awaken_name_263", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -6315,6 +7367,10 @@ "key": 264, "hid": "34005", "phase": 6, + "name": { + "key": "hero_awaken_name_264", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -6339,6 +7395,10 @@ "key": 265, "hid": "34006", "phase": 1, + "name": { + "key": "hero_awaken_name_265", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -6363,6 +7423,10 @@ "key": 266, "hid": "34006", "phase": 2, + "name": { + "key": "hero_awaken_name_266", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -6387,6 +7451,10 @@ "key": 267, "hid": "34006", "phase": 3, + "name": { + "key": "hero_awaken_name_267", + "text": "暴君" + }, "phasebonus": [ "934006411", "1" @@ -6411,6 +7479,10 @@ "key": 268, "hid": "34006", "phase": 4, + "name": { + "key": "hero_awaken_name_268", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -6435,6 +7507,10 @@ "key": 269, "hid": "34006", "phase": 5, + "name": { + "key": "hero_awaken_name_269", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -6459,6 +7535,10 @@ "key": 270, "hid": "34006", "phase": 6, + "name": { + "key": "hero_awaken_name_270", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -6483,6 +7563,10 @@ "key": 271, "hid": "34007", "phase": 1, + "name": { + "key": "hero_awaken_name_271", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -6507,6 +7591,10 @@ "key": 272, "hid": "34007", "phase": 2, + "name": { + "key": "hero_awaken_name_272", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -6531,6 +7619,10 @@ "key": 273, "hid": "34007", "phase": 3, + "name": { + "key": "hero_awaken_name_273", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -6555,6 +7647,10 @@ "key": 274, "hid": "34007", "phase": 4, + "name": { + "key": "hero_awaken_name_274", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -6579,6 +7675,10 @@ "key": 275, "hid": "34007", "phase": 5, + "name": { + "key": "hero_awaken_name_275", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -6603,6 +7703,10 @@ "key": 276, "hid": "34007", "phase": 6, + "name": { + "key": "hero_awaken_name_276", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -6627,6 +7731,10 @@ "key": 277, "hid": "34008", "phase": 1, + "name": { + "key": "hero_awaken_name_277", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -6651,6 +7759,10 @@ "key": 278, "hid": "34008", "phase": 2, + "name": { + "key": "hero_awaken_name_278", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -6675,6 +7787,10 @@ "key": 279, "hid": "34008", "phase": 3, + "name": { + "key": "hero_awaken_name_279", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -6699,6 +7815,10 @@ "key": 280, "hid": "34008", "phase": 4, + "name": { + "key": "hero_awaken_name_280", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -6723,6 +7843,10 @@ "key": 281, "hid": "34008", "phase": 5, + "name": { + "key": "hero_awaken_name_281", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -6747,6 +7871,10 @@ "key": 282, "hid": "34008", "phase": 6, + "name": { + "key": "hero_awaken_name_282", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -6771,6 +7899,10 @@ "key": 283, "hid": "35001", "phase": 1, + "name": { + "key": "hero_awaken_name_283", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -6795,6 +7927,10 @@ "key": 284, "hid": "35001", "phase": 2, + "name": { + "key": "hero_awaken_name_284", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -6819,6 +7955,10 @@ "key": 285, "hid": "35001", "phase": 3, + "name": { + "key": "hero_awaken_name_285", + "text": "暴君" + }, "phasebonus": [ "935001411", "1" @@ -6843,6 +7983,10 @@ "key": 286, "hid": "35001", "phase": 4, + "name": { + "key": "hero_awaken_name_286", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -6867,6 +8011,10 @@ "key": 287, "hid": "35001", "phase": 5, + "name": { + "key": "hero_awaken_name_287", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -6891,6 +8039,10 @@ "key": 288, "hid": "35001", "phase": 6, + "name": { + "key": "hero_awaken_name_288", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -6915,6 +8067,10 @@ "key": 289, "hid": "35002", "phase": 1, + "name": { + "key": "hero_awaken_name_289", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -6939,6 +8095,10 @@ "key": 290, "hid": "35002", "phase": 2, + "name": { + "key": "hero_awaken_name_290", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -6963,6 +8123,10 @@ "key": 291, "hid": "35002", "phase": 3, + "name": { + "key": "hero_awaken_name_291", + "text": "暴君" + }, "phasebonus": [ "935002411", "1" @@ -6987,6 +8151,10 @@ "key": 292, "hid": "35002", "phase": 4, + "name": { + "key": "hero_awaken_name_292", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -7011,6 +8179,10 @@ "key": 293, "hid": "35002", "phase": 5, + "name": { + "key": "hero_awaken_name_293", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -7035,6 +8207,10 @@ "key": 294, "hid": "35002", "phase": 6, + "name": { + "key": "hero_awaken_name_294", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -7059,6 +8235,10 @@ "key": 295, "hid": "35003", "phase": 1, + "name": { + "key": "hero_awaken_name_295", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -7083,6 +8263,10 @@ "key": 296, "hid": "35003", "phase": 2, + "name": { + "key": "hero_awaken_name_296", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -7107,6 +8291,10 @@ "key": 297, "hid": "35003", "phase": 3, + "name": { + "key": "hero_awaken_name_297", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -7131,6 +8319,10 @@ "key": 298, "hid": "35003", "phase": 4, + "name": { + "key": "hero_awaken_name_298", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -7155,6 +8347,10 @@ "key": 299, "hid": "35003", "phase": 5, + "name": { + "key": "hero_awaken_name_299", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -7179,6 +8375,10 @@ "key": 300, "hid": "35003", "phase": 6, + "name": { + "key": "hero_awaken_name_300", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -7203,6 +8403,10 @@ "key": 301, "hid": "35004", "phase": 1, + "name": { + "key": "hero_awaken_name_301", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -7227,6 +8431,10 @@ "key": 302, "hid": "35004", "phase": 2, + "name": { + "key": "hero_awaken_name_302", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -7251,6 +8459,10 @@ "key": 303, "hid": "35004", "phase": 3, + "name": { + "key": "hero_awaken_name_303", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -7275,6 +8487,10 @@ "key": 304, "hid": "35004", "phase": 4, + "name": { + "key": "hero_awaken_name_304", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -7299,6 +8515,10 @@ "key": 305, "hid": "35004", "phase": 5, + "name": { + "key": "hero_awaken_name_305", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -7323,6 +8543,10 @@ "key": 306, "hid": "35004", "phase": 6, + "name": { + "key": "hero_awaken_name_306", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -7347,6 +8571,10 @@ "key": 307, "hid": "35005", "phase": 1, + "name": { + "key": "hero_awaken_name_307", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -7371,6 +8599,10 @@ "key": 308, "hid": "35005", "phase": 2, + "name": { + "key": "hero_awaken_name_308", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -7395,6 +8627,10 @@ "key": 309, "hid": "35005", "phase": 3, + "name": { + "key": "hero_awaken_name_309", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -7419,6 +8655,10 @@ "key": 310, "hid": "35005", "phase": 4, + "name": { + "key": "hero_awaken_name_310", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -7443,6 +8683,10 @@ "key": 311, "hid": "35005", "phase": 5, + "name": { + "key": "hero_awaken_name_311", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -7467,6 +8711,10 @@ "key": 312, "hid": "35005", "phase": 6, + "name": { + "key": "hero_awaken_name_312", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -7491,6 +8739,10 @@ "key": 313, "hid": "35006", "phase": 1, + "name": { + "key": "hero_awaken_name_313", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -7515,6 +8767,10 @@ "key": 314, "hid": "35006", "phase": 2, + "name": { + "key": "hero_awaken_name_314", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -7539,6 +8795,10 @@ "key": 315, "hid": "35006", "phase": 3, + "name": { + "key": "hero_awaken_name_315", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -7563,6 +8823,10 @@ "key": 316, "hid": "35006", "phase": 4, + "name": { + "key": "hero_awaken_name_316", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -7587,6 +8851,10 @@ "key": 317, "hid": "35006", "phase": 5, + "name": { + "key": "hero_awaken_name_317", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -7611,6 +8879,10 @@ "key": 318, "hid": "35006", "phase": 6, + "name": { + "key": "hero_awaken_name_318", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -7635,6 +8907,10 @@ "key": 319, "hid": "43001", "phase": 1, + "name": { + "key": "hero_awaken_name_319", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -7659,6 +8935,10 @@ "key": 320, "hid": "43001", "phase": 2, + "name": { + "key": "hero_awaken_name_320", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -7683,6 +8963,10 @@ "key": 321, "hid": "43001", "phase": 3, + "name": { + "key": "hero_awaken_name_321", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -7707,6 +8991,10 @@ "key": 322, "hid": "43001", "phase": 4, + "name": { + "key": "hero_awaken_name_322", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -7731,6 +9019,10 @@ "key": 323, "hid": "43001", "phase": 5, + "name": { + "key": "hero_awaken_name_323", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -7755,6 +9047,10 @@ "key": 324, "hid": "43001", "phase": 6, + "name": { + "key": "hero_awaken_name_324", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -7779,6 +9075,10 @@ "key": 325, "hid": "43002", "phase": 1, + "name": { + "key": "hero_awaken_name_325", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -7803,6 +9103,10 @@ "key": 326, "hid": "43002", "phase": 2, + "name": { + "key": "hero_awaken_name_326", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -7827,6 +9131,10 @@ "key": 327, "hid": "43002", "phase": 3, + "name": { + "key": "hero_awaken_name_327", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -7851,6 +9159,10 @@ "key": 328, "hid": "43002", "phase": 4, + "name": { + "key": "hero_awaken_name_328", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -7875,6 +9187,10 @@ "key": 329, "hid": "43002", "phase": 5, + "name": { + "key": "hero_awaken_name_329", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -7899,6 +9215,10 @@ "key": 330, "hid": "43002", "phase": 6, + "name": { + "key": "hero_awaken_name_330", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -7923,6 +9243,10 @@ "key": 331, "hid": "43003", "phase": 1, + "name": { + "key": "hero_awaken_name_331", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -7947,6 +9271,10 @@ "key": 332, "hid": "43003", "phase": 2, + "name": { + "key": "hero_awaken_name_332", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -7971,6 +9299,10 @@ "key": 333, "hid": "43003", "phase": 3, + "name": { + "key": "hero_awaken_name_333", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -7995,6 +9327,10 @@ "key": 334, "hid": "43003", "phase": 4, + "name": { + "key": "hero_awaken_name_334", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -8019,6 +9355,10 @@ "key": 335, "hid": "43003", "phase": 5, + "name": { + "key": "hero_awaken_name_335", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -8043,6 +9383,10 @@ "key": 336, "hid": "43003", "phase": 6, + "name": { + "key": "hero_awaken_name_336", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -8067,6 +9411,10 @@ "key": 337, "hid": "43004", "phase": 1, + "name": { + "key": "hero_awaken_name_337", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -8091,6 +9439,10 @@ "key": 338, "hid": "43004", "phase": 2, + "name": { + "key": "hero_awaken_name_338", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -8115,6 +9467,10 @@ "key": 339, "hid": "43004", "phase": 3, + "name": { + "key": "hero_awaken_name_339", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -8139,6 +9495,10 @@ "key": 340, "hid": "43004", "phase": 4, + "name": { + "key": "hero_awaken_name_340", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -8163,6 +9523,10 @@ "key": 341, "hid": "43004", "phase": 5, + "name": { + "key": "hero_awaken_name_341", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -8187,6 +9551,10 @@ "key": 342, "hid": "43004", "phase": 6, + "name": { + "key": "hero_awaken_name_342", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -8211,6 +9579,10 @@ "key": 343, "hid": "43005", "phase": 1, + "name": { + "key": "hero_awaken_name_343", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -8235,6 +9607,10 @@ "key": 344, "hid": "43005", "phase": 2, + "name": { + "key": "hero_awaken_name_344", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -8259,6 +9635,10 @@ "key": 345, "hid": "43005", "phase": 3, + "name": { + "key": "hero_awaken_name_345", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -8283,6 +9663,10 @@ "key": 346, "hid": "43005", "phase": 4, + "name": { + "key": "hero_awaken_name_346", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -8307,6 +9691,10 @@ "key": 347, "hid": "43005", "phase": 5, + "name": { + "key": "hero_awaken_name_347", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -8331,6 +9719,10 @@ "key": 348, "hid": "43005", "phase": 6, + "name": { + "key": "hero_awaken_name_348", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -8355,6 +9747,10 @@ "key": 349, "hid": "43006", "phase": 1, + "name": { + "key": "hero_awaken_name_349", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -8379,6 +9775,10 @@ "key": 350, "hid": "43006", "phase": 2, + "name": { + "key": "hero_awaken_name_350", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -8403,6 +9803,10 @@ "key": 351, "hid": "43006", "phase": 3, + "name": { + "key": "hero_awaken_name_351", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -8427,6 +9831,10 @@ "key": 352, "hid": "43006", "phase": 4, + "name": { + "key": "hero_awaken_name_352", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -8451,6 +9859,10 @@ "key": 353, "hid": "43006", "phase": 5, + "name": { + "key": "hero_awaken_name_353", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -8475,6 +9887,10 @@ "key": 354, "hid": "43006", "phase": 6, + "name": { + "key": "hero_awaken_name_354", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -8499,6 +9915,10 @@ "key": 355, "hid": "43007", "phase": 1, + "name": { + "key": "hero_awaken_name_355", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -8523,6 +9943,10 @@ "key": 356, "hid": "43007", "phase": 2, + "name": { + "key": "hero_awaken_name_356", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -8547,6 +9971,10 @@ "key": 357, "hid": "43007", "phase": 3, + "name": { + "key": "hero_awaken_name_357", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -8571,6 +9999,10 @@ "key": 358, "hid": "43007", "phase": 4, + "name": { + "key": "hero_awaken_name_358", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -8595,6 +10027,10 @@ "key": 359, "hid": "43007", "phase": 5, + "name": { + "key": "hero_awaken_name_359", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -8619,6 +10055,10 @@ "key": 360, "hid": "43007", "phase": 6, + "name": { + "key": "hero_awaken_name_360", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -8643,6 +10083,10 @@ "key": 361, "hid": "44001", "phase": 1, + "name": { + "key": "hero_awaken_name_361", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -8667,6 +10111,10 @@ "key": 362, "hid": "44001", "phase": 2, + "name": { + "key": "hero_awaken_name_362", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -8691,6 +10139,10 @@ "key": 363, "hid": "44001", "phase": 3, + "name": { + "key": "hero_awaken_name_363", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -8715,6 +10167,10 @@ "key": 364, "hid": "44001", "phase": 4, + "name": { + "key": "hero_awaken_name_364", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -8739,6 +10195,10 @@ "key": 365, "hid": "44001", "phase": 5, + "name": { + "key": "hero_awaken_name_365", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -8763,6 +10223,10 @@ "key": 366, "hid": "44001", "phase": 6, + "name": { + "key": "hero_awaken_name_366", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -8787,6 +10251,10 @@ "key": 367, "hid": "44002", "phase": 1, + "name": { + "key": "hero_awaken_name_367", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -8811,6 +10279,10 @@ "key": 368, "hid": "44002", "phase": 2, + "name": { + "key": "hero_awaken_name_368", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -8835,6 +10307,10 @@ "key": 369, "hid": "44002", "phase": 3, + "name": { + "key": "hero_awaken_name_369", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -8859,6 +10335,10 @@ "key": 370, "hid": "44002", "phase": 4, + "name": { + "key": "hero_awaken_name_370", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -8883,6 +10363,10 @@ "key": 371, "hid": "44002", "phase": 5, + "name": { + "key": "hero_awaken_name_371", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -8907,6 +10391,10 @@ "key": 372, "hid": "44002", "phase": 6, + "name": { + "key": "hero_awaken_name_372", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -8931,6 +10419,10 @@ "key": 373, "hid": "44003", "phase": 1, + "name": { + "key": "hero_awaken_name_373", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -8955,6 +10447,10 @@ "key": 374, "hid": "44003", "phase": 2, + "name": { + "key": "hero_awaken_name_374", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -8979,6 +10475,10 @@ "key": 375, "hid": "44003", "phase": 3, + "name": { + "key": "hero_awaken_name_375", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -9003,6 +10503,10 @@ "key": 376, "hid": "44003", "phase": 4, + "name": { + "key": "hero_awaken_name_376", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -9027,6 +10531,10 @@ "key": 377, "hid": "44003", "phase": 5, + "name": { + "key": "hero_awaken_name_377", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -9051,6 +10559,10 @@ "key": 378, "hid": "44003", "phase": 6, + "name": { + "key": "hero_awaken_name_378", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -9075,6 +10587,10 @@ "key": 379, "hid": "44004", "phase": 1, + "name": { + "key": "hero_awaken_name_379", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -9099,6 +10615,10 @@ "key": 380, "hid": "44004", "phase": 2, + "name": { + "key": "hero_awaken_name_380", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -9123,6 +10643,10 @@ "key": 381, "hid": "44004", "phase": 3, + "name": { + "key": "hero_awaken_name_381", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -9147,6 +10671,10 @@ "key": 382, "hid": "44004", "phase": 4, + "name": { + "key": "hero_awaken_name_382", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -9171,6 +10699,10 @@ "key": 383, "hid": "44004", "phase": 5, + "name": { + "key": "hero_awaken_name_383", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -9195,6 +10727,10 @@ "key": 384, "hid": "44004", "phase": 6, + "name": { + "key": "hero_awaken_name_384", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -9219,6 +10755,10 @@ "key": 385, "hid": "44006", "phase": 1, + "name": { + "key": "hero_awaken_name_385", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -9243,6 +10783,10 @@ "key": 386, "hid": "44006", "phase": 2, + "name": { + "key": "hero_awaken_name_386", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -9267,6 +10811,10 @@ "key": 387, "hid": "44006", "phase": 3, + "name": { + "key": "hero_awaken_name_387", + "text": "暴君" + }, "phasebonus": [ "944006411", "1" @@ -9291,6 +10839,10 @@ "key": 388, "hid": "44006", "phase": 4, + "name": { + "key": "hero_awaken_name_388", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -9315,6 +10867,10 @@ "key": 389, "hid": "44006", "phase": 5, + "name": { + "key": "hero_awaken_name_389", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -9339,6 +10895,10 @@ "key": 390, "hid": "44006", "phase": 6, + "name": { + "key": "hero_awaken_name_390", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -9363,6 +10923,10 @@ "key": 391, "hid": "45001", "phase": 1, + "name": { + "key": "hero_awaken_name_391", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -9387,6 +10951,10 @@ "key": 392, "hid": "45001", "phase": 2, + "name": { + "key": "hero_awaken_name_392", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -9411,6 +10979,10 @@ "key": 393, "hid": "45001", "phase": 3, + "name": { + "key": "hero_awaken_name_393", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -9435,6 +11007,10 @@ "key": 394, "hid": "45001", "phase": 4, + "name": { + "key": "hero_awaken_name_394", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -9459,6 +11035,10 @@ "key": 395, "hid": "45001", "phase": 5, + "name": { + "key": "hero_awaken_name_395", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -9483,6 +11063,10 @@ "key": 396, "hid": "45001", "phase": 6, + "name": { + "key": "hero_awaken_name_396", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -9507,6 +11091,10 @@ "key": 397, "hid": "45002", "phase": 1, + "name": { + "key": "hero_awaken_name_397", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -9531,6 +11119,10 @@ "key": 398, "hid": "45002", "phase": 2, + "name": { + "key": "hero_awaken_name_398", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -9555,6 +11147,10 @@ "key": 399, "hid": "45002", "phase": 3, + "name": { + "key": "hero_awaken_name_399", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -9579,6 +11175,10 @@ "key": 400, "hid": "45002", "phase": 4, + "name": { + "key": "hero_awaken_name_400", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -9603,6 +11203,10 @@ "key": 401, "hid": "45002", "phase": 5, + "name": { + "key": "hero_awaken_name_401", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -9627,6 +11231,10 @@ "key": 402, "hid": "45002", "phase": 6, + "name": { + "key": "hero_awaken_name_402", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -9651,6 +11259,10 @@ "key": 403, "hid": "45003", "phase": 1, + "name": { + "key": "hero_awaken_name_403", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -9675,6 +11287,10 @@ "key": 404, "hid": "45003", "phase": 2, + "name": { + "key": "hero_awaken_name_404", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -9699,6 +11315,10 @@ "key": 405, "hid": "45003", "phase": 3, + "name": { + "key": "hero_awaken_name_405", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -9723,6 +11343,10 @@ "key": 406, "hid": "45003", "phase": 4, + "name": { + "key": "hero_awaken_name_406", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -9747,6 +11371,10 @@ "key": 407, "hid": "45003", "phase": 5, + "name": { + "key": "hero_awaken_name_407", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -9771,6 +11399,10 @@ "key": 408, "hid": "45003", "phase": 6, + "name": { + "key": "hero_awaken_name_408", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -9795,6 +11427,10 @@ "key": 409, "hid": "45004", "phase": 1, + "name": { + "key": "hero_awaken_name_409", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -9819,6 +11455,10 @@ "key": 410, "hid": "45004", "phase": 2, + "name": { + "key": "hero_awaken_name_410", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -9843,6 +11483,10 @@ "key": 411, "hid": "45004", "phase": 3, + "name": { + "key": "hero_awaken_name_411", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -9867,6 +11511,10 @@ "key": 412, "hid": "45004", "phase": 4, + "name": { + "key": "hero_awaken_name_412", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -9891,6 +11539,10 @@ "key": 413, "hid": "45004", "phase": 5, + "name": { + "key": "hero_awaken_name_413", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -9915,6 +11567,10 @@ "key": 414, "hid": "45004", "phase": 6, + "name": { + "key": "hero_awaken_name_414", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -9939,6 +11595,10 @@ "key": 415, "hid": "44005", "phase": 1, + "name": { + "key": "hero_awaken_name_415", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -9963,6 +11623,10 @@ "key": 416, "hid": "44005", "phase": 2, + "name": { + "key": "hero_awaken_name_416", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -9987,6 +11651,10 @@ "key": 417, "hid": "44005", "phase": 3, + "name": { + "key": "hero_awaken_name_417", + "text": "暴君" + }, "phasebonus": [ "944005411", "1" @@ -10011,6 +11679,10 @@ "key": 418, "hid": "44005", "phase": 4, + "name": { + "key": "hero_awaken_name_418", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -10035,6 +11707,10 @@ "key": 419, "hid": "44005", "phase": 5, + "name": { + "key": "hero_awaken_name_419", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -10059,6 +11735,10 @@ "key": 420, "hid": "44005", "phase": 6, + "name": { + "key": "hero_awaken_name_420", + "text": "神速" + }, "phasebonus": [ "speed", "10" @@ -10083,6 +11763,10 @@ "key": 421, "hid": "15005", "phase": 1, + "name": { + "key": "hero_awaken_name_421", + "text": "生命" + }, "phasebonus": [ "hp", "950" @@ -10107,6 +11791,10 @@ "key": 422, "hid": "15005", "phase": 2, + "name": { + "key": "hero_awaken_name_422", + "text": "守护" + }, "phasebonus": [ "def", "70" @@ -10131,6 +11819,10 @@ "key": 423, "hid": "15005", "phase": 3, + "name": { + "key": "hero_awaken_name_423", + "text": "暴君" + }, "phasebonus": [ "cri", "100" @@ -10155,6 +11847,10 @@ "key": 424, "hid": "15005", "phase": 4, + "name": { + "key": "hero_awaken_name_424", + "text": "质量" + }, "phasebonus": [ "hppro", "30" @@ -10179,6 +11875,10 @@ "key": 425, "hid": "15005", "phase": 5, + "name": { + "key": "hero_awaken_name_425", + "text": "空间" + }, "phasebonus": [ "defpro", "100" @@ -10203,6 +11903,10 @@ "key": 426, "hid": "15005", "phase": 6, + "name": { + "key": "hero_awaken_name_426", + "text": "神速" + }, "phasebonus": [ "speed", "10" diff --git a/bin/json/game_itemlink.json b/bin/json/game_itemlink.json index 5713e45a7..f730d623b 100644 --- a/bin/json/game_itemlink.json +++ b/bin/json/game_itemlink.json @@ -2,11 +2,11 @@ { "id": 122, "title": { - "key": "itemlink_itemlink_title_4", + "key": "itemlink_itemlink_title_1", "text": "金币商店" }, "desc": { - "key": "itemlink_itemlink_desc_4", + "key": "itemlink_itemlink_desc_1", "text": "金币商店" }, "jumpid": 122, @@ -15,11 +15,11 @@ { "id": 123, "title": { - "key": "itemlink_itemlink_title_5", + "key": "itemlink_itemlink_title_2", "text": "钻石商店" }, "desc": { - "key": "itemlink_itemlink_desc_5", + "key": "itemlink_itemlink_desc_2", "text": "钻石商店" }, "jumpid": 123, @@ -28,11 +28,11 @@ { "id": 124, "title": { - "key": "itemlink_itemlink_title_6", + "key": "itemlink_itemlink_title_3", "text": "友情商店" }, "desc": { - "key": "itemlink_itemlink_desc_6", + "key": "itemlink_itemlink_desc_3", "text": "友情商店" }, "jumpid": 124, @@ -41,11 +41,11 @@ { "id": 125, "title": { - "key": "itemlink_itemlink_title_7", + "key": "itemlink_itemlink_title_4", "text": "竞技商店" }, "desc": { - "key": "itemlink_itemlink_desc_7", + "key": "itemlink_itemlink_desc_4", "text": "竞技商店" }, "jumpid": 125, @@ -54,11 +54,11 @@ { "id": 126, "title": { - "key": "itemlink_itemlink_title_8", + "key": "itemlink_itemlink_title_5", "text": "公会商店" }, "desc": { - "key": "itemlink_itemlink_desc_8", + "key": "itemlink_itemlink_desc_5", "text": "公会商店" }, "jumpid": 126, @@ -67,11 +67,11 @@ { "id": 1127, "title": { - "key": "itemlink_itemlink_title_9", + "key": "itemlink_itemlink_title_6", "text": "特殊商店" }, "desc": { - "key": "itemlink_itemlink_desc_9", + "key": "itemlink_itemlink_desc_6", "text": "特殊商店" }, "jumpid": 1127, @@ -80,11 +80,11 @@ { "id": 1128, "title": { - "key": "itemlink_itemlink_title_10", + "key": "itemlink_itemlink_title_7", "text": "铁匠商店" }, "desc": { - "key": "itemlink_itemlink_desc_10", + "key": "itemlink_itemlink_desc_7", "text": "铁匠商店" }, "jumpid": 1128, @@ -93,11 +93,11 @@ { "id": 158, "title": { - "key": "itemlink_itemlink_title_11", + "key": "itemlink_itemlink_title_8", "text": "充值钻石" }, "desc": { - "key": "itemlink_itemlink_desc_11", + "key": "itemlink_itemlink_desc_8", "text": "充值钻石" }, "jumpid": 158, @@ -106,11 +106,11 @@ { "id": 113, "title": { - "key": "itemlink_itemlink_title_12", + "key": "itemlink_itemlink_title_9", "text": "主线章节界面" }, "desc": { - "key": "itemlink_itemlink_desc_12", + "key": "itemlink_itemlink_desc_9", "text": "主线章节界面" }, "jumpid": 113, @@ -119,11 +119,11 @@ { "id": 115, "title": { - "key": "itemlink_itemlink_title_13", + "key": "itemlink_itemlink_title_10", "text": "好友列表" }, "desc": { - "key": "itemlink_itemlink_desc_13", + "key": "itemlink_itemlink_desc_10", "text": "好友列表" }, "jumpid": 115, @@ -132,11 +132,11 @@ { "id": 157, "title": { - "key": "itemlink_itemlink_title_14", + "key": "itemlink_itemlink_title_11", "text": "公会" }, "desc": { - "key": "itemlink_itemlink_desc_14", + "key": "itemlink_itemlink_desc_11", "text": "公会" }, "jumpid": 157, @@ -145,11 +145,11 @@ { "id": 156, "title": { - "key": "itemlink_itemlink_title_15", + "key": "itemlink_itemlink_title_12", "text": "竞技场" }, "desc": { - "key": "itemlink_itemlink_desc_15", + "key": "itemlink_itemlink_desc_12", "text": "竞技场" }, "jumpid": 156, @@ -158,11 +158,11 @@ { "id": 107, "title": { - "key": "itemlink_itemlink_title_16", + "key": "itemlink_itemlink_title_13", "text": "普通招募" }, "desc": { - "key": "itemlink_itemlink_desc_16", + "key": "itemlink_itemlink_desc_13", "text": "普通招募" }, "jumpid": 107, @@ -171,11 +171,11 @@ { "id": 165, "title": { - "key": "itemlink_itemlink_title_17", + "key": "itemlink_itemlink_title_14", "text": "前往vip" }, "desc": { - "key": "itemlink_itemlink_desc_17", + "key": "itemlink_itemlink_desc_14", "text": "前往vip" }, "jumpid": 165, diff --git a/bin/json/game_linestorymaintask.json b/bin/json/game_linestorymaintask.json index 99ac1df0c..0ad5fd739 100644 --- a/bin/json/game_linestorymaintask.json +++ b/bin/json/game_linestorymaintask.json @@ -39,9 +39,9 @@ }, { "Id": 3, - "subTask": 1, + "subTask": 2, "group": 10001, - "nodeIndex": 1, + "nodeIndex": 2, "order": "3", "stageid": 10003, "name": { @@ -58,10 +58,10 @@ }, { "Id": 4, - "subTask": 2, - "group": 10001, - "nodeIndex": 2, - "order": "4", + "subTask": 3, + "group": 10002, + "nodeIndex": 0, + "order": "1", "stageid": 10004, "name": { "key": "linestory_maintask_name_4", @@ -77,10 +77,10 @@ }, { "Id": 5, - "subTask": 3, - "group": 10001, - "nodeIndex": 2, - "order": "5", + "subTask": 4, + "group": 10002, + "nodeIndex": 1, + "order": "2", "stageid": 10005, "name": { "key": "linestory_maintask_name_5", @@ -96,10 +96,10 @@ }, { "Id": 6, - "subTask": 4, - "group": 10001, - "nodeIndex": 3, - "order": "6", + "subTask": 5, + "group": 10002, + "nodeIndex": 2, + "order": "3", "stageid": 10006, "name": { "key": "linestory_maintask_name_6", @@ -115,10 +115,10 @@ }, { "Id": 7, - "subTask": 5, - "group": 10001, - "nodeIndex": 3, - "order": "7", + "subTask": 6, + "group": 10003, + "nodeIndex": 0, + "order": "1", "stageid": 10007, "name": { "key": "linestory_maintask_name_7", @@ -134,10 +134,10 @@ }, { "Id": 8, - "subTask": 6, - "group": 10001, - "nodeIndex": 4, - "order": "8", + "subTask": 7, + "group": 10003, + "nodeIndex": 1, + "order": "2", "stageid": 10001, "name": { "key": "linestory_maintask_name_8", @@ -153,10 +153,10 @@ }, { "Id": 9, - "subTask": 7, - "group": 10001, - "nodeIndex": 5, - "order": "9", + "subTask": 8, + "group": 10003, + "nodeIndex": 2, + "order": "3", "stageid": 10009, "name": { "key": "linestory_maintask_name_9", diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json index 80c052563..8071b33ba 100644 --- a/bin/json/game_playerinfor_overview.json +++ b/bin/json/game_playerinfor_overview.json @@ -2,14 +2,15 @@ { "id": "16010101", "type": 1, - "icon": "icon/sbkp_js_nz", + "micon": "icon/sbkp_js_nz", + "wicon": "icon/sbkp_js_nvz", "tujing": [ 107 ], "murl": "100001", "wurl": "200001", "mplayerhead": "ytx_js_14004", - "wplayerhead": "ytx_js_14004", + "wplayerhead": "tx_js_nvz", "name": { "key": "playerinfor_playerinfor_overview_name_1", "text": "普通皮肤" @@ -18,14 +19,15 @@ { "id": "16010201", "type": 2, - "icon": "icon/zj_dz_001", + "micon": "icon/zj_dz_001", + "wicon": "icon/zj_dz_001", "tujing": [ 107 ], "murl": "explore", "wurl": "explore", "mplayerhead": "ytx_js_14004", - "wplayerhead": "ytx_js_14004", + "wplayerhead": "tx_js_nvz", "name": { "key": "playerinfor_playerinfor_overview_name_2", "text": "普通动作" @@ -34,14 +36,15 @@ { "id": "16010301", "type": 3, - "icon": "protagonistsystem/zj_bg_xk", + "micon": "protagonistsystem/zj_bg_xk", + "wicon": "protagonistsystem/zj_bg_xk", "tujing": [ 107 ], "murl": "character_cardshow", "wurl": "character_cardshow", "mplayerhead": "ytx_js_14004", - "wplayerhead": "ytx_js_14004", + "wplayerhead": "tx_js_nvz", "name": { "key": "playerinfor_playerinfor_overview_name_3", "text": "普通背景" diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json index 53f47a20d..fccff9421 100644 --- a/bin/json/game_ruledesc.json +++ b/bin/json/game_ruledesc.json @@ -1,42 +1,90 @@ [ { "id": 10001, - "title": "Fetter_help_title", - "content": "Fetter_help_content" + "title": { + "key": "ruledesc_ruledesc_title_1", + "text": "Fetter_help_title" + }, + "content": { + "key": "ruledesc_ruledesc_content_1", + "text": "Fetter_help_content" + } }, { "id": 10002, - "title": "Fetter_help_title", - "content": "Fetter_help_content" + "title": { + "key": "ruledesc_ruledesc_title_2", + "text": "Fetter_help_title" + }, + "content": { + "key": "ruledesc_ruledesc_content_2", + "text": "Fetter_help_content" + } }, { "id": 10003, - "title": "GoodImpression_help_title", - "content": "GoodImpression_help_content" + "title": { + "key": "ruledesc_ruledesc_title_3", + "text": "GoodImpression_help_title" + }, + "content": { + "key": "ruledesc_ruledesc_content_3", + "text": "GoodImpression_help_content" + } }, { "id": 10004, - "title": "GoodImpression_help_title", - "content": "GoodImpression_help_content" + "title": { + "key": "ruledesc_ruledesc_title_4", + "text": "GoodImpression_help_title" + }, + "content": { + "key": "ruledesc_ruledesc_content_4", + "text": "GoodImpression_help_content" + } }, { "id": 10005, - "title": "Panda_paiqian", - "content": "Panda_paiqian1" + "title": { + "key": "ruledesc_ruledesc_title_5", + "text": "Panda_paiqian" + }, + "content": { + "key": "ruledesc_ruledesc_content_5", + "text": "Panda_paiqian1" + } }, { "id": 10006, - "title": "Panda_meiriyilian", - "content": "Panda_meiriyilian1" + "title": { + "key": "ruledesc_ruledesc_title_6", + "text": "Panda_meiriyilian" + }, + "content": { + "key": "ruledesc_ruledesc_content_6", + "text": "Panda_meiriyilian1" + } }, { "id": 10007, - "title": "Potions help information", - "content": "Potions help information01" + "title": { + "key": "ruledesc_ruledesc_title_7", + "text": "Potions help information" + }, + "content": { + "key": "ruledesc_ruledesc_content_7", + "text": "Potions help information01" + } }, { "id": 10008, - "title": "arena_help_title", - "content": "arena_help_content" + "title": { + "key": "ruledesc_ruledesc_title_8", + "text": "arena_help_title" + }, + "content": { + "key": "ruledesc_ruledesc_content_8", + "text": "arena_help_content" + } } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index aaa215fb6..76d3237af 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -6012,7 +6012,7 @@ "Argu": [ 1, 4, - 1500 + 3000 ], "FollowSK": [], "SucFollowSK": [ @@ -6061,7 +6061,7 @@ "Argu": [ 1, 4, - 1500 + 3100 ], "FollowSK": [], "SucFollowSK": [ @@ -6110,7 +6110,7 @@ "Argu": [ 1, 4, - 1600 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -6159,7 +6159,7 @@ "Argu": [ 1, 4, - 1700 + 3300 ], "FollowSK": [], "SucFollowSK": [ @@ -6208,7 +6208,7 @@ "Argu": [ 1, 4, - 1700 + 3300 ], "FollowSK": [], "SucFollowSK": [ @@ -6304,7 +6304,7 @@ "Argu": [ 1, 4, - 1700 + 6000 ], "FollowSK": [], "SucFollowSK": [], @@ -9739,7 +9739,7 @@ 300, 1, 5, - 500 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -9791,7 +9791,7 @@ 300, 1, 5, - 600 + 1600 ], "FollowSK": [], "SucFollowSK": [ @@ -9843,7 +9843,7 @@ 300, 1, 5, - 600 + 1600 ], "FollowSK": [], "SucFollowSK": [ @@ -9895,7 +9895,7 @@ 300, 1, 5, - 700 + 1700 ], "FollowSK": [], "SucFollowSK": [ @@ -9947,7 +9947,7 @@ 300, 1, 5, - 700 + 1700 ], "FollowSK": [], "SucFollowSK": [ @@ -9999,7 +9999,7 @@ 300, 1, 5, - 800 + 1800 ], "FollowSK": [], "SucFollowSK": [ @@ -10141,7 +10141,7 @@ "Argu": [ 1, 5, - 150 + 1500 ], "FollowSK": [], "SucFollowSK": [], @@ -10164,7 +10164,7 @@ "Argu": [ 1, 5, - 300 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -10240,7 +10240,7 @@ "Argu": [ 1, 5, - 150 + 1600 ], "FollowSK": [], "SucFollowSK": [], @@ -10263,7 +10263,7 @@ "Argu": [ 1, 5, - 400 + 2500 ], "FollowSK": [], "SucFollowSK": [ @@ -10339,7 +10339,7 @@ "Argu": [ 1, 5, - 150 + 1600 ], "FollowSK": [], "SucFollowSK": [], @@ -10362,7 +10362,7 @@ "Argu": [ 1, 5, - 400 + 2500 ], "FollowSK": [], "SucFollowSK": [ @@ -10438,7 +10438,7 @@ "Argu": [ 1, 5, - 150 + 1600 ], "FollowSK": [], "SucFollowSK": [], @@ -10461,7 +10461,7 @@ "Argu": [ 1, 5, - 500 + 2500 ], "FollowSK": [], "SucFollowSK": [ @@ -10537,7 +10537,7 @@ "Argu": [ 1, 5, - 150 + 1600 ], "FollowSK": [], "SucFollowSK": [], @@ -10560,7 +10560,7 @@ "Argu": [ 1, 5, - 500 + 2500 ], "FollowSK": [], "SucFollowSK": [ @@ -11426,8 +11426,8 @@ 1, 4, 900, - 2, 1, + 2, 55 ], "FollowSK": [ @@ -12539,7 +12539,7 @@ "Argu": [ 1, 4, - 1000 + 2500 ], "FollowSK": [], "SucFollowSK": [ @@ -12588,7 +12588,7 @@ "Argu": [ 1, 4, - 1000 + 4000 ], "FollowSK": [], "SucFollowSK": [], @@ -12818,30 +12818,6 @@ "RevisiCondition": "", "RevisiParams": [] }, - { - "Id": 235005112, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 26, - "Argu": [ - 1, - 6, - 4, - 45 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, { "Id": 235005211, "EmitPR": 1000, @@ -12849,37 +12825,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 2, - "Type": 1, - "Argu": [ - 1, - 4, - 200 - ], - "FollowSK": [], - "SucFollowSK": [ - 235005213 - ], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 235005212, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, "ExecuteCnt": 1, "Type": 1, "Argu": [ 1, 4, - 400 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -12971,12 +12922,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 2, + "ExecuteCnt": 5, "Type": 1, "Argu": [ 1, 4, - 1050 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -16681,7 +16632,7 @@ "Argu": [ 1, 4, - 5400 + 6600 ], "FollowSK": [], "SucFollowSK": [ @@ -16755,7 +16706,7 @@ "Argu": [ 1, 4, - 1200 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -16804,7 +16755,7 @@ "Argu": [ 1, 4, - 1000 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -16853,7 +16804,7 @@ "Argu": [ 1, 4, - 1800 + 3600 ], "FollowSK": [], "SucFollowSK": [ @@ -16878,7 +16829,7 @@ "Argu": [ 1, 4, - 1800 + 3600 ], "FollowSK": [], "SucFollowSK": [ @@ -17479,7 +17430,7 @@ "Argu": [ 1, 4, - 600 + 1600 ], "FollowSK": [], "SucFollowSK": [], @@ -17551,7 +17502,7 @@ "Argu": [ 1, 4, - 800 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -17576,7 +17527,7 @@ "Argu": [ 1, 4, - 800 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -17601,7 +17552,7 @@ "Argu": [ 1, 4, - 400 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -17675,7 +17626,7 @@ "Argu": [ 1, 4, - 2800 + 5800 ], "FollowSK": [], "SucFollowSK": [ @@ -18019,7 +17970,7 @@ "Argu": [ 1, 4, - 1000 + 2500 ], "FollowSK": [], "SucFollowSK": [ @@ -18091,7 +18042,7 @@ "Argu": [ 1, 4, - 2500 + 3500 ], "FollowSK": [], "SucFollowSK": [ @@ -19356,6 +19307,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ + 390001301, 1000, -1, -1 @@ -20253,7 +20205,7 @@ "Argu": [ 1, 4, - 600 + 1800 ], "FollowSK": [], "SucFollowSK": [ @@ -20302,7 +20254,7 @@ "Argu": [ 1, 4, - 800 + 1800 ], "FollowSK": [], "SucFollowSK": [ @@ -20396,7 +20348,7 @@ "Argu": [ 1, 4, - 2500 + 7500 ], "FollowSK": [], "SucFollowSK": [], @@ -25643,7 +25595,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [ 215003112 @@ -25762,7 +25714,7 @@ "Argu": [ 1, 4, - 1880 + 3000 ], "FollowSK": [ 215003312 @@ -25813,7 +25765,7 @@ "Argu": [ 1, 4, - 3800 + 4000 ], "FollowSK": [], "SucFollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 00eb9c627..ca42fb9ba 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -1074,7 +1074,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_124003011", - "text": "睡神队长技" + "text": "队长技" }, "ico": "jn_dzj_0006", "CorrectPos": 0, @@ -1121,7 +1121,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124003111", - "text": "对敌方1个目标造成攻击力110%的伤害，并有70%的概率附加1回合【睡眠】状态。" + "text": "对敌方1个目标造成攻击力160%的伤害，并有70%的概率附加1回合【睡眠】状态。" }, "buffid": [ 390001118 @@ -1153,7 +1153,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124003111", - "text": "伤害提升至100%" + "text": "伤害提升10%" }, "buffid": [ 390001118 @@ -1217,7 +1217,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124003111", - "text": "伤害提升至110%" + "text": "伤害提升10%" }, "buffid": [ 390001118 @@ -1347,7 +1347,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124003311", - "text": "对敌方全体造成攻击力80%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合【睡眠】状态。" + "text": "对敌方全体造成攻击力80%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合【睡眠】【禁疗】状态。" }, "buffid": [ 390001118 @@ -1596,7 +1596,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_134006011", - "text": "杰克队长技" + "text": "队长技" }, "ico": "jn_dzj_0024", "CorrectPos": 0, @@ -3061,7 +3061,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_144005011", - "text": "小伊队长技" + "text": "队长技" }, "ico": "jn_dzj_0019", "CorrectPos": 0, @@ -3705,7 +3705,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_135001011", - "text": "师傅队长技" + "text": "队长技" }, "ico": "jn_dzj_0026", "CorrectPos": 0, @@ -4416,7 +4416,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_124004011", - "text": "邦尼兔队长技" + "text": "队长技" }, "ico": "jn_dzj_0027", "CorrectPos": 0, @@ -4433,7 +4433,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124004011", - "text": "在祭祀神迹、声之神迹的挑战中，我方全体效果命中增加40%" + "text": "在泰坦远征，狩猎的挑战中，我方全体效果命中增加40%" }, "buffid": [], "map": "" @@ -4462,7 +4462,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124004111", - "text": "攻击1个敌方，伤害为自身攻击力100%，60%概率为目标附加2回合【禁疗】" + "text": "攻击1个敌方，伤害为自身攻击力300%，60%概率为目标附加2回合【禁疗】" }, "buffid": [ 390001107 @@ -4493,7 +4493,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124004111", - "text": "伤害提升至110%" + "text": "伤害提升10%" }, "buffid": [ 390001107 @@ -4555,7 +4555,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124004111", - "text": "伤害提升至120%" + "text": "伤害提升20%" }, "buffid": [ 390001107 @@ -4650,7 +4650,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124004311", - "text": "攻击全体敌方，伤害为自身攻击力100%，为目标附加2回合【速度下降】和【中毒】。" + "text": "攻击敌方，伤害为自身攻击力600%，为目标附加2回合【速度下降】和【中毒】。" }, "buffid": [ 390001008, @@ -4900,7 +4900,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_144006011", - "text": "悍娇虎队长技" + "text": "队长技" }, "ico": "jn_dzj_0019", "CorrectPos": 0, @@ -4946,7 +4946,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_144006111", - "text": "对敌方1个目标造成攻击力100%的伤害，自身每损失10%的生命，伤害提升5%" + "text": "对敌方1个目标造成攻击力100%的伤害，自身每损失10%的生命，伤害提升5%，并附带护盾" }, "buffid": [], "map": "" @@ -5588,7 +5588,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_115005011", - "text": "亚历克斯队长技" + "text": "队长技" }, "ico": "jn_dzj_0001", "CorrectPos": 0, @@ -5966,7 +5966,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_115004011", - "text": "小欧队长技" + "text": "队长技" }, "ico": "jn_dzj_0020", "CorrectPos": 0, @@ -6600,7 +6600,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_124002011", - "text": "牙仙队长技" + "text": "队长技" }, "ico": "jn_dzj_0029", "CorrectPos": 0, @@ -7046,7 +7046,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_114007011", - "text": "格里斯特王子队长技" + "text": "队长技" }, "ico": "jn_dzj_0029", "CorrectPos": 0, @@ -7092,7 +7092,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114007111", - "text": "攻击1个敌方，伤害为自身攻击力30%及防御力50%，50%概率为目标附加2回合【防御下降】。" + "text": "攻击1个敌方，伤害为自身攻击力30%及防御力150%，50%概率为目标附加2回合【防御下降】。" }, "buffid": [ 390001007 @@ -7561,7 +7561,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_114003011", - "text": "亚丝翠队长技" + "text": "队长技" }, "ico": "jn_dzj_0031", "CorrectPos": 0, @@ -8045,7 +8045,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_145003011", - "text": "盖队长技" + "text": "队长技" }, "ico": "jn_dzj_0016", "CorrectPos": 0, @@ -8091,7 +8091,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_145003111", - "text": "对敌方1个目标造成攻击力30%的伤害，附加自身最大生命在5.5%的伤害，并未自身回复本次伤害100%的生命值" + "text": "对敌方1个目标造成攻击力30%的伤害，附加自身最大生命在5.5%的伤害，并为自身回复本次伤害100%的生命值" }, "buffid": [], "map": "" @@ -8616,7 +8616,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_113003011", - "text": "啊啊队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -8662,9 +8662,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113003111", - "text": "啊啊对敌方1个目标造成攻击力100%的伤害，并有60%概率附加1回合【挑衅】状态。" + "text": "啊啊对敌方1个目标造成攻击力250%的伤害，并有60%概率附加1回合【挑衅】状态。" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -8694,7 +8696,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113003211", - "text": "啊啊对敌方1个目标造成攻击力200%的伤害，随后为自身恢复最大生命值5%生命，并有100%概率驱散目标全部增益状态，每驱散1个增益状态，可为自身恢复最大生命值3%的生命。" + "text": "啊啊对敌方1个目标造成攻击力400%的伤害，随后为自身恢复最大生命值5%生命，并有100%概率驱散目标全部增益状态，每驱散1个增益状态，可为自身恢复最大生命值3%的生命。" }, "buffid": [], "map": "" @@ -8727,7 +8729,9 @@ "key": "skill_skill_atk_Desc_113003311", "text": "啊啊对敌方1个目标造成自身最大生命值18%的伤害，并附加1回合【吞噬】状态。目标当前生命值大于50%，则附加2回合【吞噬】状态。效果持续期间若自身被击败或场上只剩自己一人，则提前释放目标。" }, - "buffid": [], + "buffid": [ + 390001113 + ], "map": "" }, { @@ -8737,7 +8741,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_135005011", - "text": "幸运·普雷斯科特队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -8813,7 +8817,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135005211", - "text": "幸运·普雷斯科特对敌方全体目标造成3段共计攻击80%的伤害，每段伤害有50%概率为目标附加2回合【防御下降】状态" + "text": "幸运·普雷斯科特对敌方全体目标造成200%伤害" }, "buffid": [], "map": "" @@ -8844,9 +8848,13 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135005311", - "text": "幸运·普雷斯科特为我方全体附加2回合【免疫】和【防御提升】状态，并对敌方全体目标造成攻击力105%的伤害，并附加2回合【攻击下降】状态" + "text": "幸运·普雷斯科特为我方全体附加2回合【免疫】和【防御提升】状态，并对敌方全体目标造成攻击力500%的伤害，并附加2回合【攻击下降】状态" }, - "buffid": [], + "buffid": [ + 390001111, + 390001002, + 390001007 + ], "map": "" }, { @@ -8978,7 +8986,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_145001011", - "text": "乌龟大师队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -9025,9 +9033,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_145001111", - "text": "乌龟大师对敌方1个目标发起2段攻击，每段可造成攻击力70%的伤害，并有70%概率夺取目标1个增益状态；若夺取成功，对目标附加1回合【烙印】状态。" + "text": "乌龟大师对敌方1个目标发起2段攻击，每段可造成攻击力150%的伤害，对目标附加2回合【烙印】状态，并有70%概率夺取目标1个增益状态。" }, - "buffid": [], + "buffid": [ + 390001101 + ], "map": "" }, { @@ -9055,9 +9065,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_145001211", - "text": "乌龟大师对敌方全体发起2段攻击，分别造成攻击力50%的伤害，第一段攻击附加2回合【无法获得增益效果】状态，第二段攻击造成与伤害量等值的生命最大值下降。" + "text": "乌龟大师对敌方全体发起2段攻击，分别造成攻击力200%的伤害，第一段攻击附加2回合【无法获得增益效果】状态，第二段攻击造成与伤害量等值的生命最大值下降。" }, - "buffid": [], + "buffid": [ + 390001115 + ], "map": "" }, { @@ -9087,9 +9099,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_145001311", - "text": "乌龟大师净化自身所有减益状态，同时驱散敌方全体所有增益状态，随后对敌方全体造成攻击力120%的伤害，共有50%概率附加2回合【防御下降】状态。若驱散成功，则有100%概率附加【防御下降】状态。" + "text": "乌龟大师净化自身所有减益状态，同时驱散敌方全体所有增益状态，随后对敌方全体造成攻击力600%的伤害，共附加2回合【防御下降】状态" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -9197,7 +9211,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_124008011", - "text": "暴芙那特队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -9244,7 +9258,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124008111", - "text": "暴芙那特对敌方1个目标造成2次自身攻击力60%的伤害，并有40%概率附加2回合【烙印】效果。若某英雄在场，则本次攻击额外附加目标最大生命值5%的伤害，但最高无法超过自身攻击力的60%。" + "text": "暴芙那特对敌方1个目标造成2次自身攻击力60%的伤害，并有40%概率附加2回合【烙印】效果。若悍夫那特在场，则本次攻击额外附加目标最大生命值5%的伤害，但最高无法超过自身攻击力的60%。" }, "buffid": [ 390001101 @@ -9276,7 +9290,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124008211", - "text": "暴芙那特对敌方全体造成2次自身攻击力45%的伤害，并有40%概率附加2回合【速度下降】效果。若某英雄在场，则本次攻击额外造成两段伤害并附加同样效果" + "text": "暴芙那特对敌方全体造成2次自身攻击力45%的伤害，并有40%概率附加2回合【速度下降】效果。若悍夫那特在场，则本次攻击额外造成两段伤害并附加同样效果" }, "buffid": [ 390001008 @@ -9324,7 +9338,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_134008011", - "text": "悍夫那特队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -9341,7 +9355,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134008011", - "text": "在祭祀神迹、声之神迹的挑战中，我方全体生命增加40%" + "text": "在泰坦远征，狩猎的挑战中，我方全体生命增加40%" }, "buffid": [], "map": "" @@ -9371,7 +9385,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134008111", - "text": "悍夫那特对敌方一个目标造成1次自身攻击力100%的伤害，并有40%概率击退目标10%行动值。若某英雄在场，则本次攻击额外随机攻击2个目标，造成同样伤害和效果" + "text": "悍夫那特对敌方一个目标造成1次自身攻击力300%的伤害，并有40%概率击退目标10%行动值。若暴芙那特在场，则本次攻击额外随机攻击2个目标，造成同样伤害和效果" }, "buffid": [], "map": "" @@ -9401,9 +9415,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134008211", - "text": "悍夫那特对敌方全体造成2次自身攻击力45%的伤害，并有40%概率附加1回合【眩晕】效果。若某英雄再次，则本次攻击额外造成2段伤害并附加统一效果" + "text": "悍夫那特对敌方全体造成2次自身攻击力135%的伤害，并有40%概率附加1回合【眩晕】效果。若暴芙那特在场，则本次攻击额外造成2段伤害并附加同一效果" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -9430,9 +9446,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134008311", - "text": "悍夫那特先为自身施加2回合【速度提升】效果，之后对敌方1个目标造成2次自身攻击力120%的伤害，并吸收目标10行动值" + "text": "悍夫那特先为自身施加2回合【速度提升】效果，之后对敌方1个目标造成2次自身攻击力360%的伤害，并吸收目标10行动值" }, - "buffid": [], + "buffid": [ + 390001003 + ], "map": "" }, { @@ -9460,7 +9478,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113002111", - "text": "食人鱼先生对敌方1个目标造成攻击力130%的伤害；若发生暴击，大招冷却时间减少1回合" + "text": "食人鱼先生对敌方1个目标造成攻击力400%的伤害；若发生暴击，生化武器冷却时间减少1回合" }, "buffid": [], "map": "" @@ -9489,9 +9507,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113002211", - "text": "食人鱼先生对敌方1个目标造成攻击力220%的伤害，有85%概率附加2回合【防御下降】状态。" + "text": "食人鱼先生对敌方1个目标造成攻击力450%的伤害，有85%概率附加2回合【防御下降】状态。" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -9520,7 +9540,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113002311", - "text": "食人鱼先生对敌方1个目标造成攻击力260%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力150%的伤害，本次攻击无视防御。追加伤害每回合最多触发2次。" + "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力150%的伤害，本次攻击无视防御。追加伤害每回合最多触发2次。" }, "buffid": [], "map": "" @@ -9609,7 +9629,9 @@ "key": "skill_skill_atk_Desc_143002111", "text": "果酱教授对敌方1个目标造成攻击力120%的伤害，有75%概率对其施加2回合【速度下降】状态，并有75%概率将自身1个减益状态转移给目标" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -9639,7 +9661,9 @@ "key": "skill_skill_atk_Desc_143002211", "text": "果酱教授每次攻击可减少目标15%行动值。造成伤害后，若目标行动值低于30%，附加1回合【石化】状态" }, - "buffid": [], + "buffid": [ + 390001108 + ], "map": "" }, { @@ -9798,7 +9822,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_135006011", - "text": "平先生队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -9918,7 +9942,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_134002011", - "text": "蒂姆·邓普顿队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -10044,7 +10068,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_124005011", - "text": "金猴队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -10154,7 +10178,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124005311", - "text": "金猴对敌方全体造成攻击力120%的伤害，并附加2回合【速度下降】状态；同时能减少敌方全体30%行动值，并重置2技能的冷却时间" + "text": "金猴对敌方全体造成攻击力120%的伤害，并附加2回合【速度下降】状态；同时能减少敌方全体30%行动值，并重置水中取月的冷却时间" }, "buffid": [ 390001008 @@ -10168,7 +10192,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_125003011", - "text": "羊仙姑队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -10302,7 +10326,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113004111", - "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力120%的伤害；若自身当前生命比例低于50%，则可对目标追加1次攻击，造成攻击力120%的伤害，且提升30%的暴击率，并无视目标20%的防御。" + "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力360%的伤害；若自身当前生命比例低于50%，则可对目标追加1次攻击，造成攻击力120%的伤害，且提升30%的暴击率，并无视目标20%的防御。" }, "buffid": [], "map": "" @@ -10332,9 +10356,12 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113004211", - "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力210%的伤害，并未自身附加2回合【攻击提升】状态和2回合【对峙】状态。" + "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力630%的伤害，并未自身附加2回合【攻击提升】状态和2回合【对峙】状态。" }, - "buffid": [], + "buffid": [ + 390001001, + 390001104 + ], "map": "" }, { @@ -10361,7 +10388,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113004311", - "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力260%的伤害，同时会清除目标身上的2个增益状态，自身每损失10%生命，伤害会增加5%。" + "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力800%的伤害，同时会清除目标身上的2个增益状态，自身每损失10%生命，伤害会增加5%。" }, "buffid": [], "map": "" @@ -10373,7 +10400,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_133003011", - "text": "胡德先生队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -10390,7 +10417,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_133003011", - "text": "在祭祀神迹、声之神迹的挑战中，我方全体暴击率增加20%" + "text": "在泰坦远征，狩猎的挑战中，我方全体暴击率增加20%" }, "buffid": [], "map": "" @@ -10419,9 +10446,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_133003111", - "text": "胡德先生对敌方1个目标造成攻击力110%的伤害，并有40%概率附加2回合【攻击下降】状态" + "text": "胡德先生对敌方1个目标造成攻击力330%的伤害，并有40%概率附加2回合【攻击下降】状态" }, - "buffid": [], + "buffid": [ + 390001006 + ], "map": "" }, { @@ -10448,9 +10477,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_133003211", - "text": "胡德先生当队友向敌方任意1个目标发起攻击时，都会跟随队友对目标造成攻击力40%的伤害，并附加1回合【中毒】状态" + "text": "胡德先生当队友向敌方任意1个目标发起攻击时，都会跟随队友对目标造成攻击，并附加1回合【中毒】状态" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -10477,9 +10508,12 @@ }, "Desc": { "key": "skill_skill_atk_Desc_133003311", - "text": "胡德先生对敌方随机2个目标造成攻击力180%的伤害，并有80%概率附加2回合【防御下降】【中毒" + "text": "胡德先生对敌方随机2个目标造成攻击力660%的伤害，并有80%概率附加2回合【防御下降】【中毒】" }, - "buffid": [], + "buffid": [ + 390001401, + 390001007 + ], "map": "" }, { @@ -10506,9 +10540,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_143001111", - "text": "阿比盖尔·斯通对敌方1个目标造成攻击力120%的伤害，并有75%概率附加2回合【防御下降】状态" + "text": "阿比盖尔·斯通对敌方1个目标造成攻击力220%的伤害，并有75%概率附加2回合【防御下降】状态。" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -10535,9 +10571,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_143001211", - "text": "阿比盖尔·斯通对敌方1个目标造成攻击力120%的伤害，并有75%概率附加2回合【防御下降】状态" + "text": "阿比盖尔·斯通对敌方全体攻击力200%的伤害，有75%概率附加2回合【攻击下降】状态。" }, - "buffid": [], + "buffid": [ + 390001006 + ], "map": "" }, { @@ -10565,9 +10603,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_143001311", - "text": "阿比盖尔·斯通对敌方全体攻击力100%的伤害，有75%概率附加2回合【攻击下降】状态" + "text": "阿比盖尔·斯通选定敌方1个目标，随后另外随机挑选敌方1个目标，对2个目标同时发起攻击，分别造成攻击力360%的伤害，并附加3回合【链接】状态。" }, - "buffid": [], + "buffid": [ + 390001213 + ], "map": "" }, { @@ -10577,7 +10617,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_134003011", - "text": "圣诞老人队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -10623,9 +10663,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134003111", - "text": "圣诞老人对敌方1个目标造成攻击力120%的伤害，并有75%概率附加2回合【失手率提升】状态" + "text": "圣诞老人对敌方1个目标造成攻击力360%的伤害，并有75%概率附加2回合【失手率提升】状态" }, - "buffid": [], + "buffid": [ + 390001102 + ], "map": "" }, { @@ -10653,9 +10695,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134003211", - "text": "圣诞老人对敌方1个目标造成攻击力120%的伤害，并有75%概率附加2回合【失手率提升】状态" + "text": "圣诞老人对敌方1个目标发起2段攻击，每段造成攻击力200%的伤害，每段有75%概率附加1回合【眩晕】状态。第二段攻击会偷取目标25%行动值并平均分配给我发全体" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -10682,7 +10726,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134003311", - "text": "圣诞老人对敌方1个目标发起2段攻击，每段造成攻击力100%的伤害，每段有75%概率附加1回合【眩晕】状态。第二段攻击会偷取目标25%行动值并平均分配给我发全体" + "text": "圣诞老人对目标体造成攻击力600%的伤害，同时夺取敌方目标各1个增益状态。每成功夺取1个增益状态，可为自身增加30%行动值。" }, "buffid": [], "map": "" @@ -10694,7 +10738,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_144004011", - "text": "骇客蛛队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -10742,7 +10786,9 @@ "key": "skill_skill_atk_Desc_144004111", "text": "骇客蛛对敌方1个目标造成攻击力30%及自身最大生命值8%的伤害，并有50%概率附加2回合【攻击下降】状态" }, - "buffid": [], + "buffid": [ + 390001006 + ], "map": "" }, { @@ -10772,7 +10818,9 @@ "key": "skill_skill_atk_Desc_144004211", "text": "骇客蛛对敌方1个目标造成2次攻击力20%及自身最大生命值6%的伤害，每段有60%概率驱散目标1个增益状态，同时立刻触发目标身上的【黑客前瞻】效果。" }, - "buffid": [], + "buffid": [ + 390001216 + ], "map": "" }, { @@ -10802,7 +10850,9 @@ "key": "skill_skill_atk_Desc_144004311", "text": "骇客蛛对敌方1个目标造成2次攻击力20%及自身最大生命值6%的伤害，每段有60%概率驱散目标1个增益状态，同时立刻触发目标身上的【黑客前瞻】效果。" }, - "buffid": [], + "buffid": [ + 390001216 + ], "map": "" }, { @@ -10812,7 +10862,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_134007011", - "text": "菲奥娜队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -10829,7 +10879,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134007011", - "text": "在祭祀神迹、声之神迹的挑战中，我方全体攻击增加30%" + "text": "在维京远征和狩猎的挑战中，我方全体攻击增加30%" }, "buffid": [], "map": "" @@ -10859,7 +10909,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134007111", - "text": "菲奥娜对敌方1个目标造成2次攻击力60%的伤害，若发生暴击，则为自身附加1回合【免疫】状态" + "text": "菲奥娜对敌方1个目标造成2次攻击力160%的伤害，若发生暴击，则为自身附加1回合【免疫】状态" }, "buffid": [ 390001111 @@ -10892,7 +10942,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134007211", - "text": "菲奥娜对敌方1个目标发起3连击，共造成攻击力200%的伤害，每次攻击有60%概率驱散目标1个增益状态；若驱散成功，则对目标附加2回合【攻击下降】状态" + "text": "菲奥娜对敌方1个目标发起3连击，共造成攻击力300%的伤害，每次攻击有60%概率驱散目标1个增益状态；若驱散成功，则对目标附加2回合【攻击下降】状态" }, "buffid": [ 390001006 @@ -10924,7 +10974,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134007311", - "text": "菲奥娜对敌方1个目标造成攻击力280%的伤害，并为自身附加2回合生命值上限35%的【护盾】；若发生暴击，则次数伤害提升30%，并额外提升50%【护盾】" + "text": "菲奥娜对敌方1个目标造成攻击力580%的伤害，并为自身附加2回合生命值上限35%的【护盾】；若发生暴击，则次数伤害提升30%，并额外提升50%【护盾】" }, "buffid": [ 390001112 @@ -10988,7 +11038,10 @@ "key": "skill_skill_atk_Desc_143006211", "text": "布里奇特为我方1个目标恢复其最大生命值30%的生命，并附加1回合【无敌】、【复苏】状态。若目标生命值低于50%，则额外附加1回合【复苏】状态" }, - "buffid": [], + "buffid": [ + 390001103, + 390001127 + ], "map": "" }, { @@ -11018,7 +11071,10 @@ "key": "skill_skill_atk_Desc_143006311", "text": "布里奇特为我方全体附加2回合【攻击提升】和【防御提升】状态" }, - "buffid": [], + "buffid": [ + 390001001, + 390001002 + ], "map": "" }, { @@ -11028,7 +11084,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_113001011", - "text": "闪闪队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -11045,7 +11101,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113001011", - "text": "闪闪对敌方1个目标造成攻击力250%的伤害，并为我方全体附加2回合【防御提升】状态" + "text": "在积分赛中，我方全体防御增加24%" }, "buffid": [], "map": "" @@ -11074,9 +11130,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113001111", - "text": "闪闪对敌方1个目标造成攻击力100%的伤害，攻击时产生的光盾能量有50%的概率对目标附加1回合【眩晕】状态" + "text": "闪闪对敌方1个目标造成攻击力250%的伤害，攻击时产生的光球能量有50%的概率对目标附加1回合【眩晕】状态" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -11132,9 +11190,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113001311", - "text": "闪闪对敌方1个目标造成攻击力250%的伤害，并为我方全体附加2回合【防御提升】状态" + "text": "闪闪对敌方1个目标造成攻击力350%的伤害，并为我方全体附加2回合【防御提升】状态" }, - "buffid": [], + "buffid": [ + 390001002 + ], "map": "" }, { @@ -11144,7 +11204,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_114005011", - "text": "鹤大师队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -11191,7 +11251,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114005111", - "text": "鹤大师对敌方1个目标发起2段攻击，每段可造成攻击力70%伤害，并有50%概率夺取目标1个增益状态。" + "text": "鹤大师对敌方1个目标发起攻击，可造成攻击力210%伤害，并有50%概率夺取目标1个增益状态。" }, "buffid": [], "map": "" @@ -11221,7 +11281,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114005211", - "text": "鹤大师随机对敌方目标发起4次攻击，每次攻击造成攻击力75%的伤害，并演出自身全部增益状态1回合。若目标未存在增益状态，则对目标附加2回合【无法获得增益效果】状态。" + "text": "鹤大师对敌方目标发起3次攻击，每次攻击造成攻击力225%的伤害，并延长自身全部增益状态1回合。若目标未存在增益状态，则对目标附加2回合【无法获得增益效果】状态。" }, "buffid": [], "map": "" @@ -11252,7 +11312,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114005311", - "text": "鹤大师随机对敌方目标发起5次攻击，每次造成攻击力90%伤害并偷取目标身上存在的2个增益效果。自身每个强化效果可提升10%伤害。" + "text": "鹤大师对敌方目标发起1次攻击，造成攻击力500%伤害并偷取目标身上存在的2个增益效果。自身每个强化效果可提升10%伤害。" }, "buffid": [], "map": "" @@ -11352,7 +11412,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_143003011", - "text": "史蒂夫·帕丘克队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -11400,7 +11460,9 @@ "key": "skill_skill_atk_Desc_143003111", "text": "史蒂夫·帕丘克对敌方1个目标造成攻击力120%的伤害，并有40%概率附加2回合【速度下降】状态" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -11558,7 +11620,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_115002011", - "text": "船长队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -11604,7 +11666,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115002111", - "text": "船长对敌方1个目标造成130%伤害，夺取该目标1个增益状态，并有100%概率为自身附加2回合【攻击提升】状态" + "text": "船长对敌方1个目标造成390%伤害，夺取该目标1个增益状态，并有100%概率为自身附加2回合【攻击提升】状态" }, "buffid": [], "map": "" @@ -11678,7 +11740,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_113005011", - "text": "大大队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -11760,7 +11822,9 @@ "key": "skill_skill_atk_Desc_113005211", "text": "回合开始时若自身可行动，为随机2名友方附加2回合[暴击提升]和1回合[攻击提升]。减少已有[攻击提升]的目标所有技能1回合冷却。" }, - "buffid": [], + "buffid": [ + 390001001 + ], "map": "" }, { @@ -11791,7 +11855,9 @@ "key": "skill_skill_atk_Desc_113005311", "text": "为全体友方附加2回合[攻击提升] ;目标已有[攻击提升]时，减少目标所有技能1回合冷却。此技能冷却时间不会被任何技能影响。" }, - "buffid": [], + "buffid": [ + 390001001 + ], "map": "" }, { @@ -11801,7 +11867,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_124009011", - "text": "云朵先生队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -11849,9 +11915,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124009111", - "text": "云朵先生对敌方1个目标造成自身攻击力110%的伤害，若此次伤害触发了暴击，则使自身【暴击提升】效果延长1回合。" + "text": "云朵先生对敌方1个目标造成自身攻击力330%的伤害，若此次伤害触发了暴击，则使自身【暴击提升】效果延长1回合。" }, - "buffid": [], + "buffid": [ + 390001004 + ], "map": "" }, { @@ -11879,9 +11947,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124009211", - "text": "云朵先生对敌方1个目标造成3次自身攻击力55%的伤害，并有50%的概率降低目标15%的行动值。若此次伤害触发了暴击，则为目标额外附加2回合【速度下降】效果。" + "text": "云朵先生对敌方1个目标造成3次自身攻击力165%的伤害，并有50%的概率降低目标15%的行动值。若此次伤害触发了暴击，则为目标额外附加2回合【速度下降】效果。" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -11910,9 +11980,12 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124009311", - "text": "云朵先生为自身附加2回合【暴击提升】效果， 之后对敌方全体目标造成3次自身攻击力45%的伤害，若此次伤害触发了暴击，则有40%的概率【冰冻】目标，持续1回合" + "text": "云朵先生为自身附加2回合【暴击提升】效果， 之后对敌方全体目标造成3次自身攻击力135%的伤害，若此次伤害触发了暴击，则有40%的概率【冰冻】目标，持续1回合" }, - "buffid": [], + "buffid": [ + 390001004, + 390001106 + ], "map": "" }, { @@ -11922,7 +11995,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_124001011", - "text": "警长队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -11969,7 +12042,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124001111", - "text": "警长对敌方1个目标进行射击，造成攻击力130%的伤害，若成功击杀目标，则获得额外回合" + "text": "警长对敌方1个目标进行射击，造成攻击力390%的伤害，若成功击杀目标，则获得额外回合" }, "buffid": [], "map": "" @@ -11998,7 +12071,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124001211", - "text": "：警长对敌方所有目标造成攻击力70%的伤害，为自身回复本次总伤害30%的生命，并各吸收目标10%的行动值" + "text": "警长对敌方所有目标造成攻击力210%的伤害，为自身回复本次总伤害30%的生命，并各吸收目标10%的行动值" }, "buffid": [], "map": "" @@ -12028,7 +12101,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124001311", - "text": "警长对敌方全体攻击4次，共造成攻击力115%的伤害；发生暴击时，本次伤害将额外提升30%" + "text": "警长对敌方全体攻击4次，共造成攻击力420%的伤害；发生暴击时，本次伤害将额外提升30%" }, "buffid": [], "map": "" @@ -12173,9 +12246,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_133002111", - "text": "坦克对敌方1个目标发起2段攻击，每段造成攻击力60%的伤害，并有35%概率附加2回合【防御下降】状态" + "text": "坦克对敌方1个目标发起2段攻击，每段造成攻击力180%的伤害，并有35%概率附加2回合【防御下降】状态" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -12203,9 +12278,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_133002211", - "text": "坦克对敌方1个目标发起3段攻击，每段可造成攻击力80%的伤害，有30%概率将自身1个减益状态转移给目标。若造成暴击，则附加2回合【流血】状态" + "text": "坦克对敌方1个目标发起3段攻击，每段可造成攻击力180%的伤害，有30%概率将自身1个减益状态转移给目标。若造成暴击，则附加2回合【流血】状态" }, - "buffid": [], + "buffid": [ + 390001430 + ], "map": "" }, { @@ -12233,7 +12310,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_133002311", - "text": "坦克对敌方1个目标造成攻击力250%的伤害；若目标身上存在减益状态，每一个减益状态，额外造成20%的伤害" + "text": "坦克对敌方1个目标造成攻击力750%的伤害；若目标身上存在减益状态，每一个减益状态，额外造成20%的伤害" }, "buffid": [], "map": "" @@ -14021,7 +14098,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_123004011", - "text": "吉姆·普雷斯科特队长技" + "text": "特队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -14069,7 +14146,9 @@ "key": "skill_skill_atk_Desc_456", "text": "攻击1个敌方3次，每次伤害为自身攻击力30%，每次有15%概率为目标附加1回合[眩晕]" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -14098,7 +14177,9 @@ "key": "skill_skill_atk_Desc_457", "text": "攻击随机3个敌方，伤害为自身造成攻击力80%75%概率为目标附加1回合[眩晕]" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -14128,7 +14209,9 @@ "key": "skill_skill_atk_Desc_458", "text": "攻击1个敌方2次，伤害分别为自身攻击力100%和最大生命值10%。第一段驱散目标全部增益,第二段为目标附加1回合[眩晕]" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -14639,7 +14722,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_115003011", - "text": "希沙窦斯队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -14685,7 +14768,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_477", - "text": "希沙窦斯对敌方1个目标造成攻击力130%的伤害，并吸收目标15%的行动值" + "text": "希沙窦斯对敌方1个目标造成攻击力300%的伤害，并吸收目标15%的行动值" }, "buffid": [], "map": "" @@ -14714,7 +14797,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_478", - "text": "希沙窦斯对敌方1个目标发起5段攻击，每段造成自身攻击力36%的伤害，回复此次伤害50%的生命值，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%" + "text": "希沙窦斯对敌方1个目标发起5段攻击，每段造成自身攻击力150%的伤害，回复此次伤害50%的生命值，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%" }, "buffid": [], "map": "" @@ -14744,7 +14827,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_479", - "text": "希沙窦斯对敌方全体发起3段攻击，每段造成自身攻击力38%的伤害，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%，最后一段攻击将吸收目标10%的行动值" + "text": "希沙窦斯对敌方全体发起3段攻击，每段造成自身攻击力300%的伤害，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%，最后一段攻击将吸收目标10%的行动值" }, "buffid": [], "map": "" @@ -15515,7 +15598,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_134005011", - "text": "沃尔特·史翠克勒队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -15532,7 +15615,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_506", - "text": "在祭祀神迹、声之神迹的挑战中，我方全体生命增加30%" + "text": "在泰坦远征，狩猎的挑战中，我方全体生命增加30%" }, "buffid": [], "map": "" @@ -15561,9 +15644,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_507", - "text": "沃尔特·史翠克勒对敌方1个目标造成攻击力120%的伤害，并有80%概率附加2回合【中毒】状态" + "text": "沃尔特·史翠克勒对敌方1个目标造成攻击力360%的伤害，并有80%概率附加2回合【中毒】状态" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -15592,7 +15677,9 @@ "key": "skill_skill_atk_Desc_508", "text": "沃尔特·史翠克勒为我方全体附加2回合【毒牙】状态，状态持续期间受到攻击，有70%概率为攻击者附加1回合【中毒】状态。" }, - "buffid": [], + "buffid": [ + 390001433 + ], "map": "" }, { @@ -15619,9 +15706,11 @@ }, "Desc": { "key": "skill_skill_atk_Desc_509", - "text": "沃尔特·史翠克勒对敌方全体目标造成攻击力120%的必中伤害，并有80%概率为目标附加2回合【中毒】状态。若成功附加【中毒】状态或目标已出于【中毒】状态，则附加1回合【石化】状态。" + "text": "沃尔特·史翠克勒对敌方全体目标造成攻击力500%的伤害，并有80%概率为目标附加2回合【中毒】状态。若成功附加【中毒】状态或目标已出于【中毒】状态，则附加1回合【石化】状态。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index a8f3d40df..47beeab8d 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -733,7 +733,7 @@ "key": "skill_skill_buff_Desc_390001113", "text": "无法进行任何行动，无法被选中，无法被攻击，无法获得任何强化及弱化效果" }, - "BuffType": 0, + "BuffType": 34, "EffectArgu": [], "BufParNum": 1, "RelyCheckArgu": [], @@ -3523,7 +3523,7 @@ "Id": 390001433, "Name": { "key": "skill_skill_buff_Name_390001433", - "text": "【毒牙】" + "text": "毒牙" }, "Desc": { "key": "skill_skill_buff_Desc_390001433", diff --git a/modules/buried/core.go b/modules/buried/core.go index d090eb3ce..3d21f47e1 100644 --- a/modules/buried/core.go +++ b/modules/buried/core.go @@ -26,6 +26,12 @@ const ( ) const ( - //任务完成自动锁定 - autolock = 1 + //一次性任务 + ctype_once = 1 + //重复性任务 + ctype_repeat = 2 + //日常任务 + ctype_daily = 3 + //周长任务 + ctype_weekly = 4 ) diff --git a/modules/buried/module.go b/modules/buried/module.go index f1e0a8346..f414691ff 100644 --- a/modules/buried/module.go +++ b/modules/buried/module.go @@ -10,8 +10,10 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/sys/db" + "go_dreamfactory/utils" "time" ) @@ -128,8 +130,26 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb. return } if bdata, ok := bdatas.Items[conf.Type]; ok { + ok = false for _, v1 := range bdata.Condi { if v1.Conid == v { + ok = true + //状态等于休眠 + if v1.State == pb.BuriedItemState_Sleep { + if conf.Ctype == ctype_daily { //日常 + if !utils.IsToday(v1.Timestamp) { //不是同一天 可以重置数据 + v1.State = pb.BuriedItemState_Activated + v1.Value = 0 + v1.Finish = pb.BuriedItemFinishState_buried_unfinish + } + } else if conf.Ctype == ctype_weekly { //周常 + if !utils.IsSameWeek(v1.Timestamp) { //不是同一周 + v1.State = pb.BuriedItemState_Activated + v1.Value = 0 + v1.Finish = pb.BuriedItemFinishState_buried_unfinish + } + } + } condis = append(condis, &pb.ConIProgress{ Btype: conf.Type, Conid: v1.Conid, @@ -139,6 +159,23 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb. }) } } + if !ok { //未找到 初始化一个 + condis = append(condis, &pb.ConIProgress{ + Btype: conf.Type, + Conid: v, + Value: 0, + Target: conf.Value, + State: pb.BuriedItemFinishState_buried_unfinish, + }) + } + } else { //未找到 初始化一个 + condis = append(condis, &pb.ConIProgress{ + Btype: conf.Type, + Conid: v, + Value: 0, + Target: conf.Value, + State: pb.BuriedItemFinishState_buried_unfinish, + }) } } return @@ -331,6 +368,32 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p return } + //状态等于休眠 + if bitem.State == pb.BuriedItemState_Sleep { + if cond.Ctype == ctype_repeat { //完成后自动锁定 + bitem.State = pb.BuriedItemState_Activated + bitem.Value = 0 + bitem.Finish = pb.BuriedItemFinishState_buried_unfinish + } else if cond.Ctype == ctype_daily { //日常 + if !utils.IsToday(bitem.Timestamp) { //不是同一天 可以重置数据 + bitem.State = pb.BuriedItemState_Activated + bitem.Value = 0 + bitem.Finish = pb.BuriedItemFinishState_buried_unfinish + } + } else if cond.Ctype == ctype_weekly { //周常 + if !utils.IsSameWeek(bitem.Timestamp) { //不是同一周 + bitem.State = pb.BuriedItemState_Activated + bitem.Value = 0 + bitem.Finish = pb.BuriedItemFinishState_buried_unfinish + } + } + } + + //非激活状态不写入输出 + if bitem.State != pb.BuriedItemState_Activated { + return + } + switch bconf.Insert { //数据接入方式 case overlay: //累加数据 bitem.Value += collec.Value @@ -360,12 +423,20 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p if bitem.Value >= cond.Value { //完成进度 bitem.Finish = pb.BuriedItemFinishState_buried_finish - if cond.Lock == autolock { //完成后自动锁定 + if cond.Ctype == ctype_once { //完成后自动锁定 bitem.State = pb.BuriedItemState_Freeze + } else if cond.Ctype == ctype_repeat { + bitem.State = pb.BuriedItemState_Sleep + } else if cond.Ctype == ctype_daily { + bitem.State = pb.BuriedItemState_Sleep + } else if cond.Ctype == ctype_weekly { + bitem.State = pb.BuriedItemState_Sleep } + bitem.Timestamp = configure.Now().Unix() //记录最后一次操作时间 } else { this.Debug("完成条件未达成!", log.Field{Key: "埋点Id", Value: bdata.Btype}, log.Field{Key: "条件Id", Value: bitem.Conid}, log.Field{Key: "当前进度", Value: bitem.Value}, log.Field{Key: "目标进度", Value: cond.Value}) } + return } diff --git a/modules/combat/api_ask.go b/modules/combat/api_ask.go new file mode 100644 index 000000000..d84656154 --- /dev/null +++ b/modules/combat/api_ask.go @@ -0,0 +1,141 @@ +package combat + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +//参数校验 +func (this *apiComp) AskCheck(session comm.IUserSession, req *pb.CombatAskReq) (code pb.ErrorCode) { + + return +} + +///获取自己的排行榜信息 +func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (code pb.ErrorCode, data *pb.ErrorData) { + var ( + info *pb.DBCombatUser + level *pb.DBCombatLevel + lvconf *cfg.GameCombatLevelData + pitem *pb.LevelProgressItem + condis []*pb.ConIProgress + ok bool + err error + ) + if code = this.AskCheck(session, req); code != pb.ErrorCode_Success { + return + } + if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil { + code = pb.ErrorCode_DBError + return + } + + if lvconf, err = this.module.configure.getCombatLevel(req.Level); err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } + + if level, ok = info.Level[req.Level]; !ok { + err = fmt.Errorf("没有初始化指定关卡数据:%d", req.Level) + code = pb.ErrorCode_ReqParameterError + data = &pb.ErrorData{ + Title: code.ToString(), + Message: err.Error(), + } + this.module.Errorln(err) + return + } + + pitem = &pb.LevelProgressItem{ + Level: level.Id, + Progress: level.Progress, + Pass: level.Pass, + Passpertask: level.Passpertask, + Passmaintask: level.Passmaintask, + } + + if level.Pass != 2 { + level.Progress = 0 + if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Maintask...); err != nil { + code = pb.ErrorCode_ExternalModule + data = &pb.ErrorData{ + Title: code.ToString(), + Message: comm.NewExternalModuleErr("Buried", "CheckCondition", lvconf.Maintask).Error(), + } + return + } + + level.Passmaintask = condis + pitem.Passmaintask = condis + ok = true + for _, v := range condis { + if v.State != pb.BuriedItemFinishState_buried_finish { + ok = false + } + if v.Conid == lvconf.Debrisitemid { + level.Progress = v.Value + } + } + if level.Pass == 0 && ok { + level.Pass = 1 + pitem.Pass = 1 + this.module.DispenseRes(session, lvconf.Award, true) + atns := make([]*pb.UserAssets, len(lvconf.Award)) + for i, v := range lvconf.Award { + atns[i] = &pb.UserAssets{ + A: v.A, + T: v.T, + N: v.N, + } + } + pitem.Mainaward = atns + } + + if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Subtask...); err != nil { + code = pb.ErrorCode_ExternalModule + data = &pb.ErrorData{ + Title: code.ToString(), + Message: comm.NewExternalModuleErr("Buried", "CheckCondition", lvconf.Subtask).Error(), + } + return + } + level.Passpertask = condis + pitem.Passpertask = condis + ok = true + for _, v := range condis { + if v.Conid == lvconf.Debrisitemid { + level.Progress = v.Value + } + if v.State != pb.BuriedItemFinishState_buried_finish { + ok = false + } + } + + if level.Pass == 1 && ok { // + level.Pass = 2 + pitem.Pass = 2 + this.module.DispenseRes(session, lvconf.Profectaward, true) + atns := make([]*pb.UserAssets, len(lvconf.Profectaward)) + for i, v := range lvconf.Profectaward { + atns[i] = &pb.UserAssets{ + A: v.A, + T: v.T, + N: v.N, + } + } + pitem.Peraward = atns + } + + info.Level[req.Level] = level + if err = this.module.modelCombat.updateInfo(info); err != nil { + code = pb.ErrorCode_DBError + return + } + pitem.Progress = level.Progress + } + + session.SendMsg(string(this.module.GetType()), "ask", &pb.CombatAskResp{Level: pitem}) + return +} diff --git a/modules/combat/api_in.go b/modules/combat/api_in.go index 947a6ddf4..d14261d99 100644 --- a/modules/combat/api_in.go +++ b/modules/combat/api_in.go @@ -3,7 +3,6 @@ package combat import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -15,14 +14,10 @@ func (this *apiComp) InCheck(session comm.IUserSession, req *pb.CombatInReq) (co ///获取自己的排行榜信息 func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( - info *pb.DBCombatUser - level *pb.DBCombatLevel - lvconf *cfg.GameCombatLevelData - condis []*pb.ConIProgress - pitem *pb.LevelProgressItem - push bool - ok bool - err error + info *pb.DBCombatUser + level *pb.DBCombatLevel + ok bool + err error ) if code = this.InCheck(session, req); code != pb.ErrorCode_Success { return @@ -31,106 +26,21 @@ func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb code = pb.ErrorCode_DBError return } - - if lvconf, err = this.module.configure.getCombatLevel(req.Id); err != nil { - code = pb.ErrorCode_ConfigNoFound - return - } - - if level, ok = info.Level[req.Id]; !ok { - + if level, ok = info.Level[req.Level]; !ok { level = &pb.DBCombatLevel{ - Id: req.Id, + Id: req.Level, Passmanster: make([]int32, 0), Passdrop: make([]int32, 0), Progress: 0, Pass: 0, } - pitem = &pb.LevelProgressItem{ - Level: level.Id, - Pass: level.Pass, - } - if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Maintask...); err != nil { - code = pb.ErrorCode_ExternalModule - data = &pb.ErrorData{ - Title: code.ToString(), - Message: comm.NewExternalModuleErr("Buried", "CheckCondition", lvconf.Maintask).Error(), - } - return - } - ok = true - level.Passmaintask = condis - pitem.Passmaintask = condis - for _, v := range condis { - level.Progress += v.Value - if v.State != 2 { - ok = false - } - } - if ok { // - level.Pass = 1 - pitem.Pass = 1 - this.module.DispenseRes(session, lvconf.Award, true) - atns := make([]*pb.UserAssets, len(lvconf.Award)) - for i, v := range lvconf.Award { - atns[i] = &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - } - } - pitem.Mainaward = atns - push = true - } - - if level.Pass == 1 { - if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Subtask...); err != nil { - code = pb.ErrorCode_ExternalModule - data = &pb.ErrorData{ - Title: code.ToString(), - Message: comm.NewExternalModuleErr("Buried", "CheckCondition", lvconf.Subtask).Error(), - } - return - } - level.Passpertask = condis - pitem.Passpertask = condis - ok = true - for _, v := range condis { - level.Progress += v.Value - if v.State != 2 { - ok = false - } - } - - if ok { // - level.Pass = 2 - pitem.Pass = 2 - this.module.DispenseRes(session, lvconf.Profectaward, true) - atns := make([]*pb.UserAssets, len(lvconf.Profectaward)) - for i, v := range lvconf.Profectaward { - atns[i] = &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - } - } - pitem.Peraward = atns - push = true - } - } - - info.Level[req.Id] = level + info.Level[req.Level] = level if err = this.module.modelCombat.updateInfo(info); err != nil { code = pb.ErrorCode_DBError return } } session.SendMsg(string(this.module.GetType()), "in", &pb.CombatInResp{Level: level}) - if push { - pitem.Progress = level.Progress - session.SendMsg(string(this.module.GetType()), "progress", &pb.CombatProgressPush{Levels: []*pb.LevelProgressItem{pitem}}) - } - return } diff --git a/modules/combat/module.go b/modules/combat/module.go index f376a2b0b..8a0f7e4fe 100644 --- a/modules/combat/module.go +++ b/modules/combat/module.go @@ -80,6 +80,9 @@ func (this *Combat) GetLevels(uid string) (levels map[int32]*pb.DBCombatLevel) { //任务埋点通知 func (this *Combat) BuriedsNotify(uid string, condis []*pb.ConIProgress) { this.Debug("收到埋点中心 进度改变通知", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condis", Value: condis}) + //废弃 采用主动询问机制 + return + var ( err error session comm.IUserSession diff --git a/modules/oldtimes/api_getall.go b/modules/oldtimes/api_getall.go index 72088b8cd..23c9596fc 100644 --- a/modules/oldtimes/api_getall.go +++ b/modules/oldtimes/api_getall.go @@ -27,7 +27,7 @@ func (this *apiComp) Getall(session comm.IUserSession, req *pb.OldtimesGetallReq for _, level := range chapter.Levels { if level.Status == int32(finish) { unlockLevelIds = append(unlockLevelIds, level.Lid) - continue + // continue } conf := this.module.configure.getMaintaskCfgBy(level.Lid) if conf != nil { diff --git a/pb/combat_msg.pb.go b/pb/combat_msg.pb.go index 346c4b7bd..cf6db8b51 100644 --- a/pb/combat_msg.pb.go +++ b/pb/combat_msg.pb.go @@ -26,7 +26,7 @@ type CombatInReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //关卡id + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //关卡id } func (x *CombatInReq) Reset() { @@ -61,9 +61,9 @@ func (*CombatInReq) Descriptor() ([]byte, []int) { return file_combat_combat_msg_proto_rawDescGZIP(), []int{0} } -func (x *CombatInReq) GetId() int32 { +func (x *CombatInReq) GetLevel() int32 { if x != nil { - return x.Id + return x.Level } return 0 } @@ -116,6 +116,101 @@ func (x *CombatInResp) GetLevel() *DBCombatLevel { return nil } +//询问关卡进度 +type CombatAskReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //关卡id +} + +func (x *CombatAskReq) Reset() { + *x = CombatAskReq{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatAskReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatAskReq) ProtoMessage() {} + +func (x *CombatAskReq) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_msg_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CombatAskReq.ProtoReflect.Descriptor instead. +func (*CombatAskReq) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *CombatAskReq) GetLevel() int32 { + if x != nil { + return x.Level + } + return 0 +} + +type CombatAskResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Level *LevelProgressItem `protobuf:"bytes,1,opt,name=level,proto3" json:"level"` //关卡id +} + +func (x *CombatAskResp) Reset() { + *x = CombatAskResp{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatAskResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatAskResp) ProtoMessage() {} + +func (x *CombatAskResp) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_msg_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CombatAskResp.ProtoReflect.Descriptor instead. +func (*CombatAskResp) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *CombatAskResp) GetLevel() *LevelProgressItem { + if x != nil { + return x.Level + } + return nil +} + type CombatUpdateLevelReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -128,7 +223,7 @@ type CombatUpdateLevelReq struct { func (x *CombatUpdateLevelReq) Reset() { *x = CombatUpdateLevelReq{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[2] + mi := &file_combat_combat_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -141,7 +236,7 @@ func (x *CombatUpdateLevelReq) String() string { func (*CombatUpdateLevelReq) ProtoMessage() {} func (x *CombatUpdateLevelReq) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[2] + mi := &file_combat_combat_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -154,7 +249,7 @@ func (x *CombatUpdateLevelReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CombatUpdateLevelReq.ProtoReflect.Descriptor instead. func (*CombatUpdateLevelReq) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{2} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{4} } func (x *CombatUpdateLevelReq) GetLevel() int32 { @@ -182,7 +277,7 @@ type CombatUpdateLevelResp struct { func (x *CombatUpdateLevelResp) Reset() { *x = CombatUpdateLevelResp{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[3] + mi := &file_combat_combat_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -195,7 +290,7 @@ func (x *CombatUpdateLevelResp) String() string { func (*CombatUpdateLevelResp) ProtoMessage() {} func (x *CombatUpdateLevelResp) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[3] + mi := &file_combat_combat_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -208,7 +303,7 @@ func (x *CombatUpdateLevelResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CombatUpdateLevelResp.ProtoReflect.Descriptor instead. func (*CombatUpdateLevelResp) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{3} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{5} } func (x *CombatUpdateLevelResp) GetLevel() int32 { @@ -232,7 +327,7 @@ type CombatChallengeReq struct { func (x *CombatChallengeReq) Reset() { *x = CombatChallengeReq{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[4] + mi := &file_combat_combat_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -245,7 +340,7 @@ func (x *CombatChallengeReq) String() string { func (*CombatChallengeReq) ProtoMessage() {} func (x *CombatChallengeReq) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[4] + mi := &file_combat_combat_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -258,7 +353,7 @@ func (x *CombatChallengeReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CombatChallengeReq.ProtoReflect.Descriptor instead. func (*CombatChallengeReq) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{4} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{6} } func (x *CombatChallengeReq) GetLevel() int32 { @@ -296,7 +391,7 @@ type CombatChallengeResp struct { func (x *CombatChallengeResp) Reset() { *x = CombatChallengeResp{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[5] + mi := &file_combat_combat_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -309,7 +404,7 @@ func (x *CombatChallengeResp) String() string { func (*CombatChallengeResp) ProtoMessage() {} func (x *CombatChallengeResp) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[5] + mi := &file_combat_combat_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -322,7 +417,7 @@ func (x *CombatChallengeResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CombatChallengeResp.ProtoReflect.Descriptor instead. func (*CombatChallengeResp) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{5} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{7} } func (x *CombatChallengeResp) GetLevel() int32 { @@ -360,7 +455,7 @@ type CombatChallengeReceiveReq struct { func (x *CombatChallengeReceiveReq) Reset() { *x = CombatChallengeReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[6] + mi := &file_combat_combat_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -373,7 +468,7 @@ func (x *CombatChallengeReceiveReq) String() string { func (*CombatChallengeReceiveReq) ProtoMessage() {} func (x *CombatChallengeReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[6] + mi := &file_combat_combat_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -386,7 +481,7 @@ func (x *CombatChallengeReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CombatChallengeReceiveReq.ProtoReflect.Descriptor instead. func (*CombatChallengeReceiveReq) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{6} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{8} } func (x *CombatChallengeReceiveReq) GetLevel() int32 { @@ -424,7 +519,7 @@ type CombatChallengeReceiveResp struct { func (x *CombatChallengeReceiveResp) Reset() { *x = CombatChallengeReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[7] + mi := &file_combat_combat_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -437,7 +532,7 @@ func (x *CombatChallengeReceiveResp) String() string { func (*CombatChallengeReceiveResp) ProtoMessage() {} func (x *CombatChallengeReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[7] + mi := &file_combat_combat_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -450,7 +545,7 @@ func (x *CombatChallengeReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CombatChallengeReceiveResp.ProtoReflect.Descriptor instead. func (*CombatChallengeReceiveResp) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{7} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{9} } func (x *CombatChallengeReceiveResp) GetLevel() int32 { @@ -487,7 +582,7 @@ type CombatDropReq struct { func (x *CombatDropReq) Reset() { *x = CombatDropReq{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[8] + mi := &file_combat_combat_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -500,7 +595,7 @@ func (x *CombatDropReq) String() string { func (*CombatDropReq) ProtoMessage() {} func (x *CombatDropReq) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[8] + mi := &file_combat_combat_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -513,7 +608,7 @@ func (x *CombatDropReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CombatDropReq.ProtoReflect.Descriptor instead. func (*CombatDropReq) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{8} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{10} } func (x *CombatDropReq) GetLevel() int32 { @@ -543,7 +638,7 @@ type CombatDropResp struct { func (x *CombatDropResp) Reset() { *x = CombatDropResp{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[9] + mi := &file_combat_combat_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -556,7 +651,7 @@ func (x *CombatDropResp) String() string { func (*CombatDropResp) ProtoMessage() {} func (x *CombatDropResp) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[9] + mi := &file_combat_combat_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -569,7 +664,7 @@ func (x *CombatDropResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CombatDropResp.ProtoReflect.Descriptor instead. func (*CombatDropResp) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{9} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{11} } func (x *CombatDropResp) GetLevel() int32 { @@ -604,7 +699,7 @@ type LevelProgressItem struct { func (x *LevelProgressItem) Reset() { *x = LevelProgressItem{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[10] + mi := &file_combat_combat_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -617,7 +712,7 @@ func (x *LevelProgressItem) String() string { func (*LevelProgressItem) ProtoMessage() {} func (x *LevelProgressItem) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[10] + mi := &file_combat_combat_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -630,7 +725,7 @@ func (x *LevelProgressItem) ProtoReflect() protoreflect.Message { // Deprecated: Use LevelProgressItem.ProtoReflect.Descriptor instead. func (*LevelProgressItem) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{10} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{12} } func (x *LevelProgressItem) GetLevel() int32 { @@ -694,7 +789,7 @@ type CombatProgressPush struct { func (x *CombatProgressPush) Reset() { *x = CombatProgressPush{} if protoimpl.UnsafeEnabled { - mi := &file_combat_combat_msg_proto_msgTypes[11] + mi := &file_combat_combat_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -707,7 +802,7 @@ func (x *CombatProgressPush) String() string { func (*CombatProgressPush) ProtoMessage() {} func (x *CombatProgressPush) ProtoReflect() protoreflect.Message { - mi := &file_combat_combat_msg_proto_msgTypes[11] + mi := &file_combat_combat_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -720,7 +815,7 @@ func (x *CombatProgressPush) ProtoReflect() protoreflect.Message { // Deprecated: Use CombatProgressPush.ProtoReflect.Descriptor instead. func (*CombatProgressPush) Descriptor() ([]byte, []int) { - return file_combat_combat_msg_proto_rawDescGZIP(), []int{11} + return file_combat_combat_msg_proto_rawDescGZIP(), []int{13} } func (x *CombatProgressPush) GetLevels() []*LevelProgressItem { @@ -739,84 +834,90 @@ var file_combat_combat_msg_proto_rawDesc = []byte{ 0x6d, 0x62, 0x61, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x1d, - 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x34, 0x0a, - 0x0c, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, - 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, - 0x42, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x05, 0x6c, 0x65, - 0x76, 0x65, 0x6c, 0x22, 0x9a, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, - 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, - 0x65, 0x6c, 0x12, 0x33, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1f, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, - 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, - 0x22, 0x2d, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, + 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x23, + 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, + 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, + 0x76, 0x65, 0x6c, 0x22, 0x34, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x4c, 0x65, 0x76, + 0x65, 0x6c, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x24, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, + 0x62, 0x61, 0x74, 0x41, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, - 0x6e, 0x0a, 0x12, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, - 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, - 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, - 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, - 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, - 0x66, 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, - 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, - 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, - 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x72, 0x0a, 0x19, 0x43, 0x6f, 0x6d, 0x62, 0x61, - 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, - 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, - 0x73, 0x74, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x6d, 0x0a, 0x1a, 0x43, - 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, - 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, - 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, - 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, - 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, - 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, + 0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x41, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x28, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x12, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49, + 0x74, 0x65, 0x6d, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x9a, 0x01, 0x0a, 0x14, 0x43, + 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, + 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x33, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x2e, 0x44, + 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x37, + 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2d, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x62, 0x61, + 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x6e, 0x0a, 0x12, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, + 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, + 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x06, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x66, 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, + 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, + 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, + 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, + 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x72, + 0x0a, 0x19, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, + 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, - 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x72, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x64, 0x72, 0x6f, 0x70, 0x22, 0x47, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, - 0x72, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, - 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, - 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x22, 0x91, - 0x02, 0x0a, 0x11, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, - 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61, - 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, - 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x2f, 0x0a, - 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, - 0x73, 0x52, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1a, - 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, - 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x29, - 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x09, - 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x27, 0x0a, 0x08, 0x70, 0x65, 0x72, - 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, - 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61, - 0x72, 0x64, 0x22, 0x40, 0x0a, 0x12, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x50, 0x72, 0x6f, 0x67, - 0x72, 0x65, 0x73, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2a, 0x0a, 0x06, 0x6c, 0x65, 0x76, 0x65, - 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, - 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x06, 0x6c, 0x65, - 0x76, 0x65, 0x6c, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x06, 0x72, + 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, + 0x72, 0x74, 0x22, 0x6d, 0x0a, 0x1a, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, + 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, + 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, + 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, 0x6e, + 0x73, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, + 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x72, 0x6f, 0x70, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x72, 0x6f, 0x70, 0x22, 0x47, 0x0a, 0x0e, + 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, + 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, + 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, + 0x04, 0x61, 0x74, 0x6e, 0x73, 0x22, 0x91, 0x02, 0x0a, 0x11, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, + 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x6c, + 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, + 0x6c, 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x73, + 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, + 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, + 0x74, 0x61, 0x73, 0x6b, 0x12, 0x2f, 0x0a, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, + 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, + 0x72, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, + 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, + 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x29, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, + 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, + 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x12, 0x27, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, + 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x40, 0x0a, 0x12, 0x43, 0x6f, 0x6d, + 0x62, 0x61, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, + 0x2a, 0x0a, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x12, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49, + 0x74, 0x65, 0x6d, 0x52, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -831,46 +932,49 @@ func file_combat_combat_msg_proto_rawDescGZIP() []byte { return file_combat_combat_msg_proto_rawDescData } -var file_combat_combat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13) +var file_combat_combat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_combat_combat_msg_proto_goTypes = []interface{}{ (*CombatInReq)(nil), // 0: CombatInReq (*CombatInResp)(nil), // 1: CombatInResp - (*CombatUpdateLevelReq)(nil), // 2: CombatUpdateLevelReq - (*CombatUpdateLevelResp)(nil), // 3: CombatUpdateLevelResp - (*CombatChallengeReq)(nil), // 4: CombatChallengeReq - (*CombatChallengeResp)(nil), // 5: CombatChallengeResp - (*CombatChallengeReceiveReq)(nil), // 6: CombatChallengeReceiveReq - (*CombatChallengeReceiveResp)(nil), // 7: CombatChallengeReceiveResp - (*CombatDropReq)(nil), // 8: CombatDropReq - (*CombatDropResp)(nil), // 9: CombatDropResp - (*LevelProgressItem)(nil), // 10: LevelProgressItem - (*CombatProgressPush)(nil), // 11: CombatProgressPush - nil, // 12: CombatUpdateLevelReq.DataEntry - (*DBCombatLevel)(nil), // 13: DBCombatLevel - (*BattleFormation)(nil), // 14: BattleFormation - (*BattleInfo)(nil), // 15: BattleInfo - (*BattleReport)(nil), // 16: BattleReport - (*UserAssets)(nil), // 17: UserAssets - (*ConIProgress)(nil), // 18: ConIProgress + (*CombatAskReq)(nil), // 2: CombatAskReq + (*CombatAskResp)(nil), // 3: CombatAskResp + (*CombatUpdateLevelReq)(nil), // 4: CombatUpdateLevelReq + (*CombatUpdateLevelResp)(nil), // 5: CombatUpdateLevelResp + (*CombatChallengeReq)(nil), // 6: CombatChallengeReq + (*CombatChallengeResp)(nil), // 7: CombatChallengeResp + (*CombatChallengeReceiveReq)(nil), // 8: CombatChallengeReceiveReq + (*CombatChallengeReceiveResp)(nil), // 9: CombatChallengeReceiveResp + (*CombatDropReq)(nil), // 10: CombatDropReq + (*CombatDropResp)(nil), // 11: CombatDropResp + (*LevelProgressItem)(nil), // 12: LevelProgressItem + (*CombatProgressPush)(nil), // 13: CombatProgressPush + nil, // 14: CombatUpdateLevelReq.DataEntry + (*DBCombatLevel)(nil), // 15: DBCombatLevel + (*BattleFormation)(nil), // 16: BattleFormation + (*BattleInfo)(nil), // 17: BattleInfo + (*BattleReport)(nil), // 18: BattleReport + (*UserAssets)(nil), // 19: UserAssets + (*ConIProgress)(nil), // 20: ConIProgress } var file_combat_combat_msg_proto_depIdxs = []int32{ - 13, // 0: CombatInResp.level:type_name -> DBCombatLevel - 12, // 1: CombatUpdateLevelReq.data:type_name -> CombatUpdateLevelReq.DataEntry - 14, // 2: CombatChallengeReq.battle:type_name -> BattleFormation - 15, // 3: CombatChallengeResp.info:type_name -> BattleInfo - 16, // 4: CombatChallengeReceiveReq.report:type_name -> BattleReport - 17, // 5: CombatChallengeReceiveResp.atns:type_name -> UserAssets - 17, // 6: CombatDropResp.atns:type_name -> UserAssets - 18, // 7: LevelProgressItem.passmaintask:type_name -> ConIProgress - 18, // 8: LevelProgressItem.passpertask:type_name -> ConIProgress - 17, // 9: LevelProgressItem.mainaward:type_name -> UserAssets - 17, // 10: LevelProgressItem.peraward:type_name -> UserAssets - 10, // 11: CombatProgressPush.levels:type_name -> LevelProgressItem - 12, // [12:12] is the sub-list for method output_type - 12, // [12:12] is the sub-list for method input_type - 12, // [12:12] is the sub-list for extension type_name - 12, // [12:12] is the sub-list for extension extendee - 0, // [0:12] is the sub-list for field type_name + 15, // 0: CombatInResp.level:type_name -> DBCombatLevel + 12, // 1: CombatAskResp.level:type_name -> LevelProgressItem + 14, // 2: CombatUpdateLevelReq.data:type_name -> CombatUpdateLevelReq.DataEntry + 16, // 3: CombatChallengeReq.battle:type_name -> BattleFormation + 17, // 4: CombatChallengeResp.info:type_name -> BattleInfo + 18, // 5: CombatChallengeReceiveReq.report:type_name -> BattleReport + 19, // 6: CombatChallengeReceiveResp.atns:type_name -> UserAssets + 19, // 7: CombatDropResp.atns:type_name -> UserAssets + 20, // 8: LevelProgressItem.passmaintask:type_name -> ConIProgress + 20, // 9: LevelProgressItem.passpertask:type_name -> ConIProgress + 19, // 10: LevelProgressItem.mainaward:type_name -> UserAssets + 19, // 11: LevelProgressItem.peraward:type_name -> UserAssets + 12, // 12: CombatProgressPush.levels:type_name -> LevelProgressItem + 13, // [13:13] is the sub-list for method output_type + 13, // [13:13] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name } func init() { file_combat_combat_msg_proto_init() } @@ -908,7 +1012,7 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CombatUpdateLevelReq); i { + switch v := v.(*CombatAskReq); i { case 0: return &v.state case 1: @@ -920,7 +1024,7 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CombatUpdateLevelResp); i { + switch v := v.(*CombatAskResp); i { case 0: return &v.state case 1: @@ -932,7 +1036,7 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CombatChallengeReq); i { + switch v := v.(*CombatUpdateLevelReq); i { case 0: return &v.state case 1: @@ -944,7 +1048,7 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CombatChallengeResp); i { + switch v := v.(*CombatUpdateLevelResp); i { case 0: return &v.state case 1: @@ -956,7 +1060,7 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CombatChallengeReceiveReq); i { + switch v := v.(*CombatChallengeReq); i { case 0: return &v.state case 1: @@ -968,7 +1072,7 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CombatChallengeReceiveResp); i { + switch v := v.(*CombatChallengeResp); i { case 0: return &v.state case 1: @@ -980,7 +1084,7 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CombatDropReq); i { + switch v := v.(*CombatChallengeReceiveReq); i { case 0: return &v.state case 1: @@ -992,7 +1096,7 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CombatDropResp); i { + switch v := v.(*CombatChallengeReceiveResp); i { case 0: return &v.state case 1: @@ -1004,7 +1108,7 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LevelProgressItem); i { + switch v := v.(*CombatDropReq); i { case 0: return &v.state case 1: @@ -1016,6 +1120,30 @@ func file_combat_combat_msg_proto_init() { } } file_combat_combat_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CombatDropResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_combat_combat_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LevelProgressItem); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_combat_combat_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CombatProgressPush); i { case 0: return &v.state @@ -1034,7 +1162,7 @@ func file_combat_combat_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_combat_combat_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 13, + NumMessages: 15, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.BuriedCondiData.go b/sys/configure/structs/Game.BuriedCondiData.go index 23c1d26e4..d5de44842 100644 --- a/sys/configure/structs/Game.BuriedCondiData.go +++ b/sys/configure/structs/Game.BuriedCondiData.go @@ -13,7 +13,7 @@ import "errors" type GameBuriedCondiData struct { Id int32 Rtype int32 - Lock int32 + Ctype int32 Notify []string TypeSp int32 Tasktxt string @@ -33,7 +33,7 @@ func (*GameBuriedCondiData) GetTypeId() int32 { func (_v *GameBuriedCondiData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rtype"].(float64); !_ok_ { err = errors.New("rtype error"); return }; _v.Rtype = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock"].(float64); !_ok_ { err = errors.New("lock error"); return }; _v.Lock = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ctype"].(float64); !_ok_ { err = errors.New("ctype error"); return }; _v.Ctype = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.CombatLevelData.go b/sys/configure/structs/Game.CombatLevelData.go index f76c55713..31708dbd3 100644 --- a/sys/configure/structs/Game.CombatLevelData.go +++ b/sys/configure/structs/Game.CombatLevelData.go @@ -18,7 +18,7 @@ type GameCombatLevelData struct { Subtask []int32 Award []*Gameatn Profectaward []*Gameatn - Debrisitemid string + Debrisitemid int32 Scenemusic string Atmosphere string } @@ -89,7 +89,7 @@ func (_v *GameCombatLevelData)Deserialize(_buf map[string]interface{}) (err erro } } - { var _ok_ bool; if _v.Debrisitemid, _ok_ = _buf["debrisitemid"].(string); !_ok_ { err = errors.New("debrisitemid error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["debrisitemid"].(float64); !_ok_ { err = errors.New("debrisitemid error"); return }; _v.Debrisitemid = int32(_tempNum_) } { var _ok_ bool; if _v.Scenemusic, _ok_ = _buf["scenemusic"].(string); !_ok_ { err = errors.New("scenemusic error"); return } } { var _ok_ bool; if _v.Atmosphere, _ok_ = _buf["atmosphere"].(string); !_ok_ { err = errors.New("atmosphere error"); return } } return diff --git a/sys/configure/structs/Game.PlayerInfor_overviewData.go b/sys/configure/structs/Game.PlayerInfor_overviewData.go index c910a29d2..9714926c0 100644 --- a/sys/configure/structs/Game.PlayerInfor_overviewData.go +++ b/sys/configure/structs/Game.PlayerInfor_overviewData.go @@ -13,7 +13,8 @@ import "errors" type GamePlayerInfor_overviewData struct { Id string Type int32 - Icon string + Micon string + Wicon string Tujing []int32 Murl string Wurl string @@ -31,7 +32,8 @@ func (*GamePlayerInfor_overviewData) GetTypeId() int32 { func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } - { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { var _ok_ bool; if _v.Micon, _ok_ = _buf["micon"].(string); !_ok_ { err = errors.New("micon error"); return } } + { var _ok_ bool; if _v.Wicon, _ok_ = _buf["wicon"].(string); !_ok_ { err = errors.New("wicon error"); return } } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.RuleDescData.go b/sys/configure/structs/Game.RuleDescData.go index ec3dc718f..cc7222190 100644 --- a/sys/configure/structs/Game.RuleDescData.go +++ b/sys/configure/structs/Game.RuleDescData.go @@ -24,8 +24,8 @@ func (*GameRuleDescData) GetTypeId() int32 { func (_v *GameRuleDescData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } - { var _ok_ bool; if _v.Title, _ok_ = _buf["title"].(string); !_ok_ { err = errors.New("title error"); return } } - { var _ok_ bool; if _v.Content, _ok_ = _buf["content"].(string); !_ok_ { err = errors.New("content error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["content"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Content error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Content, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } diff --git a/sys/configure/structs/game.heroAwakenData.go b/sys/configure/structs/game.heroAwakenData.go index bf3c695a2..56c328231 100644 --- a/sys/configure/structs/game.heroAwakenData.go +++ b/sys/configure/structs/game.heroAwakenData.go @@ -14,6 +14,7 @@ type GameHeroAwakenData struct { Key int32 Hid string Phase int32 + Name string Phasebonus []string Icon string Condition int32 @@ -31,6 +32,7 @@ func (_v *GameHeroAwakenData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["phase"].(float64); !_ok_ { err = errors.New("phase error"); return }; _v.Phase = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} var _ok_ bool diff --git a/utils/time.go b/utils/time.go index 7e006e087..e06c19155 100644 --- a/utils/time.go +++ b/utils/time.go @@ -16,6 +16,19 @@ func IsToday(d int64) bool { return tt.Year() == now.Year() && tt.Month() == now.Month() && tt.Day() == now.Day() } +// 判断是否是出于同一周 +func IsSameWeek(d int64) bool { + // 将时间戳转换成一个 time.Time 对象 + t1 := time.Unix(d, 0) + t2 := configure.Now() + + // 获取 t1 所在的周的第一天和 t2 所在的周的第一天 + t1FirstDay := t1.AddDate(0, 0, -int(t1.Weekday())+1) + t2FirstDay := t2.AddDate(0, 0, -int(t2.Weekday())+1) + // 判断两个时间所在的周的第一天是否相同 + return t1FirstDay.Equal(t2FirstDay) +} + //判断是否大于1周 func IsAfterWeek(d int64) bool { tt := time.Unix(d, 0)