From 4c765eab8e349417669edccef41a51d9d1b8fca8 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 1 Jun 2023 16:27:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9F=8B=E7=82=B9=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 1504 ++++++++--------- modules/buried/core.go | 10 +- modules/buried/module.go | 38 +- modules/combat/api_ask.go | 129 ++ modules/combat/api_in.go | 103 +- modules/combat/module.go | 3 + pb/combat_msg.pb.go | 436 +++-- sys/configure/structs/Game.BuriedCondiData.go | 4 +- utils/time.go | 13 + 9 files changed, 1233 insertions(+), 1007 deletions(-) create mode 100644 modules/combat/api_ask.go 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/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..9f90b2313 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" ) @@ -331,6 +333,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 +388,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..716c1f049 --- /dev/null +++ b/modules/combat/api_ask.go @@ -0,0 +1,129 @@ +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, + 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 + 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 + } + + 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 + } + 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 + } + } + + 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()), "progress", &pb.CombatAskResp{Level: pitem}) + return +} diff --git a/modules/combat/api_in.go b/modules/combat/api_in.go index 947a6ddf4..8f3a08548 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,22 @@ 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/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/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)