diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 40018f1b3..0ad4701b5 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -1,7 +1,10 @@ [ { "id": 101, + "type_sp": 0, + "tasktxt": "", "type": 1, + "valid": 0, "data1": 1, "data2": 25001, "data3": 0, @@ -10,7 +13,10 @@ }, { "id": 102, + "type_sp": 0, + "tasktxt": "", "type": 2, + "valid": 0, "data1": 1, "data2": 3, "data3": 0, @@ -19,7 +25,10 @@ }, { "id": 103, + "type_sp": 0, + "tasktxt": "", "type": 3, + "valid": 0, "data1": 1, "data2": 2, "data3": 0, @@ -28,7 +37,10 @@ }, { "id": 104, + "type_sp": 0, + "tasktxt": "", "type": 4, + "valid": 0, "data1": 10, "data2": 14007, "data3": 0, @@ -37,7 +49,10 @@ }, { "id": 105, + "type_sp": 0, + "tasktxt": "", "type": 5, + "valid": 0, "data1": 2, "data2": 25001, "data3": 0, @@ -46,7 +61,10 @@ }, { "id": 106, + "type_sp": 0, + "tasktxt": "", "type": 6, + "valid": 0, "data1": 5, "data2": 25004, "data3": 0, @@ -55,7 +73,10 @@ }, { "id": 107, + "type_sp": 0, + "tasktxt": "", "type": 7, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -64,7 +85,10 @@ }, { "id": 108, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -73,7 +97,10 @@ }, { "id": 109, + "type_sp": 0, + "tasktxt": "", "type": 9, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -82,7 +109,10 @@ }, { "id": 110, + "type_sp": 0, + "tasktxt": "", "type": 10, + "valid": 0, "data1": 2, "data2": 0, "data3": 0, @@ -91,7 +121,10 @@ }, { "id": 111, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -100,7 +133,10 @@ }, { "id": 112, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -109,7 +145,10 @@ }, { "id": 113, + "type_sp": 0, + "tasktxt": "", "type": 13, + "valid": 0, "data1": 2, "data2": 0, "data3": 0, @@ -118,7 +157,10 @@ }, { "id": 114, + "type_sp": 0, + "tasktxt": "", "type": 14, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -127,7 +169,10 @@ }, { "id": 115, + "type_sp": 0, + "tasktxt": "", "type": 15, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -136,7 +181,10 @@ }, { "id": 116, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 5, "data2": 3, "data3": 0, @@ -145,7 +193,10 @@ }, { "id": 117, + "type_sp": 0, + "tasktxt": "", "type": 17, + "valid": 0, "data1": 1, "data2": 3, "data3": 0, @@ -154,7 +205,10 @@ }, { "id": 118, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -163,7 +217,10 @@ }, { "id": 119, + "type_sp": 0, + "tasktxt": "", "type": 19, + "valid": 0, "data1": 2, "data2": 0, "data3": 0, @@ -172,7 +229,10 @@ }, { "id": 120, + "type_sp": 0, + "tasktxt": "", "type": 20, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -181,7 +241,10 @@ }, { "id": 121, + "type_sp": 0, + "tasktxt": "", "type": 21, + "valid": 0, "data1": 2, "data2": 0, "data3": 0, @@ -190,7 +253,10 @@ }, { "id": 122, + "type_sp": 0, + "tasktxt": "", "type": 22, + "valid": 0, "data1": 25001, "data2": 0, "data3": 0, @@ -199,7 +265,10 @@ }, { "id": 123, + "type_sp": 0, + "tasktxt": "", "type": 23, + "valid": 0, "data1": 3, "data2": 5, "data3": 20, @@ -208,7 +277,10 @@ }, { "id": 124, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 4, "data2": 0, "data3": 0, @@ -217,7 +289,10 @@ }, { "id": 125, + "type_sp": 0, + "tasktxt": "", "type": 25, + "valid": 0, "data1": 3, "data2": 25001, "data3": 6, @@ -226,7 +301,10 @@ }, { "id": 126, + "type_sp": 0, + "tasktxt": "", "type": 26, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -235,7 +313,10 @@ }, { "id": 127, + "type_sp": 0, + "tasktxt": "", "type": 27, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -244,7 +325,10 @@ }, { "id": 128, + "type_sp": 0, + "tasktxt": "", "type": 28, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -253,7 +337,10 @@ }, { "id": 129, + "type_sp": 0, + "tasktxt": "", "type": 29, + "valid": 0, "data1": 2, "data2": 22, "data3": 25004, @@ -262,7 +349,10 @@ }, { "id": 130, + "type_sp": 0, + "tasktxt": "", "type": 30, + "valid": 0, "data1": 5, "data2": 3, "data3": 0, @@ -271,7 +361,10 @@ }, { "id": 131, + "type_sp": 0, + "tasktxt": "", "type": 31, + "valid": 0, "data1": 4, "data2": 3, "data3": 0, @@ -280,7 +373,10 @@ }, { "id": 132, + "type_sp": 0, + "tasktxt": "", "type": 32, + "valid": 0, "data1": 3, "data2": 3, "data3": 20, @@ -289,7 +385,10 @@ }, { "id": 133, + "type_sp": 0, + "tasktxt": "", "type": 33, + "valid": 0, "data1": 3, "data2": 3, "data3": 23, @@ -298,7 +397,10 @@ }, { "id": 134, + "type_sp": 0, + "tasktxt": "", "type": 34, + "valid": 0, "data1": 5, "data2": 2, "data3": 0, @@ -307,7 +409,10 @@ }, { "id": 135, + "type_sp": 0, + "tasktxt": "", "type": 35, + "valid": 0, "data1": 2, "data2": 25001, "data3": 0, @@ -316,7 +421,10 @@ }, { "id": 136, + "type_sp": 0, + "tasktxt": "", "type": 36, + "valid": 0, "data1": 1, "data2": 3, "data3": 3, @@ -325,7 +433,10 @@ }, { "id": 137, + "type_sp": 0, + "tasktxt": "", "type": 37, + "valid": 0, "data1": 1, "data2": 3, "data3": 0, @@ -334,7 +445,10 @@ }, { "id": 138, + "type_sp": 0, + "tasktxt": "", "type": 38, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -343,7 +457,10 @@ }, { "id": 139, + "type_sp": 0, + "tasktxt": "", "type": 39, + "valid": 0, "data1": 2, "data2": 0, "data3": 0, @@ -352,7 +469,10 @@ }, { "id": 140, + "type_sp": 0, + "tasktxt": "", "type": 40, + "valid": 0, "data1": 2, "data2": 2, "data3": 0, @@ -361,7 +481,10 @@ }, { "id": 141, + "type_sp": 0, + "tasktxt": "", "type": 41, + "valid": 0, "data1": 2, "data2": 2, "data3": 1, @@ -370,7 +493,10 @@ }, { "id": 142, + "type_sp": 0, + "tasktxt": "", "type": 42, + "valid": 0, "data1": 2, "data2": 2, "data3": 2, @@ -379,7 +505,10 @@ }, { "id": 143, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 2, "data2": 2, "data3": 0, @@ -388,7 +517,10 @@ }, { "id": 144, + "type_sp": 0, + "tasktxt": "", "type": 44, + "valid": 0, "data1": 3, "data2": 0, "data3": 0, @@ -397,7 +529,10 @@ }, { "id": 145, + "type_sp": 0, + "tasktxt": "", "type": 45, + "valid": 0, "data1": 2, "data2": 1, "data3": 1, @@ -406,7 +541,10 @@ }, { "id": 146, + "type_sp": 0, + "tasktxt": "", "type": 46, + "valid": 0, "data1": 1, "data2": 4, "data3": 1, @@ -415,7 +553,10 @@ }, { "id": 147, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 2, "data2": 0, "data3": 0, @@ -424,7 +565,10 @@ }, { "id": 148, + "type_sp": 0, + "tasktxt": "", "type": 48, + "valid": 0, "data1": 1, "data2": 1, "data3": 2, @@ -433,7 +577,10 @@ }, { "id": 149, + "type_sp": 0, + "tasktxt": "", "type": 49, + "valid": 0, "data1": 1, "data2": 1, "data3": 2, @@ -442,7 +589,10 @@ }, { "id": 150, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 1, "data2": 1, "data3": 0, @@ -451,7 +601,10 @@ }, { "id": 151, + "type_sp": 0, + "tasktxt": "", "type": 51, + "valid": 0, "data1": 1, "data2": 1, "data3": 0, @@ -460,7 +613,10 @@ }, { "id": 152, + "type_sp": 0, + "tasktxt": "", "type": 52, + "valid": 0, "data1": 1, "data2": 14007, "data3": 0, @@ -469,7 +625,10 @@ }, { "id": 153, + "type_sp": 0, + "tasktxt": "", "type": 53, + "valid": 0, "data1": 2, "data2": 0, "data3": 0, @@ -478,7 +637,10 @@ }, { "id": 154, + "type_sp": 0, + "tasktxt": "", "type": 54, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -487,7 +649,10 @@ }, { "id": 155, + "type_sp": 0, + "tasktxt": "", "type": 55, + "valid": 0, "data1": 2, "data2": 3, "data3": 0, @@ -496,7 +661,10 @@ }, { "id": 156, + "type_sp": 0, + "tasktxt": "", "type": 56, + "valid": 0, "data1": 1, "data2": 1, "data3": 2, @@ -505,7 +673,10 @@ }, { "id": 157, + "type_sp": 0, + "tasktxt": "", "type": 57, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -514,7 +685,10 @@ }, { "id": 158, + "type_sp": 0, + "tasktxt": "", "type": 58, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -523,7 +697,10 @@ }, { "id": 159, + "type_sp": 0, + "tasktxt": "", "type": 59, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -532,7 +709,10 @@ }, { "id": 160, + "type_sp": 0, + "tasktxt": "", "type": 60, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -541,7 +721,10 @@ }, { "id": 161, + "type_sp": 0, + "tasktxt": "", "type": 61, + "valid": 0, "data1": 109, "data2": 0, "data3": 0, @@ -550,7 +733,10 @@ }, { "id": 162, + "type_sp": 0, + "tasktxt": "", "type": 62, + "valid": 0, "data1": 2, "data2": 0, "data3": 0, @@ -559,7 +745,10 @@ }, { "id": 163, + "type_sp": 0, + "tasktxt": "", "type": 63, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -568,7 +757,10 @@ }, { "id": 164, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 2, "data2": 0, "data3": 0, @@ -577,7 +769,10 @@ }, { "id": 165, + "type_sp": 0, + "tasktxt": "", "type": 65, + "valid": 0, "data1": 2, "data2": 10001, "data3": 0, @@ -586,7 +781,10 @@ }, { "id": 166, + "type_sp": 0, + "tasktxt": "", "type": 66, + "valid": 0, "data1": 2, "data2": 1, "data3": 0, @@ -595,7 +793,10 @@ }, { "id": 167, + "type_sp": 0, + "tasktxt": "", "type": 67, + "valid": 0, "data1": 1000, "data2": 1, "data3": 0, @@ -604,7 +805,10 @@ }, { "id": 168, + "type_sp": 0, + "tasktxt": "", "type": 68, + "valid": 0, "data1": 1000, "data2": 1, "data3": 0, @@ -613,7 +817,10 @@ }, { "id": 169, + "type_sp": 0, + "tasktxt": "", "type": 69, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -622,7 +829,10 @@ }, { "id": 170, + "type_sp": 0, + "tasktxt": "", "type": 1, + "valid": 0, "data1": 1, "data2": 44006, "data3": 0, @@ -631,7 +841,10 @@ }, { "id": 171, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 101, "data3": 0, @@ -640,7 +853,10 @@ }, { "id": 172, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -649,7 +865,10 @@ }, { "id": 173, + "type_sp": 0, + "tasktxt": "", "type": 72, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -658,7 +877,10 @@ }, { "id": 174, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 101, "data3": 0, @@ -667,7 +889,10 @@ }, { "id": 175, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 102, "data3": 0, @@ -676,7 +901,10 @@ }, { "id": 176, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 103, "data3": 0, @@ -685,7 +913,10 @@ }, { "id": 177, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 104, "data3": 0, @@ -694,7 +925,10 @@ }, { "id": 178, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 105, "data3": 0, @@ -703,7 +937,10 @@ }, { "id": 179, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 106, "data3": 0, @@ -712,7 +949,10 @@ }, { "id": 180, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 107, "data3": 0, @@ -721,7 +961,10 @@ }, { "id": 181, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 108, "data3": 0, @@ -730,7 +973,10 @@ }, { "id": 182, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 109, "data3": 0, @@ -739,7 +985,10 @@ }, { "id": 183, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10001, "data3": 0, @@ -748,7 +997,10 @@ }, { "id": 184, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10002, "data3": 0, @@ -757,7 +1009,10 @@ }, { "id": 185, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10003, "data3": 0, @@ -766,7 +1021,10 @@ }, { "id": 186, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10004, "data3": 0, @@ -775,7 +1033,10 @@ }, { "id": 187, + "type_sp": 0, + "tasktxt": "", "type": 109, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -784,7 +1045,10 @@ }, { "id": 188, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -793,7 +1057,10 @@ }, { "id": 189, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 110, "data3": 0, @@ -802,7 +1069,10 @@ }, { "id": 190, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 111, "data3": 1, @@ -811,7 +1081,10 @@ }, { "id": 191, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 112, "data3": 2, @@ -820,7 +1093,10 @@ }, { "id": 192, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 113, "data3": 3, @@ -829,7 +1105,10 @@ }, { "id": 193, + "type_sp": 0, + "tasktxt": "", "type": 70, + "valid": 0, "data1": 1, "data2": 114, "data3": 4, @@ -838,7 +1117,10 @@ }, { "id": 195, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10005, "data3": 0, @@ -847,7 +1129,10 @@ }, { "id": 196, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10006, "data3": 0, @@ -856,7 +1141,10 @@ }, { "id": 197, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10007, "data3": 0, @@ -865,7 +1153,10 @@ }, { "id": 198, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10008, "data3": 0, @@ -874,7 +1165,10 @@ }, { "id": 199, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10009, "data3": 0, @@ -883,7 +1177,10 @@ }, { "id": 200, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10010, "data3": 0, @@ -892,7 +1189,10 @@ }, { "id": 201, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10007, "data3": 0, @@ -901,7 +1201,10 @@ }, { "id": 202, + "type_sp": 0, + "tasktxt": "", "type": 140, + "valid": 0, "data1": 1, "data2": 10007, "data3": 0, @@ -910,16 +1213,22 @@ }, { "id": 301, + "type_sp": 1, + "tasktxt": "通关主线章节1-1", "type": 61, + "valid": 0, "data1": 1100101, "data2": 0, "data3": 0, "data4": 0, - "data5": 0 + "data5": 29 }, { "id": 302, + "type_sp": 0, + "tasktxt": "", "type": 61, + "valid": 0, "data1": 104, "data2": 0, "data3": 0, @@ -928,7 +1237,10 @@ }, { "id": 303, + "type_sp": 0, + "tasktxt": "", "type": 61, + "valid": 0, "data1": 108, "data2": 0, "data3": 0, @@ -937,7 +1249,10 @@ }, { "id": 10001, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -946,7 +1261,10 @@ }, { "id": 10002, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -955,7 +1273,10 @@ }, { "id": 10003, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -964,7 +1285,10 @@ }, { "id": 10004, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -973,7 +1297,10 @@ }, { "id": 10005, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -982,7 +1309,10 @@ }, { "id": 10006, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -991,7 +1321,10 @@ }, { "id": 10007, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 200, "data2": 0, "data3": 0, @@ -1000,7 +1333,10 @@ }, { "id": 10008, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -1009,7 +1345,10 @@ }, { "id": 10009, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -1018,7 +1357,10 @@ }, { "id": 10010, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -1027,7 +1369,10 @@ }, { "id": 10101, + "type_sp": 0, + "tasktxt": "", "type": 7, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1036,7 +1381,10 @@ }, { "id": 10201, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1045,7 +1393,10 @@ }, { "id": 10202, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -1054,7 +1405,10 @@ }, { "id": 10203, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -1063,7 +1417,10 @@ }, { "id": 10204, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -1072,7 +1429,10 @@ }, { "id": 10205, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -1081,7 +1441,10 @@ }, { "id": 10206, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -1090,7 +1453,10 @@ }, { "id": 10207, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 200, "data2": 0, "data3": 0, @@ -1099,7 +1465,10 @@ }, { "id": 10208, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -1108,7 +1477,10 @@ }, { "id": 10209, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -1117,7 +1489,10 @@ }, { "id": 10210, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -1126,7 +1501,10 @@ }, { "id": 10301, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 1, "data2": 5, "data3": 0, @@ -1135,7 +1513,10 @@ }, { "id": 10302, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 5, "data2": 5, "data3": 0, @@ -1144,7 +1525,10 @@ }, { "id": 10303, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 10, "data2": 5, "data3": 0, @@ -1153,7 +1537,10 @@ }, { "id": 10304, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 20, "data2": 5, "data3": 0, @@ -1162,7 +1549,10 @@ }, { "id": 10305, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 50, "data2": 5, "data3": 0, @@ -1171,7 +1561,10 @@ }, { "id": 10306, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 100, "data2": 5, "data3": 0, @@ -1180,7 +1573,10 @@ }, { "id": 10307, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 200, "data2": 5, "data3": 0, @@ -1189,7 +1585,10 @@ }, { "id": 10308, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 300, "data2": 5, "data3": 0, @@ -1198,7 +1597,10 @@ }, { "id": 10309, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 500, "data2": 5, "data3": 0, @@ -1207,7 +1609,10 @@ }, { "id": 10310, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 1000, "data2": 5, "data3": 0, @@ -1216,7 +1621,10 @@ }, { "id": 10401, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 1, "data2": 6, "data3": 0, @@ -1225,7 +1633,10 @@ }, { "id": 10402, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 5, "data2": 6, "data3": 0, @@ -1234,7 +1645,10 @@ }, { "id": 10403, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 10, "data2": 6, "data3": 0, @@ -1243,7 +1657,10 @@ }, { "id": 10404, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 20, "data2": 6, "data3": 0, @@ -1252,7 +1669,10 @@ }, { "id": 10405, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 50, "data2": 6, "data3": 0, @@ -1261,7 +1681,10 @@ }, { "id": 10406, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 100, "data2": 6, "data3": 0, @@ -1270,7 +1693,10 @@ }, { "id": 10407, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 200, "data2": 6, "data3": 0, @@ -1279,7 +1705,10 @@ }, { "id": 10408, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 300, "data2": 6, "data3": 0, @@ -1288,7 +1717,10 @@ }, { "id": 10409, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 500, "data2": 6, "data3": 0, @@ -1297,7 +1729,10 @@ }, { "id": 10410, + "type_sp": 0, + "tasktxt": "", "type": 50, + "valid": 0, "data1": 1000, "data2": 6, "data3": 0, @@ -1306,7 +1741,10 @@ }, { "id": 10501, + "type_sp": 0, + "tasktxt": "", "type": 58, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1315,7 +1753,10 @@ }, { "id": 10502, + "type_sp": 0, + "tasktxt": "", "type": 58, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -1324,7 +1765,10 @@ }, { "id": 10503, + "type_sp": 0, + "tasktxt": "", "type": 58, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -1333,7 +1777,10 @@ }, { "id": 10504, + "type_sp": 0, + "tasktxt": "", "type": 58, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -1342,7 +1789,10 @@ }, { "id": 10505, + "type_sp": 0, + "tasktxt": "", "type": 58, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -1351,7 +1801,10 @@ }, { "id": 10506, + "type_sp": 0, + "tasktxt": "", "type": 58, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -1360,7 +1813,10 @@ }, { "id": 10507, + "type_sp": 0, + "tasktxt": "", "type": 58, + "valid": 0, "data1": 70, "data2": 0, "data3": 0, @@ -1369,7 +1825,10 @@ }, { "id": 10508, + "type_sp": 0, + "tasktxt": "", "type": 58, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -1378,7 +1837,10 @@ }, { "id": 10601, + "type_sp": 0, + "tasktxt": "", "type": 62, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1387,7 +1849,10 @@ }, { "id": 10602, + "type_sp": 0, + "tasktxt": "", "type": 62, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -1396,7 +1861,10 @@ }, { "id": 10603, + "type_sp": 0, + "tasktxt": "", "type": 62, + "valid": 0, "data1": 99, "data2": 0, "data3": 0, @@ -1405,7 +1873,10 @@ }, { "id": 10701, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1414,7 +1885,10 @@ }, { "id": 10702, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -1423,7 +1897,10 @@ }, { "id": 10703, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -1432,7 +1909,10 @@ }, { "id": 10704, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -1441,7 +1921,10 @@ }, { "id": 10705, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -1450,7 +1933,10 @@ }, { "id": 10706, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -1459,7 +1945,10 @@ }, { "id": 10707, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 200, "data2": 0, "data3": 0, @@ -1468,7 +1957,10 @@ }, { "id": 10708, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -1477,7 +1969,10 @@ }, { "id": 10709, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -1486,7 +1981,10 @@ }, { "id": 10710, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -1495,7 +1993,10 @@ }, { "id": 10801, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1504,7 +2005,10 @@ }, { "id": 10802, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -1513,7 +2017,10 @@ }, { "id": 10803, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -1522,7 +2029,10 @@ }, { "id": 10804, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -1531,7 +2041,10 @@ }, { "id": 10805, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -1540,7 +2053,10 @@ }, { "id": 10806, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -1549,7 +2065,10 @@ }, { "id": 10807, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 200, "data2": 0, "data3": 0, @@ -1558,7 +2077,10 @@ }, { "id": 10808, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -1567,7 +2089,10 @@ }, { "id": 10809, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -1576,7 +2101,10 @@ }, { "id": 10810, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -1585,7 +2113,10 @@ }, { "id": 2008001, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1594,7 +2125,10 @@ }, { "id": 2012001, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1603,7 +2137,10 @@ }, { "id": 2018001, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1612,7 +2149,10 @@ }, { "id": 2024001, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1621,7 +2161,10 @@ }, { "id": 2047001, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1630,7 +2173,10 @@ }, { "id": 2062001, + "type_sp": 0, + "tasktxt": "", "type": 62, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1639,7 +2185,10 @@ }, { "id": 2064001, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1648,7 +2197,10 @@ }, { "id": 2130001, + "type_sp": 0, + "tasktxt": "", "type": 130, + "valid": 0, "data1": 3, "data2": 0, "data3": 0, @@ -1657,7 +2209,10 @@ }, { "id": 3008001, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -1666,7 +2221,10 @@ }, { "id": 3012001, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -1675,7 +2233,10 @@ }, { "id": 3018001, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -1684,7 +2245,10 @@ }, { "id": 3024001, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -1693,7 +2257,10 @@ }, { "id": 3047001, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 7, "data2": 0, "data3": 0, @@ -1702,7 +2269,10 @@ }, { "id": 3061001, + "type_sp": 0, + "tasktxt": "", "type": 62, + "valid": 0, "data1": 7, "data2": 0, "data3": 0, @@ -1711,7 +2281,10 @@ }, { "id": 3064001, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 7, "data2": 0, "data3": 0, @@ -1720,7 +2293,10 @@ }, { "id": 3088001, + "type_sp": 0, + "tasktxt": "", "type": 88, + "valid": 0, "data1": 3, "data2": 0, "data3": 0, @@ -1729,7 +2305,10 @@ }, { "id": 3105001, + "type_sp": 0, + "tasktxt": "", "type": 105, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -1738,7 +2317,10 @@ }, { "id": 3104001, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -1747,7 +2329,10 @@ }, { "id": 3130001, + "type_sp": 0, + "tasktxt": "", "type": 130, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -1756,7 +2341,10 @@ }, { "id": 4008001, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 3, "data2": 0, "data3": 0, @@ -1765,7 +2353,10 @@ }, { "id": 4008002, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 7, "data2": 0, "data3": 0, @@ -1774,7 +2365,10 @@ }, { "id": 4008003, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -1783,7 +2377,10 @@ }, { "id": 4008004, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 90, "data2": 0, "data3": 0, @@ -1792,7 +2389,10 @@ }, { "id": 4008005, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 180, "data2": 0, "data3": 0, @@ -1801,7 +2401,10 @@ }, { "id": 4008006, + "type_sp": 0, + "tasktxt": "", "type": 8, + "valid": 0, "data1": 365, "data2": 0, "data3": 0, @@ -1810,7 +2413,10 @@ }, { "id": 4008007, + "type_sp": 0, + "tasktxt": "", "type": 9, + "valid": 0, "data1": 3, "data2": 0, "data3": 0, @@ -1819,7 +2425,10 @@ }, { "id": 4008008, + "type_sp": 0, + "tasktxt": "", "type": 9, + "valid": 0, "data1": 7, "data2": 0, "data3": 0, @@ -1828,7 +2437,10 @@ }, { "id": 4008009, + "type_sp": 0, + "tasktxt": "", "type": 9, + "valid": 0, "data1": 14, "data2": 0, "data3": 0, @@ -1837,7 +2449,10 @@ }, { "id": 4008010, + "type_sp": 0, + "tasktxt": "", "type": 9, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -1846,7 +2461,10 @@ }, { "id": 4010001, + "type_sp": 0, + "tasktxt": "", "type": 10, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -1855,7 +2473,10 @@ }, { "id": 4010002, + "type_sp": 0, + "tasktxt": "", "type": 10, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -1864,7 +2485,10 @@ }, { "id": 4010003, + "type_sp": 0, + "tasktxt": "", "type": 10, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -1873,7 +2497,10 @@ }, { "id": 4010004, + "type_sp": 0, + "tasktxt": "", "type": 10, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -1882,7 +2509,10 @@ }, { "id": 4010005, + "type_sp": 0, + "tasktxt": "", "type": 10, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -1891,7 +2521,10 @@ }, { "id": 4010006, + "type_sp": 0, + "tasktxt": "", "type": 10, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -1900,7 +2533,10 @@ }, { "id": 4011001, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -1909,7 +2545,10 @@ }, { "id": 4011002, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -1918,7 +2557,10 @@ }, { "id": 4011003, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -1927,7 +2569,10 @@ }, { "id": 4011004, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -1936,7 +2581,10 @@ }, { "id": 4011005, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -1945,7 +2593,10 @@ }, { "id": 4011006, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -1954,7 +2605,10 @@ }, { "id": 4011007, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -1963,7 +2617,10 @@ }, { "id": 4011008, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -1972,7 +2629,10 @@ }, { "id": 4011009, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 3000, "data2": 0, "data3": 0, @@ -1981,7 +2641,10 @@ }, { "id": 4011010, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 5000, "data2": 0, "data3": 0, @@ -1990,7 +2653,10 @@ }, { "id": 4011011, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 10000, "data2": 0, "data3": 0, @@ -1999,7 +2665,10 @@ }, { "id": 4012001, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -2008,7 +2677,10 @@ }, { "id": 4012002, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -2017,7 +2689,10 @@ }, { "id": 4012003, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -2026,7 +2701,10 @@ }, { "id": 4012004, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -2035,7 +2713,10 @@ }, { "id": 4012005, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -2044,7 +2725,10 @@ }, { "id": 4012006, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -2053,7 +2737,10 @@ }, { "id": 4012007, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -2062,7 +2749,10 @@ }, { "id": 4012008, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -2071,7 +2761,10 @@ }, { "id": 4012009, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -2080,7 +2773,10 @@ }, { "id": 4016001, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 1, "data2": 5, "data3": 0, @@ -2089,7 +2785,10 @@ }, { "id": 4016002, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 2, "data2": 5, "data3": 0, @@ -2098,7 +2797,10 @@ }, { "id": 4016003, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 3, "data2": 5, "data3": 0, @@ -2107,7 +2809,10 @@ }, { "id": 4016004, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 5, "data2": 5, "data3": 0, @@ -2116,7 +2821,10 @@ }, { "id": 4016005, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 10, "data2": 5, "data3": 0, @@ -2125,7 +2833,10 @@ }, { "id": 4016006, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 15, "data2": 5, "data3": 0, @@ -2134,7 +2845,10 @@ }, { "id": 4016007, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 20, "data2": 5, "data3": 0, @@ -2143,7 +2857,10 @@ }, { "id": 4016008, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 30, "data2": 5, "data3": 0, @@ -2152,7 +2869,10 @@ }, { "id": 4016009, + "type_sp": 0, + "tasktxt": "", "type": 16, + "valid": 0, "data1": 50, "data2": 5, "data3": 0, @@ -2161,7 +2881,10 @@ }, { "id": 4018001, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -2170,7 +2893,10 @@ }, { "id": 4018002, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -2179,7 +2905,10 @@ }, { "id": 4018003, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -2188,7 +2917,10 @@ }, { "id": 4018004, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -2197,7 +2929,10 @@ }, { "id": 4018005, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -2206,7 +2941,10 @@ }, { "id": 4018006, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 200, "data2": 0, "data3": 0, @@ -2215,7 +2953,10 @@ }, { "id": 4018007, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -2224,7 +2965,10 @@ }, { "id": 4018008, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -2233,7 +2977,10 @@ }, { "id": 4018009, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -2242,7 +2989,10 @@ }, { "id": 4018010, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 2000, "data2": 0, "data3": 0, @@ -2251,7 +3001,10 @@ }, { "id": 4018011, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 5000, "data2": 0, "data3": 0, @@ -2260,7 +3013,10 @@ }, { "id": 4018012, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 10000, "data2": 0, "data3": 0, @@ -2269,7 +3025,10 @@ }, { "id": 4020001, + "type_sp": 0, + "tasktxt": "", "type": 20, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -2278,7 +3037,10 @@ }, { "id": 4020002, + "type_sp": 0, + "tasktxt": "", "type": 20, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -2287,7 +3049,10 @@ }, { "id": 4020003, + "type_sp": 0, + "tasktxt": "", "type": 20, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -2296,7 +3061,10 @@ }, { "id": 4020004, + "type_sp": 0, + "tasktxt": "", "type": 20, + "valid": 0, "data1": 40, "data2": 0, "data3": 0, @@ -2305,7 +3073,10 @@ }, { "id": 4020005, + "type_sp": 0, + "tasktxt": "", "type": 20, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -2314,7 +3085,10 @@ }, { "id": 4020006, + "type_sp": 0, + "tasktxt": "", "type": 20, + "valid": 0, "data1": 60, "data2": 0, "data3": 0, @@ -2323,7 +3097,10 @@ }, { "id": 4043001, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 1, "data2": 15, "data3": 0, @@ -2332,7 +3109,10 @@ }, { "id": 4043002, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 2, "data2": 15, "data3": 0, @@ -2341,7 +3121,10 @@ }, { "id": 4043003, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 4, "data2": 15, "data3": 0, @@ -2350,7 +3133,10 @@ }, { "id": 4043004, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 6, "data2": 15, "data3": 0, @@ -2359,7 +3145,10 @@ }, { "id": 4043005, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 12, "data2": 15, "data3": 0, @@ -2368,7 +3157,10 @@ }, { "id": 4043006, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 18, "data2": 15, "data3": 0, @@ -2377,7 +3169,10 @@ }, { "id": 4043007, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 24, "data2": 15, "data3": 0, @@ -2386,7 +3181,10 @@ }, { "id": 4043008, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 30, "data2": 15, "data3": 0, @@ -2395,7 +3193,10 @@ }, { "id": 4043009, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 60, "data2": 15, "data3": 0, @@ -2404,7 +3205,10 @@ }, { "id": 4043010, + "type_sp": 0, + "tasktxt": "", "type": 43, + "valid": 0, "data1": 120, "data2": 15, "data3": 0, @@ -2413,7 +3217,10 @@ }, { "id": 4047001, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -2422,7 +3229,10 @@ }, { "id": 4047002, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -2431,7 +3241,10 @@ }, { "id": 4047003, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -2440,7 +3253,10 @@ }, { "id": 4047004, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -2449,7 +3265,10 @@ }, { "id": 4047005, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -2458,7 +3277,10 @@ }, { "id": 4047006, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 200, "data2": 0, "data3": 0, @@ -2467,7 +3289,10 @@ }, { "id": 4047007, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -2476,7 +3301,10 @@ }, { "id": 4047008, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -2485,7 +3313,10 @@ }, { "id": 4047009, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -2494,7 +3325,10 @@ }, { "id": 4047010, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 2000, "data2": 0, "data3": 0, @@ -2503,7 +3337,10 @@ }, { "id": 4047011, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 3000, "data2": 0, "data3": 0, @@ -2512,7 +3349,10 @@ }, { "id": 4047012, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 5000, "data2": 0, "data3": 0, @@ -2521,7 +3361,10 @@ }, { "id": 4047013, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 10000, "data2": 0, "data3": 0, @@ -2530,7 +3373,10 @@ }, { "id": 4064001, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -2539,7 +3385,10 @@ }, { "id": 4064002, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -2548,7 +3397,10 @@ }, { "id": 4064003, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -2557,7 +3409,10 @@ }, { "id": 4064004, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -2566,7 +3421,10 @@ }, { "id": 4064005, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -2575,7 +3433,10 @@ }, { "id": 4064006, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 200, "data2": 0, "data3": 0, @@ -2584,7 +3445,10 @@ }, { "id": 4064007, + "type_sp": 0, + "tasktxt": "", "type": 64, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -2593,7 +3457,10 @@ }, { "id": 4068001, + "type_sp": 0, + "tasktxt": "", "type": 68, + "valid": 0, "data1": 50000, "data2": 0, "data3": 0, @@ -2602,7 +3469,10 @@ }, { "id": 4068002, + "type_sp": 0, + "tasktxt": "", "type": 68, + "valid": 0, "data1": 500000, "data2": 0, "data3": 0, @@ -2611,7 +3481,10 @@ }, { "id": 4068003, + "type_sp": 0, + "tasktxt": "", "type": 68, + "valid": 0, "data1": 5000000, "data2": 0, "data3": 0, @@ -2620,7 +3493,10 @@ }, { "id": 4068004, + "type_sp": 0, + "tasktxt": "", "type": 68, + "valid": 0, "data1": 50000000, "data2": 0, "data3": 0, @@ -2629,7 +3505,10 @@ }, { "id": 4084001, + "type_sp": 0, + "tasktxt": "", "type": 84, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -2638,7 +3517,10 @@ }, { "id": 4084002, + "type_sp": 0, + "tasktxt": "", "type": 84, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -2647,7 +3529,10 @@ }, { "id": 4084003, + "type_sp": 0, + "tasktxt": "", "type": 84, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -2656,7 +3541,10 @@ }, { "id": 4084004, + "type_sp": 0, + "tasktxt": "", "type": 84, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -2665,7 +3553,10 @@ }, { "id": 4085001, + "type_sp": 0, + "tasktxt": "", "type": 85, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -2674,7 +3565,10 @@ }, { "id": 4085002, + "type_sp": 0, + "tasktxt": "", "type": 85, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -2683,7 +3577,10 @@ }, { "id": 4085003, + "type_sp": 0, + "tasktxt": "", "type": 85, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -2692,7 +3589,10 @@ }, { "id": 4085004, + "type_sp": 0, + "tasktxt": "", "type": 85, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -2701,7 +3601,10 @@ }, { "id": 4085005, + "type_sp": 0, + "tasktxt": "", "type": 85, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -2710,7 +3613,10 @@ }, { "id": 4096001, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -2719,7 +3625,10 @@ }, { "id": 4096002, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -2728,7 +3637,10 @@ }, { "id": 4096003, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -2737,7 +3649,10 @@ }, { "id": 4096004, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -2746,7 +3661,10 @@ }, { "id": 4096005, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 200, "data2": 0, "data3": 0, @@ -2755,7 +3673,10 @@ }, { "id": 4096006, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -2764,7 +3685,10 @@ }, { "id": 4096007, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -2773,7 +3697,10 @@ }, { "id": 4096008, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -2782,7 +3709,10 @@ }, { "id": 4096009, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 2000, "data2": 0, "data3": 0, @@ -2791,7 +3721,10 @@ }, { "id": 4096010, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 3000, "data2": 0, "data3": 0, @@ -2800,7 +3733,10 @@ }, { "id": 4096011, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 5000, "data2": 0, "data3": 0, @@ -2809,7 +3745,10 @@ }, { "id": 4096012, + "type_sp": 0, + "tasktxt": "", "type": 96, + "valid": 0, "data1": 10000, "data2": 0, "data3": 0, @@ -2818,7 +3757,10 @@ }, { "id": 4104001, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -2827,7 +3769,10 @@ }, { "id": 4104002, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -2836,7 +3781,10 @@ }, { "id": 4104003, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 3000, "data2": 0, "data3": 0, @@ -2845,7 +3793,10 @@ }, { "id": 4104004, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 5000, "data2": 0, "data3": 0, @@ -2854,7 +3805,10 @@ }, { "id": 4104005, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 10000, "data2": 0, "data3": 0, @@ -2863,7 +3817,10 @@ }, { "id": 4104006, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 20000, "data2": 0, "data3": 0, @@ -2872,7 +3829,10 @@ }, { "id": 4104007, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 30000, "data2": 0, "data3": 0, @@ -2881,7 +3841,10 @@ }, { "id": 4104008, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 50000, "data2": 0, "data3": 0, @@ -2890,7 +3853,10 @@ }, { "id": 4104009, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 100000, "data2": 0, "data3": 0, @@ -2899,7 +3865,10 @@ }, { "id": 4104010, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 200000, "data2": 0, "data3": 0, @@ -2908,7 +3877,10 @@ }, { "id": 4104011, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 500000, "data2": 0, "data3": 0, @@ -2917,7 +3889,10 @@ }, { "id": 4128001, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 1100, "data2": 0, "data3": 0, @@ -2926,7 +3901,10 @@ }, { "id": 4128002, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 1200, "data2": 0, "data3": 0, @@ -2935,7 +3913,10 @@ }, { "id": 4128003, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 1300, "data2": 0, "data3": 0, @@ -2944,7 +3925,10 @@ }, { "id": 4128004, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 1400, "data2": 0, "data3": 0, @@ -2953,7 +3937,10 @@ }, { "id": 4128005, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 1500, "data2": 0, "data3": 0, @@ -2962,7 +3949,10 @@ }, { "id": 4128006, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 1600, "data2": 0, "data3": 0, @@ -2971,7 +3961,10 @@ }, { "id": 4128007, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 1700, "data2": 0, "data3": 0, @@ -2980,7 +3973,10 @@ }, { "id": 4128008, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 1800, "data2": 0, "data3": 0, @@ -2989,7 +3985,10 @@ }, { "id": 4128009, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 1900, "data2": 0, "data3": 0, @@ -2998,7 +3997,10 @@ }, { "id": 4128010, + "type_sp": 0, + "tasktxt": "", "type": 128, + "valid": 0, "data1": 2000, "data2": 0, "data3": 0, @@ -3007,7 +4009,10 @@ }, { "id": 4131001, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 5, "data2": 0, "data3": 0, @@ -3016,7 +4021,10 @@ }, { "id": 4131002, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 10, "data2": 0, "data3": 0, @@ -3025,7 +4033,10 @@ }, { "id": 4131003, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 20, "data2": 0, "data3": 0, @@ -3034,7 +4045,10 @@ }, { "id": 4131004, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 30, "data2": 0, "data3": 0, @@ -3043,7 +4057,10 @@ }, { "id": 4131005, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 50, "data2": 0, "data3": 0, @@ -3052,7 +4069,10 @@ }, { "id": 4131006, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -3061,7 +4081,10 @@ }, { "id": 4131007, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 200, "data2": 0, "data3": 0, @@ -3070,7 +4093,10 @@ }, { "id": 4131008, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 300, "data2": 0, "data3": 0, @@ -3079,7 +4105,10 @@ }, { "id": 4131009, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 500, "data2": 0, "data3": 0, @@ -3088,7 +4117,10 @@ }, { "id": 4131010, + "type_sp": 0, + "tasktxt": "", "type": 131, + "valid": 0, "data1": 1000, "data2": 0, "data3": 0, @@ -3097,7 +4129,10 @@ }, { "id": 5011001, + "type_sp": 0, + "tasktxt": "", "type": 11, + "valid": 0, "data1": 3, "data2": 0, "data3": 0, @@ -3106,7 +4141,10 @@ }, { "id": 5012001, + "type_sp": 0, + "tasktxt": "", "type": 12, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -3115,7 +4153,10 @@ }, { "id": 5018001, + "type_sp": 0, + "tasktxt": "", "type": 18, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -3124,7 +4165,10 @@ }, { "id": 5024001, + "type_sp": 0, + "tasktxt": "", "type": 24, + "valid": 0, "data1": 1, "data2": 0, "data3": 0, @@ -3133,7 +4177,10 @@ }, { "id": 5047001, + "type_sp": 0, + "tasktxt": "", "type": 47, + "valid": 0, "data1": 6, "data2": 0, "data3": 0, @@ -3142,7 +4189,10 @@ }, { "id": 5063001, + "type_sp": 0, + "tasktxt": "", "type": 63, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, @@ -3151,7 +4201,10 @@ }, { "id": 5068001, + "type_sp": 0, + "tasktxt": "", "type": 68, + "valid": 0, "data1": 200000, "data2": 0, "data3": 0, @@ -3160,11 +4213,38 @@ }, { "id": 5104001, + "type_sp": 0, + "tasktxt": "", "type": 104, + "valid": 0, "data1": 100, "data2": 0, "data3": 0, "data4": 0, "data5": 0 + }, + { + "id": 20001, + "type_sp": 1, + "tasktxt": "与杰克进行交谈", + "type": 20001, + "valid": 1, + "data1": 1, + "data2": 500, + "data3": 0, + "data4": 0, + "data5": 1 + }, + { + "id": 20002, + "type_sp": 1, + "tasktxt": "前往商人购买任意道具", + "type": 64, + "valid": 0, + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 26 } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index cb473f838..0ded356ba 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -21,7 +21,8 @@ }, "npc": 1, "completetask": [ - 20001 + 20001, + 20002 ], "deliver_npc": 1, "auto_accept": 1, @@ -50,12 +51,12 @@ "key": "story_80", "text": "新手引导" }, - "npc": 1, + "npc": 2, "completetask": [ 0 ], - "deliver_npc": 1, - "auto_accept": 1, + "deliver_npc": 2, + "auto_accept": 0, "reword": [], "module": [ "practice" @@ -81,7 +82,7 @@ "key": "story_80", "text": "新手引导" }, - "npc": 1, + "npc": 3, "completetask": [ 0 ], @@ -352,7 +353,7 @@ }, "npc": 12, "completetask": [ - 301 + 198 ], "deliver_npc": 12, "auto_accept": 1, @@ -474,7 +475,7 @@ }, "npc": 16, "completetask": [ - 161 + 0 ], "deliver_npc": 16, "auto_accept": 1, @@ -654,7 +655,7 @@ }, "npc": 22, "completetask": [ - 0 + 301 ], "deliver_npc": 22, "auto_accept": 1, @@ -747,5 +748,34 @@ "auto_accept": 1, "reword": [], "module": [] + }, + { + "key": 30001, + "lock": 1, + "ontxe": 20010, + "id_after": 30002, + "group": 3, + "des": 2, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "初来乍到" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, + "npc": 27, + "completetask": [ + 301 + ], + "deliver_npc": 28, + "auto_accept": 0, + "reword": [], + "module": [] } ] \ No newline at end of file diff --git a/comm/imodule.go b/comm/imodule.go index 22954a458..886a46248 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -369,7 +369,9 @@ type ( // 世界任务 IWorldtask interface { // 任务条件达成通知 + // Deprecated TaskcondNotify(session IUserSession, condId int32) error + TaskCondFinishNotify(session IUserSession, condId int32) error // bingo所有任务 BingoAllTask(session IUserSession) error // bingo任务 diff --git a/modules/rtask/model_rtask.go b/modules/rtask/model_rtask.go index 91bb60c90..e7740cc2b 100644 --- a/modules/rtask/model_rtask.go +++ b/modules/rtask/model_rtask.go @@ -78,6 +78,18 @@ func (this *ModelRtask) checkCondi(uid string, condiId int32) (err error, ok boo if condiId <= 0 { return nil, true } + + conf, err := this.moduleRtask.configure.getRtaskTypeById(condiId) + if err != nil { + errors.Errorf("conf not found condiID: %v", condiId) + return + } + + if conf.Valid == 1 { + ok = true + return + } + //验证限定条件 var condi *rtaskCondi cond, ok := this.moduleRtask.handleMap.Load(condiId) @@ -95,14 +107,11 @@ func (this *ModelRtask) checkCondi(uid string, condiId int32) (err error, ok boo errors.Errorf("condiID: %v", condiId) return } - conf, err := this.moduleRtask.configure.getRtaskTypeById(condiId) - if err != nil { - errors.Errorf("conf not found condiID: %v", condiId) - return - } + if ok, err = condi.verify(uid, conf); !ok { err = errors.WithMessagef(err, "uid: %v do rtask [condiId:%v] condition not reach", uid, condiId) return } + return } diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 922c9522e..d28fc2b2d 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -441,7 +441,7 @@ func (this *ModuleRtask) processOneTask(session comm.IUserSession, rtaskType com module, err := this.service.GetModule(comm.ModuleWorldtask) if err == nil { if worldtask, ok := module.(comm.IWorldtask); ok { - if err := worldtask.TaskcondNotify(session, conf.Id); err != nil { + if err := worldtask.TaskCondFinishNotify(session, conf.Id); err != nil { log.Error("任务条件达成通知", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condId", Value: conf.Id}, diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index 75b199cd7..72fb0b084 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -28,18 +28,13 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC return } - if req.CondiId == 2000120003 { - myWorldtask.CondiIds = append(myWorldtask.CondiIds, 20001) - } else { - if m, err := this.module.service.GetModule(comm.ModuleWorldtask); err == nil { - iwt, ok := m.(comm.IRtask) - if ok { - if code = iwt.CheckCondi(uid, req.CondiId); code == pb.ErrorCode_Success { - myWorldtask.CondiIds = append(myWorldtask.CondiIds, req.CondiId) - } else { - return - } + if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { + iwt, ok := m.(comm.IRtask) + if ok { + if code = iwt.CheckCondi(uid, req.CondiId); code != pb.ErrorCode_Success { + return } + myWorldtask.CondiIds = append(myWorldtask.CondiIds, req.CondiId) } } diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index b39c47e78..b36212d56 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -87,38 +87,53 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } if curTaskConf.IdAfter != 0 { nextTaskId = curTaskConf.IdAfter - // 任务完成推送 - if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{ - NextTaskId: nextTaskId, - }); err != nil { - code = pb.ErrorCode_SystemError + //检查下个任务的完成条件 + nextTaskConf, err := this.module.configure.getWorldtaskById(nextTaskId) + if err != nil || curTaskConf == nil { + code = pb.ErrorCode_ConfigNoFound return } - + for _, condiId := range nextTaskConf.Completetask { + if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { + iwt, ok := m.(comm.IRtask) + if ok { + if code = iwt.CheckCondi(uid, condiId); code != pb.ErrorCode_Success { + return + } + userTask.CondiIds = append(userTask.CondiIds, condiId) + } + } + } + //设置当前进行的任务 userTask.CurrentTaskIds[curTaskConf.Group] = &pb.Worldtask{ TaskId: nextTaskId, TaskType: 2, } update := map[string]interface{}{ + "condiIds": userTask.CondiIds, "currentTaskIds": userTask.CurrentTaskIds, } + if err := this.module.modelWorldtask.Change(uid, update); err != nil { code = pb.ErrorCode_DBError return } + + // 任务完成推送 + if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{ + NextTaskId: nextTaskId, + CondIds: userTask.CondiIds, + }); err != nil { + code = pb.ErrorCode_SystemError + return + } + } } finishCall := func() { - defer func() { - this.module.Debug("世界任务完成", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "params", Value: req}, - log.Field{Key: "nextTaskId", Value: nextTaskId}, - ) - }() for _, v := range curTaskConf.Reword { if v.A == comm.HeroType { @@ -157,12 +172,12 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe this.module.Errorln(err) continue } + if ic, ok := i.(comm.ITaskComplete); ok { ic.TaskComplete(session, req.TaskId) } } } - } //判断任务是否已完成 @@ -177,23 +192,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } } - // if len(curTaskConf.Completetask) != 0 { - // for _, v := range curTaskConf.Completetask { - // if c := this.module.ModuleRtask.CheckCondi(uid, v); c == pb.ErrorCode_Success { - // finishCall() - // } else { - // this.module.Debug("任务完成条件未通过", - // log.Field{Key: "uid", Value: uid}, - // log.Field{Key: "condiId", Value: curTaskConf.Completetask}, - // ) - // code = pb.ErrorCode_TaskNoFinished - // return - // } - // } - - // } else { finishCall() - // } finishRsp() diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index d119ef013..e179f7a3d 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -38,7 +38,7 @@ func (this *ModelWorldtask) getWorldtask(uid string) (*pb.DBWorldtask, error) { return d, nil } -//判断前置任务是否完成 +// 判断前置任务是否完成 // true 已完成 false未完成 func (this *ModelWorldtask) IsPreFinished(userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) bool { var ( @@ -96,6 +96,7 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta update["taskList"] = task.TaskList update["lastTaskIds"] = task.LastTaskIds update["deliverNpc"] = 1 + update["condiIds"] = []int32{} if err := this.Change(task.Uid, update); err != nil { return err } diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index 3a098bc8b..4a7868051 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -55,6 +55,50 @@ func (this *Worldtask) Start() (err error) { } // 任务条件达成通知 +func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condId int32) error { + uid := session.GetUserId() + // 玩家世界任务 + userTask, err := this.modelWorldtask.getWorldtask(uid) + if err != nil { + this.Error("获取玩家世界任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condId", Value: condId}) + return err + } + + // 检索condId是否是世界任务的完成条件 + finishedTaskIds := make(map[int32]int32) //达成的任务条件 + for _, c := range this.worldtaskConf.GetDataList() { + for _, v := range c.Completetask { + if v == condId { + finishedTaskIds[c.Group] = c.Key + } + } + } + + if len(finishedTaskIds) == 0 { + return nil + } + + userTask.CondiIds = append(userTask.CondiIds, condId) + + update := map[string]interface{}{ + "condiIds": userTask.CondiIds, + } + this.modelWorldtask.Change(uid, update) + + for k, v := range userTask.CurrentTaskIds { + session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{ + GroupId: k, + TaskId: v.TaskId, + CondiIds: userTask.CondiIds, + }) + this.Debug("推送完成条件",log.Field{Key: "condiIds",Value: v.TaskId}) + } + + return nil +} + +// 任务条件达成通知 +// Deprecated func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) error { uid := session.GetUserId() diff --git a/pb/worldtask_msg.pb.go b/pb/worldtask_msg.pb.go index ad4ecbe5e..886063bf7 100644 --- a/pb/worldtask_msg.pb.go +++ b/pb/worldtask_msg.pb.go @@ -218,16 +218,18 @@ func (x *WorldtaskAcceptResp) GetTaskId() int32 { } //任务完成条件推送 -type WorldtaskCompletetaskPush struct { +type WorldtaskCompletecondisPush struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - CondiIds []int32 `protobuf:"varint,1,rep,packed,name=condiIds,proto3" json:"condiIds"` + GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` + TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` + CondiIds []int32 `protobuf:"varint,3,rep,packed,name=condiIds,proto3" json:"condiIds"` } -func (x *WorldtaskCompletetaskPush) Reset() { - *x = WorldtaskCompletetaskPush{} +func (x *WorldtaskCompletecondisPush) Reset() { + *x = WorldtaskCompletecondisPush{} if protoimpl.UnsafeEnabled { mi := &file_worldtask_worldtask_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -235,13 +237,13 @@ func (x *WorldtaskCompletetaskPush) Reset() { } } -func (x *WorldtaskCompletetaskPush) String() string { +func (x *WorldtaskCompletecondisPush) String() string { return protoimpl.X.MessageStringOf(x) } -func (*WorldtaskCompletetaskPush) ProtoMessage() {} +func (*WorldtaskCompletecondisPush) ProtoMessage() {} -func (x *WorldtaskCompletetaskPush) ProtoReflect() protoreflect.Message { +func (x *WorldtaskCompletecondisPush) ProtoReflect() protoreflect.Message { mi := &file_worldtask_worldtask_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -253,12 +255,26 @@ func (x *WorldtaskCompletetaskPush) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use WorldtaskCompletetaskPush.ProtoReflect.Descriptor instead. -func (*WorldtaskCompletetaskPush) Descriptor() ([]byte, []int) { +// Deprecated: Use WorldtaskCompletecondisPush.ProtoReflect.Descriptor instead. +func (*WorldtaskCompletecondisPush) Descriptor() ([]byte, []int) { return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{4} } -func (x *WorldtaskCompletetaskPush) GetCondiIds() []int32 { +func (x *WorldtaskCompletecondisPush) GetGroupId() int32 { + if x != nil { + return x.GroupId + } + return 0 +} + +func (x *WorldtaskCompletecondisPush) GetTaskId() int32 { + if x != nil { + return x.TaskId + } + return 0 +} + +func (x *WorldtaskCompletecondisPush) GetCondiIds() []int32 { if x != nil { return x.CondiIds } @@ -509,7 +525,8 @@ type WorldtaskNexttaskPush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - NextTaskId int32 `protobuf:"varint,1,opt,name=nextTaskId,proto3" json:"nextTaskId"` //下一个任务ID + NextTaskId int32 `protobuf:"varint,1,opt,name=nextTaskId,proto3" json:"nextTaskId"` //下一个任务ID + CondIds []int32 `protobuf:"varint,2,rep,packed,name=condIds,proto3" json:"condIds"` // 条件ID } func (x *WorldtaskNexttaskPush) Reset() { @@ -551,6 +568,13 @@ func (x *WorldtaskNexttaskPush) GetNextTaskId() int32 { return 0 } +func (x *WorldtaskNexttaskPush) GetCondIds() []int32 { + if x != nil { + return x.CondIds + } + return nil +} + // 开始战斗 type WorldtaskBattleStartReq struct { state protoimpl.MessageState @@ -835,63 +859,68 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{ 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x22, 0x37, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, - 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, - 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, 0x67, 0x0a, 0x19, 0x57, - 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, - 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, + 0x49, 0x64, 0x22, 0x6b, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50, 0x75, 0x73, + 0x68, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, + 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, + 0x67, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, + 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, + 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x68, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, + 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, + 0x64, 0x69, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, + 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, + 0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, + 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, - 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, - 0x64, 0x69, 0x49, 0x64, 0x22, 0x68, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, - 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, - 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x46, - 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, - 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, - 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, - 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, - 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, - 0x37, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, - 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a, 0x6e, 0x65, 0x78, 0x74, - 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6e, 0x65, - 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x67, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, - 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, - 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, - 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x18, 0x02, 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, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x7d, - 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, - 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, - 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 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, 0x33, 0x0a, - 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, - 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x22, 0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, - 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, - 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, - 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x13, 0x57, 0x6f, + 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, + 0x6b, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, + 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a, + 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0a, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, + 0x63, 0x6f, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x63, + 0x6f, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x67, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, + 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, + 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, + 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, + 0x02, 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, + 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, + 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x7d, 0x0a, 0x18, + 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, + 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, + 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, + 0x6e, 0x66, 0x49, 0x64, 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, 0x33, 0x0a, 0x19, 0x57, + 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, + 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, + 0x22, 0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, + 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, + 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, + 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -908,26 +937,26 @@ func file_worldtask_worldtask_msg_proto_rawDescGZIP() []byte { var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ - (*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq - (*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp - (*WorldtaskAcceptReq)(nil), // 2: WorldtaskAcceptReq - (*WorldtaskAcceptResp)(nil), // 3: WorldtaskAcceptResp - (*WorldtaskCompletetaskPush)(nil), // 4: WorldtaskCompletetaskPush - (*WorldtaskCompleteCondiReq)(nil), // 5: WorldtaskCompleteCondiReq - (*WorldtaskCompleteCondiResp)(nil), // 6: WorldtaskCompleteCondiResp - (*WorldtaskFinishReq)(nil), // 7: WorldtaskFinishReq - (*WorldtaskFinishResp)(nil), // 8: WorldtaskFinishResp - (*WorldtaskNexttaskPush)(nil), // 9: WorldtaskNexttaskPush - (*WorldtaskBattleStartReq)(nil), // 10: WorldtaskBattleStartReq - (*WorldtaskBattleStartResp)(nil), // 11: WorldtaskBattleStartResp - (*WorldtaskBattleFinishReq)(nil), // 12: WorldtaskBattleFinishReq - (*WorldtaskBattleFinishResp)(nil), // 13: WorldtaskBattleFinishResp - (*WorldtaskFinishIdsPush)(nil), // 14: WorldtaskFinishIdsPush - (*DBWorldtask)(nil), // 15: DBWorldtask - (*BattleFormation)(nil), // 16: BattleFormation - (*BattleInfo)(nil), // 17: BattleInfo - (*BattleReport)(nil), // 18: BattleReport - (*Worldtask)(nil), // 19: Worldtask + (*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq + (*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp + (*WorldtaskAcceptReq)(nil), // 2: WorldtaskAcceptReq + (*WorldtaskAcceptResp)(nil), // 3: WorldtaskAcceptResp + (*WorldtaskCompletecondisPush)(nil), // 4: WorldtaskCompletecondisPush + (*WorldtaskCompleteCondiReq)(nil), // 5: WorldtaskCompleteCondiReq + (*WorldtaskCompleteCondiResp)(nil), // 6: WorldtaskCompleteCondiResp + (*WorldtaskFinishReq)(nil), // 7: WorldtaskFinishReq + (*WorldtaskFinishResp)(nil), // 8: WorldtaskFinishResp + (*WorldtaskNexttaskPush)(nil), // 9: WorldtaskNexttaskPush + (*WorldtaskBattleStartReq)(nil), // 10: WorldtaskBattleStartReq + (*WorldtaskBattleStartResp)(nil), // 11: WorldtaskBattleStartResp + (*WorldtaskBattleFinishReq)(nil), // 12: WorldtaskBattleFinishReq + (*WorldtaskBattleFinishResp)(nil), // 13: WorldtaskBattleFinishResp + (*WorldtaskFinishIdsPush)(nil), // 14: WorldtaskFinishIdsPush + (*DBWorldtask)(nil), // 15: DBWorldtask + (*BattleFormation)(nil), // 16: BattleFormation + (*BattleInfo)(nil), // 17: BattleInfo + (*BattleReport)(nil), // 18: BattleReport + (*Worldtask)(nil), // 19: Worldtask } var file_worldtask_worldtask_msg_proto_depIdxs = []int32{ 15, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask @@ -999,7 +1028,7 @@ func file_worldtask_worldtask_msg_proto_init() { } } file_worldtask_worldtask_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WorldtaskCompletetaskPush); i { + switch v := v.(*WorldtaskCompletecondisPush); i { case 0: return &v.state case 1: diff --git a/sys/configure/structs/Game.RdtaskCondiData.go b/sys/configure/structs/Game.RdtaskCondiData.go index 6f32eeb5c..9322f9c18 100644 --- a/sys/configure/structs/Game.RdtaskCondiData.go +++ b/sys/configure/structs/Game.RdtaskCondiData.go @@ -12,7 +12,10 @@ import "errors" type GameRdtaskCondiData struct { Id int32 + TypeSp int32 + Tasktxt string Type int32 + Valid int32 Data1 int32 Data2 int32 Data3 int32 @@ -28,7 +31,10 @@ func (*GameRdtaskCondiData) GetTypeId() int32 { func (_v *GameRdtaskCondiData)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["type_sp"].(float64); !_ok_ { err = errors.New("type_sp error"); return }; _v.TypeSp = int32(_tempNum_) } + { var _ok_ bool; if _v.Tasktxt, _ok_ = _buf["tasktxt"].(string); !_ok_ { err = errors.New("tasktxt error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["valid"].(float64); !_ok_ { err = errors.New("valid error"); return }; _v.Valid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data1"].(float64); !_ok_ { err = errors.New("data1 error"); return }; _v.Data1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data2"].(float64); !_ok_ { err = errors.New("data2 error"); return }; _v.Data2 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data3"].(float64); !_ok_ { err = errors.New("data3 error"); return }; _v.Data3 = int32(_tempNum_) }