From 90de92da7228093083ca34ea9b6a703b1e472569 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Mon, 22 May 2023 18:08:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_rdtaskcondi.json | 866 ++++++++++++++---- cmd/v2/lib/storage/config.go | 1 + cmd/v2/ui/views/globalview.go | 110 ++- modules/rtask/module.go | 13 + pb/task_db.pb.go | 47 +- sys/configure/structs/Game.RdtaskCondiData.go | 2 + 6 files changed, 824 insertions(+), 215 deletions(-) diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 95a695470..6102c22ff 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -1,6 +1,7 @@ [ { "id": 101, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_1", @@ -17,6 +18,7 @@ }, { "id": 102, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_2", @@ -33,6 +35,7 @@ }, { "id": 103, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_3", @@ -49,6 +52,7 @@ }, { "id": 104, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_4", @@ -65,6 +69,7 @@ }, { "id": 105, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_5", @@ -81,6 +86,7 @@ }, { "id": 106, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_6", @@ -97,6 +103,7 @@ }, { "id": 107, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_7", @@ -113,6 +120,7 @@ }, { "id": 108, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_8", @@ -129,6 +137,7 @@ }, { "id": 109, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_9", @@ -145,6 +154,7 @@ }, { "id": 110, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_10", @@ -161,6 +171,7 @@ }, { "id": 111, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_11", @@ -177,6 +188,7 @@ }, { "id": 112, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_12", @@ -193,6 +205,7 @@ }, { "id": 113, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_13", @@ -209,6 +222,7 @@ }, { "id": 114, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_14", @@ -225,6 +239,7 @@ }, { "id": 115, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_15", @@ -241,6 +256,7 @@ }, { "id": 116, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_16", @@ -257,6 +273,7 @@ }, { "id": 117, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_17", @@ -273,6 +290,7 @@ }, { "id": 118, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_18", @@ -289,6 +307,7 @@ }, { "id": 119, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_19", @@ -305,6 +324,7 @@ }, { "id": 120, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_20", @@ -321,6 +341,7 @@ }, { "id": 121, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_21", @@ -337,6 +358,7 @@ }, { "id": 122, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_22", @@ -353,6 +375,7 @@ }, { "id": 123, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_23", @@ -369,6 +392,7 @@ }, { "id": 124, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_24", @@ -385,6 +409,7 @@ }, { "id": 125, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_25", @@ -401,6 +426,7 @@ }, { "id": 126, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_26", @@ -417,6 +443,7 @@ }, { "id": 127, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_27", @@ -433,6 +460,7 @@ }, { "id": 128, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_28", @@ -449,6 +477,7 @@ }, { "id": 129, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_29", @@ -465,6 +494,7 @@ }, { "id": 130, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_30", @@ -481,6 +511,7 @@ }, { "id": 131, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_31", @@ -497,6 +528,7 @@ }, { "id": 132, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_32", @@ -513,6 +545,7 @@ }, { "id": 133, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_33", @@ -529,6 +562,7 @@ }, { "id": 134, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_34", @@ -545,6 +579,7 @@ }, { "id": 135, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_35", @@ -561,6 +596,7 @@ }, { "id": 136, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_36", @@ -577,6 +613,7 @@ }, { "id": 137, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_37", @@ -593,6 +630,7 @@ }, { "id": 138, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_38", @@ -609,6 +647,7 @@ }, { "id": 139, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_39", @@ -625,6 +664,7 @@ }, { "id": 140, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_40", @@ -641,6 +681,7 @@ }, { "id": 141, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_41", @@ -657,6 +698,7 @@ }, { "id": 142, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_42", @@ -673,6 +715,7 @@ }, { "id": 143, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_43", @@ -689,6 +732,7 @@ }, { "id": 144, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_44", @@ -705,6 +749,7 @@ }, { "id": 145, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_45", @@ -721,6 +766,7 @@ }, { "id": 146, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_46", @@ -737,6 +783,7 @@ }, { "id": 147, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_47", @@ -753,6 +800,7 @@ }, { "id": 148, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_48", @@ -769,6 +817,7 @@ }, { "id": 149, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_49", @@ -785,6 +834,7 @@ }, { "id": 150, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_50", @@ -801,6 +851,7 @@ }, { "id": 151, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_51", @@ -817,6 +868,7 @@ }, { "id": 152, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_52", @@ -833,6 +885,7 @@ }, { "id": 153, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_53", @@ -849,6 +902,7 @@ }, { "id": 154, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_54", @@ -865,6 +919,7 @@ }, { "id": 155, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_55", @@ -881,6 +936,7 @@ }, { "id": 156, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_56", @@ -897,6 +953,7 @@ }, { "id": 157, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_57", @@ -913,6 +970,7 @@ }, { "id": 158, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_58", @@ -929,6 +987,7 @@ }, { "id": 159, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_59", @@ -945,6 +1004,7 @@ }, { "id": 160, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_60", @@ -961,6 +1021,7 @@ }, { "id": 161, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_61", @@ -977,6 +1038,7 @@ }, { "id": 162, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_62", @@ -993,6 +1055,7 @@ }, { "id": 163, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_63", @@ -1009,6 +1072,7 @@ }, { "id": 164, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_64", @@ -1025,6 +1089,7 @@ }, { "id": 165, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_65", @@ -1041,6 +1106,7 @@ }, { "id": 166, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_66", @@ -1057,6 +1123,7 @@ }, { "id": 167, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_67", @@ -1073,6 +1140,7 @@ }, { "id": 168, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_68", @@ -1089,6 +1157,7 @@ }, { "id": 169, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_69", @@ -1105,6 +1174,7 @@ }, { "id": 170, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_70", @@ -1121,6 +1191,7 @@ }, { "id": 171, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_71", @@ -1137,6 +1208,7 @@ }, { "id": 172, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_72", @@ -1153,6 +1225,7 @@ }, { "id": 173, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_73", @@ -1169,6 +1242,7 @@ }, { "id": 174, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_74", @@ -1185,6 +1259,7 @@ }, { "id": 175, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_75", @@ -1201,6 +1276,7 @@ }, { "id": 176, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_76", @@ -1217,6 +1293,7 @@ }, { "id": 177, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_77", @@ -1233,6 +1310,7 @@ }, { "id": 178, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_78", @@ -1249,6 +1327,7 @@ }, { "id": 179, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_79", @@ -1265,6 +1344,7 @@ }, { "id": 180, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_80", @@ -1281,6 +1361,7 @@ }, { "id": 181, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_81", @@ -1297,6 +1378,7 @@ }, { "id": 182, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_82", @@ -1313,6 +1395,7 @@ }, { "id": 183, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_83", @@ -1329,6 +1412,7 @@ }, { "id": 184, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_84", @@ -1345,6 +1429,7 @@ }, { "id": 185, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_85", @@ -1361,6 +1446,7 @@ }, { "id": 186, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_86", @@ -1377,6 +1463,7 @@ }, { "id": 187, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_87", @@ -1393,6 +1480,7 @@ }, { "id": 188, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_88", @@ -1409,6 +1497,7 @@ }, { "id": 189, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_89", @@ -1425,6 +1514,7 @@ }, { "id": 190, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_90", @@ -1441,6 +1531,7 @@ }, { "id": 191, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_91", @@ -1457,6 +1548,7 @@ }, { "id": 192, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_92", @@ -1473,6 +1565,7 @@ }, { "id": 193, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_93", @@ -1489,6 +1582,7 @@ }, { "id": 195, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_94", @@ -1505,6 +1599,7 @@ }, { "id": 196, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_95", @@ -1521,6 +1616,7 @@ }, { "id": 197, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_96", @@ -1537,6 +1633,7 @@ }, { "id": 198, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_97", @@ -1553,6 +1650,7 @@ }, { "id": 199, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_98", @@ -1569,6 +1667,7 @@ }, { "id": 200, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_99", @@ -1585,6 +1684,7 @@ }, { "id": 201, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_100", @@ -1601,6 +1701,7 @@ }, { "id": 202, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_101", @@ -1617,6 +1718,7 @@ }, { "id": 203, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_102", @@ -1633,6 +1735,7 @@ }, { "id": 301, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_103", @@ -1649,6 +1752,7 @@ }, { "id": 302, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_104", @@ -1665,6 +1769,7 @@ }, { "id": 303, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_105", @@ -1681,6 +1786,7 @@ }, { "id": 304, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_106", @@ -1697,6 +1803,7 @@ }, { "id": 305, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_107", @@ -1713,6 +1820,7 @@ }, { "id": 306, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_108", @@ -1729,6 +1837,7 @@ }, { "id": 307, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_109", @@ -1745,6 +1854,7 @@ }, { "id": 308, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_110", @@ -1761,6 +1871,7 @@ }, { "id": 309, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_111", @@ -1777,6 +1888,7 @@ }, { "id": 10001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_112", @@ -1793,6 +1905,7 @@ }, { "id": 10002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_113", @@ -1809,6 +1922,7 @@ }, { "id": 10003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_114", @@ -1825,6 +1939,7 @@ }, { "id": 10004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_115", @@ -1841,6 +1956,7 @@ }, { "id": 10005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_116", @@ -1857,6 +1973,7 @@ }, { "id": 10006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_117", @@ -1873,6 +1990,7 @@ }, { "id": 10007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_118", @@ -1889,6 +2007,7 @@ }, { "id": 10008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_119", @@ -1905,6 +2024,7 @@ }, { "id": 10009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_120", @@ -1921,6 +2041,7 @@ }, { "id": 10010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_121", @@ -1937,6 +2058,7 @@ }, { "id": 10101, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_122", @@ -1953,6 +2075,7 @@ }, { "id": 10201, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_123", @@ -1969,6 +2092,7 @@ }, { "id": 10202, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_124", @@ -1985,6 +2109,7 @@ }, { "id": 10203, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_125", @@ -2001,6 +2126,7 @@ }, { "id": 10204, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_126", @@ -2017,6 +2143,7 @@ }, { "id": 10205, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_127", @@ -2033,6 +2160,7 @@ }, { "id": 10206, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_128", @@ -2049,6 +2177,7 @@ }, { "id": 10207, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_129", @@ -2065,6 +2194,7 @@ }, { "id": 10208, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_130", @@ -2081,6 +2211,7 @@ }, { "id": 10209, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_131", @@ -2097,6 +2228,7 @@ }, { "id": 10210, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_132", @@ -2113,6 +2245,7 @@ }, { "id": 10301, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_133", @@ -2129,6 +2262,7 @@ }, { "id": 10302, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_134", @@ -2145,6 +2279,7 @@ }, { "id": 10303, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_135", @@ -2161,6 +2296,7 @@ }, { "id": 10304, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_136", @@ -2177,6 +2313,7 @@ }, { "id": 10305, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_137", @@ -2193,6 +2330,7 @@ }, { "id": 10306, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_138", @@ -2209,6 +2347,7 @@ }, { "id": 10307, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_139", @@ -2225,6 +2364,7 @@ }, { "id": 10308, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_140", @@ -2241,6 +2381,7 @@ }, { "id": 10309, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_141", @@ -2257,6 +2398,7 @@ }, { "id": 10310, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_142", @@ -2273,6 +2415,7 @@ }, { "id": 10401, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_143", @@ -2289,6 +2432,7 @@ }, { "id": 10402, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_144", @@ -2305,6 +2449,7 @@ }, { "id": 10403, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_145", @@ -2321,6 +2466,7 @@ }, { "id": 10404, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_146", @@ -2337,6 +2483,7 @@ }, { "id": 10405, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_147", @@ -2353,6 +2500,7 @@ }, { "id": 10406, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_148", @@ -2369,6 +2517,7 @@ }, { "id": 10407, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_149", @@ -2385,6 +2534,7 @@ }, { "id": 10408, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_150", @@ -2401,6 +2551,7 @@ }, { "id": 10409, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_151", @@ -2417,6 +2568,7 @@ }, { "id": 10410, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_152", @@ -2433,6 +2585,7 @@ }, { "id": 10501, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_153", @@ -2449,6 +2602,7 @@ }, { "id": 10502, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_154", @@ -2465,6 +2619,7 @@ }, { "id": 10503, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_155", @@ -2481,6 +2636,7 @@ }, { "id": 10504, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_156", @@ -2497,6 +2653,7 @@ }, { "id": 10505, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_157", @@ -2513,6 +2670,7 @@ }, { "id": 10506, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_158", @@ -2529,6 +2687,7 @@ }, { "id": 10507, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_159", @@ -2545,6 +2704,7 @@ }, { "id": 10508, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_160", @@ -2561,6 +2721,7 @@ }, { "id": 10601, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_161", @@ -2577,6 +2738,7 @@ }, { "id": 10602, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_162", @@ -2593,6 +2755,7 @@ }, { "id": 10603, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_163", @@ -2609,6 +2772,7 @@ }, { "id": 10701, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_164", @@ -2625,6 +2789,7 @@ }, { "id": 10702, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_165", @@ -2641,6 +2806,7 @@ }, { "id": 10703, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_166", @@ -2657,6 +2823,7 @@ }, { "id": 10704, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_167", @@ -2673,6 +2840,7 @@ }, { "id": 10705, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_168", @@ -2689,6 +2857,7 @@ }, { "id": 10706, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_169", @@ -2705,6 +2874,7 @@ }, { "id": 10707, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_170", @@ -2721,6 +2891,7 @@ }, { "id": 10708, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_171", @@ -2737,6 +2908,7 @@ }, { "id": 10709, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_172", @@ -2753,6 +2925,7 @@ }, { "id": 10710, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_173", @@ -2769,6 +2942,7 @@ }, { "id": 10801, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_174", @@ -2785,6 +2959,7 @@ }, { "id": 10802, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_175", @@ -2801,6 +2976,7 @@ }, { "id": 10803, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_176", @@ -2817,6 +2993,7 @@ }, { "id": 10804, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_177", @@ -2833,6 +3010,7 @@ }, { "id": 10805, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_178", @@ -2849,6 +3027,7 @@ }, { "id": 10806, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_179", @@ -2865,6 +3044,7 @@ }, { "id": 10807, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_180", @@ -2881,6 +3061,7 @@ }, { "id": 10808, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_181", @@ -2897,6 +3078,7 @@ }, { "id": 10809, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_182", @@ -2913,6 +3095,7 @@ }, { "id": 10810, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_183", @@ -2929,6 +3112,7 @@ }, { "id": 2008001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_184", @@ -2945,6 +3129,7 @@ }, { "id": 2012001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_185", @@ -2961,6 +3146,7 @@ }, { "id": 2018001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_186", @@ -2977,6 +3163,7 @@ }, { "id": 2024001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_187", @@ -2993,6 +3180,7 @@ }, { "id": 2047001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_188", @@ -3009,6 +3197,7 @@ }, { "id": 2062001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_189", @@ -3025,6 +3214,7 @@ }, { "id": 2064001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_190", @@ -3041,6 +3231,7 @@ }, { "id": 2130001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_191", @@ -3057,6 +3248,7 @@ }, { "id": 3008001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_192", @@ -3073,6 +3265,7 @@ }, { "id": 3012001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_193", @@ -3089,6 +3282,7 @@ }, { "id": 3018001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_194", @@ -3105,6 +3299,7 @@ }, { "id": 3024001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_195", @@ -3121,6 +3316,7 @@ }, { "id": 3047001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_196", @@ -3137,6 +3333,7 @@ }, { "id": 3061001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_197", @@ -3153,6 +3350,7 @@ }, { "id": 3064001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_198", @@ -3169,6 +3367,7 @@ }, { "id": 3088001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_199", @@ -3185,6 +3384,7 @@ }, { "id": 3105001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_200", @@ -3201,6 +3401,7 @@ }, { "id": 3104001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_201", @@ -3217,6 +3418,7 @@ }, { "id": 3130001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_202", @@ -3233,6 +3435,7 @@ }, { "id": 4008001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_203", @@ -3249,6 +3452,7 @@ }, { "id": 4008002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_204", @@ -3265,6 +3469,7 @@ }, { "id": 4008003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_205", @@ -3281,6 +3486,7 @@ }, { "id": 4008004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_206", @@ -3297,6 +3503,7 @@ }, { "id": 4008005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_207", @@ -3313,6 +3520,7 @@ }, { "id": 4008006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_208", @@ -3329,6 +3537,7 @@ }, { "id": 4008007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_209", @@ -3345,6 +3554,7 @@ }, { "id": 4008008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_210", @@ -3361,6 +3571,7 @@ }, { "id": 4008009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_211", @@ -3377,6 +3588,7 @@ }, { "id": 4008010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_212", @@ -3393,6 +3605,7 @@ }, { "id": 4010001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_213", @@ -3409,6 +3622,7 @@ }, { "id": 4010002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_214", @@ -3425,6 +3639,7 @@ }, { "id": 4010003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_215", @@ -3441,6 +3656,7 @@ }, { "id": 4010004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_216", @@ -3457,6 +3673,7 @@ }, { "id": 4010005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_217", @@ -3473,6 +3690,7 @@ }, { "id": 4010006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_218", @@ -3489,6 +3707,7 @@ }, { "id": 4011001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_219", @@ -3505,6 +3724,7 @@ }, { "id": 4011002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_220", @@ -3521,6 +3741,7 @@ }, { "id": 4011003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_221", @@ -3537,6 +3758,7 @@ }, { "id": 4011004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_222", @@ -3553,6 +3775,7 @@ }, { "id": 4011005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_223", @@ -3569,6 +3792,7 @@ }, { "id": 4011006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_224", @@ -3585,6 +3809,7 @@ }, { "id": 4011007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_225", @@ -3601,6 +3826,7 @@ }, { "id": 4011008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_226", @@ -3617,6 +3843,7 @@ }, { "id": 4011009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_227", @@ -3633,6 +3860,7 @@ }, { "id": 4011010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_228", @@ -3649,6 +3877,7 @@ }, { "id": 4011011, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_229", @@ -3665,6 +3894,7 @@ }, { "id": 4012001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_230", @@ -3681,6 +3911,7 @@ }, { "id": 4012002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_231", @@ -3697,6 +3928,7 @@ }, { "id": 4012003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_232", @@ -3713,6 +3945,7 @@ }, { "id": 4012004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_233", @@ -3729,6 +3962,7 @@ }, { "id": 4012005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_234", @@ -3745,6 +3979,7 @@ }, { "id": 4012006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_235", @@ -3761,6 +3996,7 @@ }, { "id": 4012007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_236", @@ -3777,6 +4013,7 @@ }, { "id": 4012008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_237", @@ -3793,6 +4030,7 @@ }, { "id": 4012009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_238", @@ -3809,6 +4047,7 @@ }, { "id": 4016001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_239", @@ -3825,6 +4064,7 @@ }, { "id": 4016002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_240", @@ -3841,6 +4081,7 @@ }, { "id": 4016003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_241", @@ -3857,6 +4098,7 @@ }, { "id": 4016004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_242", @@ -3873,6 +4115,7 @@ }, { "id": 4016005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_243", @@ -3889,6 +4132,7 @@ }, { "id": 4016006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_244", @@ -3905,6 +4149,7 @@ }, { "id": 4016007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_245", @@ -3921,6 +4166,7 @@ }, { "id": 4016008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_246", @@ -3937,6 +4183,7 @@ }, { "id": 4016009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_247", @@ -3953,6 +4200,7 @@ }, { "id": 4018001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_248", @@ -3969,6 +4217,7 @@ }, { "id": 4018002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_249", @@ -3985,6 +4234,7 @@ }, { "id": 4018003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_250", @@ -4001,6 +4251,7 @@ }, { "id": 4018004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_251", @@ -4017,6 +4268,7 @@ }, { "id": 4018005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_252", @@ -4033,6 +4285,7 @@ }, { "id": 4018006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_253", @@ -4049,6 +4302,7 @@ }, { "id": 4018007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_254", @@ -4065,6 +4319,7 @@ }, { "id": 4018008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_255", @@ -4081,6 +4336,7 @@ }, { "id": 4018009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_256", @@ -4097,6 +4353,7 @@ }, { "id": 4018010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_257", @@ -4113,6 +4370,7 @@ }, { "id": 4018011, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_258", @@ -4129,6 +4387,7 @@ }, { "id": 4018012, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_259", @@ -4145,6 +4404,7 @@ }, { "id": 4020001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_260", @@ -4161,6 +4421,7 @@ }, { "id": 4020002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_261", @@ -4177,6 +4438,7 @@ }, { "id": 4020003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_262", @@ -4193,6 +4455,7 @@ }, { "id": 4020004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_263", @@ -4209,6 +4472,7 @@ }, { "id": 4020005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_264", @@ -4225,6 +4489,7 @@ }, { "id": 4020006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_265", @@ -4241,6 +4506,7 @@ }, { "id": 4043001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_266", @@ -4257,6 +4523,7 @@ }, { "id": 4043002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_267", @@ -4273,6 +4540,7 @@ }, { "id": 4043003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_268", @@ -4289,6 +4557,7 @@ }, { "id": 4043004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_269", @@ -4305,6 +4574,7 @@ }, { "id": 4043005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_270", @@ -4321,6 +4591,7 @@ }, { "id": 4043006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_271", @@ -4337,6 +4608,7 @@ }, { "id": 4043007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_272", @@ -4353,6 +4625,7 @@ }, { "id": 4043008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_273", @@ -4369,6 +4642,7 @@ }, { "id": 4043009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_274", @@ -4385,6 +4659,7 @@ }, { "id": 4043010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_275", @@ -4401,6 +4676,7 @@ }, { "id": 4047001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_276", @@ -4417,6 +4693,7 @@ }, { "id": 4047002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_277", @@ -4433,6 +4710,7 @@ }, { "id": 4047003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_278", @@ -4449,6 +4727,7 @@ }, { "id": 4047004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_279", @@ -4465,6 +4744,7 @@ }, { "id": 4047005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_280", @@ -4481,6 +4761,7 @@ }, { "id": 4047006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_281", @@ -4497,6 +4778,7 @@ }, { "id": 4047007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_282", @@ -4513,6 +4795,7 @@ }, { "id": 4047008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_283", @@ -4529,6 +4812,7 @@ }, { "id": 4047009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_284", @@ -4545,6 +4829,7 @@ }, { "id": 4047010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_285", @@ -4561,6 +4846,7 @@ }, { "id": 4047011, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_286", @@ -4577,6 +4863,7 @@ }, { "id": 4047012, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_287", @@ -4593,6 +4880,7 @@ }, { "id": 4047013, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_288", @@ -4609,6 +4897,7 @@ }, { "id": 4064001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_289", @@ -4625,6 +4914,7 @@ }, { "id": 4064002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_290", @@ -4641,6 +4931,7 @@ }, { "id": 4064003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_291", @@ -4657,6 +4948,7 @@ }, { "id": 4064004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_292", @@ -4673,6 +4965,7 @@ }, { "id": 4064005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_293", @@ -4689,6 +4982,7 @@ }, { "id": 4064006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_294", @@ -4705,6 +4999,7 @@ }, { "id": 4064007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_295", @@ -4721,6 +5016,7 @@ }, { "id": 4068001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_296", @@ -4737,6 +5033,7 @@ }, { "id": 4068002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_297", @@ -4753,6 +5050,7 @@ }, { "id": 4068003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_298", @@ -4769,6 +5067,7 @@ }, { "id": 4068004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_299", @@ -4785,6 +5084,7 @@ }, { "id": 4084001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_300", @@ -4801,6 +5101,7 @@ }, { "id": 4084002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_301", @@ -4817,6 +5118,7 @@ }, { "id": 4084003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_302", @@ -4833,6 +5135,7 @@ }, { "id": 4084004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_303", @@ -4849,6 +5152,7 @@ }, { "id": 4085001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_304", @@ -4865,6 +5169,7 @@ }, { "id": 4085002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_305", @@ -4881,6 +5186,7 @@ }, { "id": 4085003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_306", @@ -4897,6 +5203,7 @@ }, { "id": 4085004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_307", @@ -4913,6 +5220,7 @@ }, { "id": 4085005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_308", @@ -4929,6 +5237,7 @@ }, { "id": 4096001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_309", @@ -4945,6 +5254,7 @@ }, { "id": 4096002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_310", @@ -4961,6 +5271,7 @@ }, { "id": 4096003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_311", @@ -4977,6 +5288,7 @@ }, { "id": 4096004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_312", @@ -4993,6 +5305,7 @@ }, { "id": 4096005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_313", @@ -5009,6 +5322,7 @@ }, { "id": 4096006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_314", @@ -5025,6 +5339,7 @@ }, { "id": 4096007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_315", @@ -5041,6 +5356,7 @@ }, { "id": 4096008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_316", @@ -5057,6 +5373,7 @@ }, { "id": 4096009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_317", @@ -5073,6 +5390,7 @@ }, { "id": 4096010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_318", @@ -5089,6 +5407,7 @@ }, { "id": 4096011, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_319", @@ -5105,6 +5424,7 @@ }, { "id": 4096012, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_320", @@ -5121,6 +5441,7 @@ }, { "id": 4104001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_321", @@ -5137,6 +5458,7 @@ }, { "id": 4104002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_322", @@ -5153,6 +5475,7 @@ }, { "id": 4104003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_323", @@ -5169,6 +5492,7 @@ }, { "id": 4104004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_324", @@ -5185,6 +5509,7 @@ }, { "id": 4104005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_325", @@ -5201,6 +5526,7 @@ }, { "id": 4104006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_326", @@ -5217,6 +5543,7 @@ }, { "id": 4104007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_327", @@ -5233,6 +5560,7 @@ }, { "id": 4104008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_328", @@ -5249,6 +5577,7 @@ }, { "id": 4104009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_329", @@ -5265,6 +5594,7 @@ }, { "id": 4104010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_330", @@ -5281,6 +5611,7 @@ }, { "id": 4104011, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_331", @@ -5297,6 +5628,7 @@ }, { "id": 4128001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_332", @@ -5313,6 +5645,7 @@ }, { "id": 4128002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_333", @@ -5329,6 +5662,7 @@ }, { "id": 4128003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_334", @@ -5345,6 +5679,7 @@ }, { "id": 4128004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_335", @@ -5361,6 +5696,7 @@ }, { "id": 4128005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_336", @@ -5377,6 +5713,7 @@ }, { "id": 4128006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_337", @@ -5393,6 +5730,7 @@ }, { "id": 4128007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_338", @@ -5409,6 +5747,7 @@ }, { "id": 4128008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_339", @@ -5425,6 +5764,7 @@ }, { "id": 4128009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_340", @@ -5441,6 +5781,7 @@ }, { "id": 4128010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_341", @@ -5457,6 +5798,7 @@ }, { "id": 4131001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_342", @@ -5473,6 +5815,7 @@ }, { "id": 4131002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_343", @@ -5489,6 +5832,7 @@ }, { "id": 4131003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_344", @@ -5505,6 +5849,7 @@ }, { "id": 4131004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_345", @@ -5521,6 +5866,7 @@ }, { "id": 4131005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_346", @@ -5537,6 +5883,7 @@ }, { "id": 4131006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_347", @@ -5553,6 +5900,7 @@ }, { "id": 4131007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_348", @@ -5569,6 +5917,7 @@ }, { "id": 4131008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_349", @@ -5585,6 +5934,7 @@ }, { "id": 4131009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_350", @@ -5601,6 +5951,7 @@ }, { "id": 4131010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_351", @@ -5617,6 +5968,7 @@ }, { "id": 5011001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_352", @@ -5633,6 +5985,7 @@ }, { "id": 5012001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_353", @@ -5649,6 +6002,7 @@ }, { "id": 5018001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_354", @@ -5665,6 +6019,7 @@ }, { "id": 5024001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_355", @@ -5681,6 +6036,7 @@ }, { "id": 5047001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_356", @@ -5697,6 +6053,7 @@ }, { "id": 5063001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_357", @@ -5713,6 +6070,7 @@ }, { "id": 5068001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_358", @@ -5729,6 +6087,7 @@ }, { "id": 5104001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_359", @@ -5745,6 +6104,7 @@ }, { "id": 20001, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_360", @@ -5761,6 +6121,7 @@ }, { "id": 20002, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_361", @@ -5777,6 +6138,7 @@ }, { "id": 30001, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_362", @@ -5793,6 +6155,7 @@ }, { "id": 30002, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_363", @@ -5809,6 +6172,7 @@ }, { "id": 30003, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_364", @@ -5825,6 +6189,7 @@ }, { "id": 30004, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_365", @@ -5841,6 +6206,7 @@ }, { "id": 30005, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_366", @@ -5857,6 +6223,7 @@ }, { "id": 30006, + "data": 2, "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_367", @@ -5873,14 +6240,15 @@ }, { "id": 600001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_368", - "text": "为阿宝穿戴3件基础装备" + "text": "为阿宝穿戴3件任意装备" }, "type": 5, "valid": 0, - "NPC": 0, + "NPC": 10141, "data1": 3, "data2": 25001, "data3": 0, @@ -5889,6 +6257,7 @@ }, { "id": 600002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_369", @@ -5896,7 +6265,7 @@ }, "type": 92, "valid": 0, - "NPC": 0, + "NPC": 10151, "data1": 3, "data2": 0, "data3": 0, @@ -5905,6 +6274,7 @@ }, { "id": 600003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_370", @@ -5912,7 +6282,7 @@ }, "type": 46, "valid": 0, - "NPC": 0, + "NPC": 10161, "data1": 1, "data2": 3, "data3": 1, @@ -5921,6 +6291,7 @@ }, { "id": 600004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_371", @@ -5928,7 +6299,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10171, "data1": 1, "data2": 2, "data3": 1, @@ -5937,6 +6308,7 @@ }, { "id": 600005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_372", @@ -5944,7 +6316,7 @@ }, "type": 42, "valid": 0, - "NPC": 0, + "NPC": 10181, "data1": 1, "data2": 6, "data3": 3, @@ -5953,6 +6325,7 @@ }, { "id": 600006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_373", @@ -5960,7 +6333,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10191, "data1": 1100206, "data2": 0, "data3": 0, @@ -5969,6 +6342,7 @@ }, { "id": 600007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_374", @@ -5976,7 +6350,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": 10201, "data1": 6, "data2": 6, "data3": 0, @@ -5985,6 +6359,7 @@ }, { "id": 600008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_375", @@ -5992,7 +6367,7 @@ }, "type": 149, "valid": 0, - "NPC": 0, + "NPC": 10211, "data1": 1, "data2": 0, "data3": 0, @@ -6001,6 +6376,7 @@ }, { "id": 600009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_376", @@ -6008,7 +6384,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10221, "data1": 1, "data2": 11, "data3": 2, @@ -6017,22 +6393,24 @@ }, { "id": 600010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_377", - "text": "功夫大师挑战塔5层" + "text": "功夫大师BOSS1挑战塔5层" }, - "type": 0, + "type": 168, "valid": 0, - "NPC": 0, - "data1": 0, - "data2": 0, + "NPC": 10231, + "data1": 5, + "data2": 1, "data3": 0, "data4": 0, "data5": 0 }, { "id": 600011, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_378", @@ -6040,7 +6418,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10241, "data1": 1100301, "data2": 0, "data3": 0, @@ -6049,6 +6427,7 @@ }, { "id": 600012, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_379", @@ -6056,7 +6435,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10251, "data1": 1100306, "data2": 0, "data3": 0, @@ -6065,6 +6444,7 @@ }, { "id": 600013, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_380", @@ -6072,7 +6452,7 @@ }, "type": 0, "valid": 0, - "NPC": 0, + "NPC": 10261, "data1": 0, "data2": 0, "data3": 0, @@ -6081,6 +6461,7 @@ }, { "id": 600014, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_381", @@ -6088,7 +6469,7 @@ }, "type": 34, "valid": 0, - "NPC": 0, + "NPC": 10271, "data1": 1, "data2": 1, "data3": 0, @@ -6097,6 +6478,7 @@ }, { "id": 600015, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_382", @@ -6104,7 +6486,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": 10281, "data1": 9, "data2": 6, "data3": 0, @@ -6113,6 +6495,7 @@ }, { "id": 600016, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_383", @@ -6120,7 +6503,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10291, "data1": 1100406, "data2": 0, "data3": 0, @@ -6129,6 +6512,7 @@ }, { "id": 600017, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_384", @@ -6136,7 +6520,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10301, "data1": 1, "data2": 21, "data3": 2, @@ -6145,6 +6529,7 @@ }, { "id": 600018, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_385", @@ -6152,7 +6537,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": 10311, "data1": 12, "data2": 6, "data3": 0, @@ -6161,6 +6546,7 @@ }, { "id": 600019, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_386", @@ -6168,7 +6554,7 @@ }, "type": 152, "valid": 0, - "NPC": 0, + "NPC": 10321, "data1": 3, "data2": 0, "data3": 0, @@ -6177,22 +6563,24 @@ }, { "id": 600020, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_387", - "text": "功夫大师挑战塔10层" + "text": "功夫大师BOSS1挑战塔10层" }, - "type": 0, + "type": 168, "valid": 0, - "NPC": 0, - "data1": 0, - "data2": 0, + "NPC": 10331, + "data1": 10, + "data2": 1, "data3": 0, "data4": 0, "data5": 0 }, { "id": 600021, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_388", @@ -6200,7 +6588,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10341, "data1": 1100506, "data2": 0, "data3": 0, @@ -6209,15 +6597,16 @@ }, { "id": 600022, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_389", - "text": "穿指定套装2套(从解锁的装备boss套装里选)" + "text": "穿指定套装1套(从解锁的装备boss套装里选)" }, - "type": 0, + "type": 169, "valid": 0, - "NPC": 0, - "data1": 0, + "NPC": 10351, + "data1": 1, "data2": 0, "data3": 0, "data4": 0, @@ -6225,6 +6614,7 @@ }, { "id": 600023, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_390", @@ -6232,7 +6622,7 @@ }, "type": 109, "valid": 0, - "NPC": 0, + "NPC": 10361, "data1": 0, "data2": 0, "data3": 0, @@ -6241,6 +6631,7 @@ }, { "id": 600024, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_391", @@ -6248,7 +6639,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10371, "data1": 1, "data2": 21, "data3": 4, @@ -6257,6 +6648,7 @@ }, { "id": 600025, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_392", @@ -6264,7 +6656,7 @@ }, "type": 0, "valid": 0, - "NPC": 0, + "NPC": 10381, "data1": 0, "data2": 0, "data3": 0, @@ -6273,22 +6665,24 @@ }, { "id": 600026, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_393", - "text": "收集25个觉醒材料" + "text": "收集5个冷水药剂" }, - "type": 0, + "type": 170, "valid": 0, - "NPC": 0, - "data1": 0, - "data2": 0, + "NPC": 10391, + "data1": 5, + "data2": 14010212, "data3": 0, "data4": 0, "data5": 0 }, { "id": 600027, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_394", @@ -6296,7 +6690,7 @@ }, "type": 34, "valid": 0, - "NPC": 0, + "NPC": 10401, "data1": 1, "data2": 3, "data3": 0, @@ -6305,6 +6699,7 @@ }, { "id": 600028, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_395", @@ -6312,7 +6707,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10411, "data1": 1100606, "data2": 0, "data3": 0, @@ -6321,6 +6716,7 @@ }, { "id": 600029, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_396", @@ -6328,7 +6724,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": 10421, "data1": 12, "data2": 9, "data3": 0, @@ -6337,6 +6733,7 @@ }, { "id": 600030, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_397", @@ -6344,7 +6741,7 @@ }, "type": 131, "valid": 0, - "NPC": 0, + "NPC": 10431, "data1": 3, "data2": 0, "data3": 0, @@ -6353,6 +6750,7 @@ }, { "id": 600031, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_398", @@ -6360,7 +6758,7 @@ }, "type": 0, "valid": 0, - "NPC": 0, + "NPC": 10441, "data1": 0, "data2": 0, "data3": 0, @@ -6369,6 +6767,7 @@ }, { "id": 600032, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_399", @@ -6376,7 +6775,7 @@ }, "type": 34, "valid": 0, - "NPC": 0, + "NPC": 10451, "data1": 3, "data2": 3, "data3": 0, @@ -6385,6 +6784,7 @@ }, { "id": 600033, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_400", @@ -6392,7 +6792,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10461, "data1": 1100706, "data2": 0, "data3": 0, @@ -6401,6 +6801,7 @@ }, { "id": 600034, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_401", @@ -6408,7 +6809,7 @@ }, "type": 50, "valid": 0, - "NPC": 0, + "NPC": 10471, "data1": 12, "data2": 4, "data3": 0, @@ -6417,22 +6818,24 @@ }, { "id": 600035, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_402", - "text": "功夫大师挑战塔20层" + "text": "功夫大师挑战塔boss2的5层" }, - "type": 0, + "type": 168, "valid": 0, - "NPC": 0, - "data1": 0, - "data2": 0, + "NPC": 10481, + "data1": 5, + "data2": 2, "data3": 0, "data4": 0, "data5": 0 }, { "id": 600036, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_403", @@ -6440,7 +6843,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10491, "data1": 1100806, "data2": 0, "data3": 0, @@ -6449,6 +6852,7 @@ }, { "id": 600037, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_404", @@ -6456,7 +6860,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10501, "data1": 1, "data2": 11, "data3": 6, @@ -6465,6 +6869,7 @@ }, { "id": 600038, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_405", @@ -6472,7 +6877,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": 10511, "data1": 18, "data2": 9, "data3": 0, @@ -6481,6 +6886,7 @@ }, { "id": 600039, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_406", @@ -6488,7 +6894,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10521, "data1": 1100906, "data2": 0, "data3": 0, @@ -6497,6 +6903,7 @@ }, { "id": 600040, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_407", @@ -6504,7 +6911,7 @@ }, "type": 34, "valid": 0, - "NPC": 0, + "NPC": 10531, "data1": 4, "data2": 3, "data3": 0, @@ -6513,6 +6920,7 @@ }, { "id": 600041, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_408", @@ -6520,7 +6928,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10541, "data1": 11001006, "data2": 0, "data3": 0, @@ -6529,6 +6937,7 @@ }, { "id": 600042, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_409", @@ -6536,7 +6945,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10551, "data1": 1, "data2": 21, "data3": 6, @@ -6545,6 +6954,7 @@ }, { "id": 600043, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_410", @@ -6552,7 +6962,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": 10561, "data1": 8, "data2": 12, "data3": 0, @@ -6561,6 +6971,7 @@ }, { "id": 600044, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_411", @@ -6568,7 +6979,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10571, "data1": 11001106, "data2": 0, "data3": 0, @@ -6577,6 +6988,7 @@ }, { "id": 600045, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_412", @@ -6584,7 +6996,7 @@ }, "type": 131, "valid": 0, - "NPC": 0, + "NPC": 10581, "data1": 10, "data2": 0, "data3": 0, @@ -6593,6 +7005,7 @@ }, { "id": 600046, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_413", @@ -6600,7 +7013,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10591, "data1": 11001206, "data2": 0, "data3": 0, @@ -6609,6 +7022,7 @@ }, { "id": 600047, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_414", @@ -6616,7 +7030,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10601, "data1": 1200103, "data2": 0, "data3": 0, @@ -6625,6 +7039,7 @@ }, { "id": 600048, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_415", @@ -6632,7 +7047,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10611, "data1": 1200106, "data2": 0, "data3": 0, @@ -6641,6 +7056,7 @@ }, { "id": 600049, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_416", @@ -6648,7 +7064,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10621, "data1": 1200203, "data2": 0, "data3": 0, @@ -6657,6 +7073,7 @@ }, { "id": 600050, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_417", @@ -6664,7 +7081,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10631, "data1": 1200206, "data2": 0, "data3": 0, @@ -6673,6 +7090,7 @@ }, { "id": 600051, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_418", @@ -6680,7 +7098,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10641, "data1": 1200303, "data2": 0, "data3": 0, @@ -6689,6 +7107,7 @@ }, { "id": 600052, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_419", @@ -6696,7 +7115,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10651, "data1": 1200306, "data2": 0, "data3": 0, @@ -6705,6 +7124,7 @@ }, { "id": 600053, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_420", @@ -6712,7 +7132,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10661, "data1": 1200403, "data2": 0, "data3": 0, @@ -6721,6 +7141,7 @@ }, { "id": 600054, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_421", @@ -6728,7 +7149,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10671, "data1": 1200406, "data2": 0, "data3": 0, @@ -6737,6 +7158,7 @@ }, { "id": 600055, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_422", @@ -6744,7 +7166,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10681, "data1": 1200503, "data2": 0, "data3": 0, @@ -6753,6 +7175,7 @@ }, { "id": 600056, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_423", @@ -6760,7 +7183,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10691, "data1": 1200506, "data2": 0, "data3": 0, @@ -6769,6 +7192,7 @@ }, { "id": 600057, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_424", @@ -6776,7 +7200,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10701, "data1": 1200603, "data2": 0, "data3": 0, @@ -6785,6 +7209,7 @@ }, { "id": 600058, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_425", @@ -6792,7 +7217,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10711, "data1": 1200606, "data2": 0, "data3": 0, @@ -6801,6 +7226,7 @@ }, { "id": 600059, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_426", @@ -6808,7 +7234,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10721, "data1": 1200703, "data2": 0, "data3": 0, @@ -6817,6 +7243,7 @@ }, { "id": 600060, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_427", @@ -6824,7 +7251,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10731, "data1": 1200706, "data2": 0, "data3": 0, @@ -6833,6 +7260,7 @@ }, { "id": 600061, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_428", @@ -6840,7 +7268,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10741, "data1": 1200803, "data2": 0, "data3": 0, @@ -6849,6 +7277,7 @@ }, { "id": 600062, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_429", @@ -6856,7 +7285,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10751, "data1": 1200806, "data2": 0, "data3": 0, @@ -6865,6 +7294,7 @@ }, { "id": 600063, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_430", @@ -6872,7 +7302,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10761, "data1": 1200903, "data2": 0, "data3": 0, @@ -6881,6 +7311,7 @@ }, { "id": 600064, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_431", @@ -6888,7 +7319,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10771, "data1": 1200906, "data2": 0, "data3": 0, @@ -6897,6 +7328,7 @@ }, { "id": 600065, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_432", @@ -6904,7 +7336,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10781, "data1": 12001003, "data2": 0, "data3": 0, @@ -6913,6 +7345,7 @@ }, { "id": 600066, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_433", @@ -6920,7 +7353,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10791, "data1": 12001006, "data2": 0, "data3": 0, @@ -6929,6 +7362,7 @@ }, { "id": 600067, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_434", @@ -6936,7 +7370,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10801, "data1": 12001103, "data2": 0, "data3": 0, @@ -6945,6 +7379,7 @@ }, { "id": 600068, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_435", @@ -6952,7 +7387,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10811, "data1": 12001106, "data2": 0, "data3": 0, @@ -6961,6 +7396,7 @@ }, { "id": 600069, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_436", @@ -6968,7 +7404,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10821, "data1": 12001203, "data2": 0, "data3": 0, @@ -6977,6 +7413,7 @@ }, { "id": 600070, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_437", @@ -6984,7 +7421,7 @@ }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 10831, "data1": 12001206, "data2": 0, "data3": 0, @@ -6993,15 +7430,16 @@ }, { "id": 700001, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_438", "text": "浇花1次" }, - "type": 0, + "type": 171, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 1, "data2": 0, "data3": 0, "data4": 0, @@ -7009,15 +7447,16 @@ }, { "id": 700002, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_439", "text": "浇花2次" }, - "type": 0, + "type": 171, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 2, "data2": 0, "data3": 0, "data4": 0, @@ -7025,15 +7464,16 @@ }, { "id": 700003, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_440", "text": "浇花3次" }, - "type": 0, + "type": 171, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 3, "data2": 0, "data3": 0, "data4": 0, @@ -7041,6 +7481,7 @@ }, { "id": 700004, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_441", @@ -7057,6 +7498,7 @@ }, { "id": 700005, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_442", @@ -7073,6 +7515,7 @@ }, { "id": 700006, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_443", @@ -7089,6 +7532,7 @@ }, { "id": 700007, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_444", @@ -7105,6 +7549,7 @@ }, { "id": 700008, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_445", @@ -7121,6 +7566,7 @@ }, { "id": 700009, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_446", @@ -7137,6 +7583,7 @@ }, { "id": 700010, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_447", @@ -7153,15 +7600,16 @@ }, { "id": 700011, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_448", "text": "连续战斗10次" }, - "type": 0, + "type": 172, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 10, "data2": 0, "data3": 0, "data4": 0, @@ -7169,6 +7617,7 @@ }, { "id": 700012, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_449", @@ -7185,6 +7634,7 @@ }, { "id": 700013, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_450", @@ -7201,15 +7651,16 @@ }, { "id": 700014, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_451", "text": "使用星象1次" }, - "type": 0, + "type": 173, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 1, "data2": 0, "data3": 0, "data4": 0, @@ -7217,6 +7668,7 @@ }, { "id": 700015, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_452", @@ -7233,6 +7685,7 @@ }, { "id": 700016, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_453", @@ -7249,6 +7702,7 @@ }, { "id": 700017, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_454", @@ -7265,6 +7719,7 @@ }, { "id": 700018, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_455", @@ -7281,6 +7736,7 @@ }, { "id": 700019, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_456", @@ -7297,6 +7753,7 @@ }, { "id": 700020, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_457", @@ -7313,22 +7770,24 @@ }, { "id": 700021, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_458", - "text": "特殊商城消耗特殊货币10" + "text": "特殊商城金币10000" }, - "type": 0, + "type": 67, "valid": 0, "NPC": 0, - "data1": 0, - "data2": 0, + "data1": 10000, + "data2": 1, "data3": 0, "data4": 0, "data5": 0 }, { "id": 700022, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_459", @@ -7345,6 +7804,7 @@ }, { "id": 700023, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_460", @@ -7361,6 +7821,7 @@ }, { "id": 700024, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_461", @@ -7377,22 +7838,24 @@ }, { "id": 700025, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_462", "text": "5星卡技能升满" }, - "type": 0, + "type": 174, "valid": 0, "NPC": 0, - "data1": 0, - "data2": 0, + "data1": 5, + "data2": 5, "data3": 0, "data4": 0, "data5": 0 }, { "id": 700026, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_463", @@ -7409,6 +7872,7 @@ }, { "id": 700027, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_464", @@ -7425,6 +7889,7 @@ }, { "id": 700028, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_465", @@ -7441,15 +7906,16 @@ }, { "id": 700029, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_466", "text": "将炉温拉满1次" }, - "type": 0, + "type": 175, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 100, "data2": 0, "data3": 0, "data4": 0, @@ -7457,6 +7923,7 @@ }, { "id": 700030, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_467", @@ -7473,6 +7940,7 @@ }, { "id": 700031, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_468", @@ -7489,15 +7957,16 @@ }, { "id": 700032, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_469", "text": "解锁1个新图纸" }, - "type": 0, + "type": 177, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 1, "data2": 0, "data3": 0, "data4": 0, @@ -7505,15 +7974,16 @@ }, { "id": 700033, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_470", "text": "解锁4个新图纸" }, - "type": 0, + "type": 177, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 4, "data2": 0, "data3": 0, "data4": 0, @@ -7521,15 +7991,16 @@ }, { "id": 700034, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_471", "text": "解锁6个新图纸" }, - "type": 0, + "type": 177, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 6, "data2": 0, "data3": 0, "data4": 0, @@ -7537,54 +8008,58 @@ }, { "id": 700035, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_472", - "text": "解锁2阶段装备图纸" + "text": "解锁2阶段装备1个图纸" }, - "type": 0, + "type": 179, "valid": 0, "NPC": 0, - "data1": 0, - "data2": 0, + "data1": 1, + "data2": 2, "data3": 0, "data4": 0, "data5": 0 }, { "id": 700036, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_473", - "text": "解锁3阶段装备图纸" + "text": "解锁3阶段装备1个图纸" }, - "type": 0, + "type": 179, "valid": 0, "NPC": 0, - "data1": 0, - "data2": 0, + "data1": 1, + "data2": 3, "data3": 0, "data4": 0, "data5": 0 }, { "id": 700037, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_474", - "text": "解锁5阶段装备图纸" + "text": "解锁5阶段装备1个图纸" }, - "type": 0, + "type": 179, "valid": 0, "NPC": 0, - "data1": 0, - "data2": 0, + "data1": 1, + "data2": 5, "data3": 0, "data4": 0, "data5": 0 }, { "id": 700038, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_475", @@ -7601,38 +8076,41 @@ }, { "id": 700039, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_476", - "text": "B装备副本难度3" + "text": "指定武器副本BOSS难度3" }, "type": 73, "valid": 0, "NPC": 0, "data1": 1, - "data2": 21, + "data2": 11, "data3": 3, "data4": 0, "data5": 0 }, { "id": 700040, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_477", - "text": "在装备副本使用好友助战难度5" + "text": "在装备副本使用好友助战1次" }, - "type": 0, + "type": 180, "valid": 0, "NPC": 0, - "data1": 0, - "data2": 0, + "data1": 1, + "data2": 1, "data3": 0, "data4": 0, "data5": 0 }, { "id": 700041, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_478", @@ -7649,6 +8127,7 @@ }, { "id": 700042, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_479", @@ -7665,6 +8144,7 @@ }, { "id": 700043, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_480", @@ -7681,10 +8161,11 @@ }, { "id": 700044, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_481", - "text": "A装备副本难度6+" + "text": "指定武器副本BOSS难度6" }, "type": 73, "valid": 0, @@ -7697,10 +8178,11 @@ }, { "id": 700045, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_482", - "text": "B装备副本难度5+" + "text": "指定饰品副本BOSS难度5" }, "type": 73, "valid": 0, @@ -7713,10 +8195,11 @@ }, { "id": 700046, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_483", - "text": "A装备副本难度7+" + "text": "指定武器副本BOSS难度7" }, "type": 73, "valid": 0, @@ -7729,10 +8212,11 @@ }, { "id": 700047, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_484", - "text": "B装备副本难度6+" + "text": "指定饰品副本BOSS难度6" }, "type": 73, "valid": 0, @@ -7745,6 +8229,7 @@ }, { "id": 700048, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_485", @@ -7761,10 +8246,11 @@ }, { "id": 700049, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_486", - "text": "A装备副本难度8" + "text": "指定武器BOSS难度8" }, "type": 73, "valid": 0, @@ -7777,10 +8263,11 @@ }, { "id": 700050, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_487", - "text": "B装备副本难度7" + "text": "指定饰品BOSS难度7" }, "type": 73, "valid": 0, @@ -7793,6 +8280,7 @@ }, { "id": 700052, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_489", @@ -7809,6 +8297,7 @@ }, { "id": 700053, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_490", @@ -7825,6 +8314,7 @@ }, { "id": 700054, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_491", @@ -7841,6 +8331,7 @@ }, { "id": 700056, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_493", @@ -7857,6 +8348,7 @@ }, { "id": 700057, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_494", @@ -7873,6 +8365,7 @@ }, { "id": 700058, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_495", @@ -7889,6 +8382,7 @@ }, { "id": 700060, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_497", @@ -7905,38 +8399,41 @@ }, { "id": 700061, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_498", - "text": "A装备副本难度10(自动战斗）" + "text": "自动战斗装备副本难度5" }, - "type": 0, + "type": 181, "valid": 0, "NPC": 0, - "data1": 0, - "data2": 0, - "data3": 0, + "data1": 1, + "data2": 1, + "data3": 5, "data4": 0, "data5": 0 }, { "id": 700062, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_499", - "text": "B装备副本难度10(自动战斗）" + "text": "自动战斗装备副本难度10" }, - "type": 0, + "type": 181, "valid": 0, "NPC": 0, - "data1": 0, - "data2": 0, - "data3": 0, + "data1": 1, + "data2": 1, + "data3": 10, "data4": 0, "data5": 0 }, { "id": 700064, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_501", @@ -7953,6 +8450,7 @@ }, { "id": 700065, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_502", @@ -7969,6 +8467,7 @@ }, { "id": 700066, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_503", @@ -7985,6 +8484,7 @@ }, { "id": 700067, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_504", @@ -8001,15 +8501,16 @@ }, { "id": 700068, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_505", "text": "抵御踢馆2次" }, - "type": 0, + "type": 182, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 2, "data2": 0, "data3": 0, "data4": 0, @@ -8017,15 +8518,16 @@ }, { "id": 700069, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_506", "text": "抵御踢馆4次" }, - "type": 0, + "type": 182, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 4, "data2": 0, "data3": 0, "data4": 0, @@ -8033,15 +8535,16 @@ }, { "id": 700070, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_507", "text": "抵御踢馆6次" }, - "type": 0, + "type": 182, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 6, "data2": 0, "data3": 0, "data4": 0, @@ -8049,15 +8552,16 @@ }, { "id": 700071, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_508", "text": "去好友武馆踢馆1次" }, - "type": 0, + "type": 183, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 1, "data2": 0, "data3": 0, "data4": 0, @@ -8065,15 +8569,16 @@ }, { "id": 700072, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_509", "text": "使用好友武馆木桩1次" }, - "type": 0, + "type": 184, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 1, "data2": 0, "data3": 0, "data4": 0, @@ -8081,15 +8586,16 @@ }, { "id": 700073, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_510", "text": "完成一次每日1健" }, - "type": 0, + "type": 185, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 1, "data2": 0, "data3": 0, "data4": 0, @@ -8097,15 +8603,16 @@ }, { "id": 700074, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_511", "text": "完成一次每日3健" }, - "type": 0, + "type": 185, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 3, "data2": 0, "data3": 0, "data4": 0, @@ -8113,15 +8620,16 @@ }, { "id": 700075, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_512", "text": "完成一次每日5健" }, - "type": 0, + "type": 185, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 5, "data2": 0, "data3": 0, "data4": 0, @@ -8129,6 +8637,7 @@ }, { "id": 700076, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_513", @@ -8145,6 +8654,7 @@ }, { "id": 700077, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_514", @@ -8161,6 +8671,7 @@ }, { "id": 700078, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_515", @@ -8177,6 +8688,7 @@ }, { "id": 700079, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_516", @@ -8193,6 +8705,7 @@ }, { "id": 700080, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_517", @@ -8209,15 +8722,16 @@ }, { "id": 700081, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_518", "text": "武馆的派遣悬赏3次" }, - "type": 0, + "type": 186, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 3, "data2": 0, "data3": 0, "data4": 0, @@ -8225,15 +8739,16 @@ }, { "id": 700082, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_519", "text": "武馆的派遣悬赏8次" }, - "type": 0, + "type": 186, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 8, "data2": 0, "data3": 0, "data4": 0, @@ -8241,6 +8756,7 @@ }, { "id": 700083, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_520", @@ -8257,6 +8773,7 @@ }, { "id": 700084, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_521", @@ -8273,15 +8790,16 @@ }, { "id": 700085, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_522", "text": "武馆的派遣悬赏10次" }, - "type": 0, + "type": 186, "valid": 0, "NPC": 0, - "data1": 0, + "data1": 10, "data2": 0, "data3": 0, "data4": 0, @@ -8289,6 +8807,7 @@ }, { "id": 700086, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_523", @@ -8305,6 +8824,7 @@ }, { "id": 700087, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_524", @@ -8321,6 +8841,7 @@ }, { "id": 700088, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_525", @@ -8337,6 +8858,7 @@ }, { "id": 700089, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_526", @@ -8353,6 +8875,7 @@ }, { "id": 700090, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_527", @@ -8369,6 +8892,7 @@ }, { "id": 700091, + "data": 2, "type_sp": 0, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_528", diff --git a/cmd/v2/lib/storage/config.go b/cmd/v2/lib/storage/config.go index a61e783f8..8c39a6e00 100644 --- a/cmd/v2/lib/storage/config.go +++ b/cmd/v2/lib/storage/config.go @@ -42,6 +42,7 @@ type Config struct { ServiceDBInfo *pb.ServiceDBInfo `json:"serviceDBInfo,omitempty"` // JsonDir string `json:"jsonDir,omitempty"` //json配置目录 PingConf *PingConf `json:"pingConf,omitempty"` //ping配置 + MultiMgo map[string]*MgoDB `json:"multiMgo,omitempty"` //MongoDBMap } type PingConf struct { diff --git a/cmd/v2/ui/views/globalview.go b/cmd/v2/ui/views/globalview.go index 9f5a028c4..00bd97080 100644 --- a/cmd/v2/ui/views/globalview.go +++ b/cmd/v2/ui/views/globalview.go @@ -1,11 +1,17 @@ package formview import ( + "fmt" os_storage "go_dreamfactory/cmd/v2/lib/storage" "go_dreamfactory/cmd/v2/model" + "strings" "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" + "fyne.io/fyne/v2/data/binding" + "fyne.io/fyne/v2/dialog" + "fyne.io/fyne/v2/layout" + "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" "github.com/sirupsen/logrus" "github.com/spf13/cast" @@ -29,36 +35,90 @@ func (this *GlobalConfView) CreateView(t *model.TestCase) fyne.CanvasObject { logrus.Error(err) return &fyne.Container{} } - //redis form - redisForm := widget.NewForm() - //mongo form - mongoUrl := widget.NewEntry() - port := widget.NewEntry() - user := widget.NewEntry() - passd := widget.NewEntry() - mongoDatabase := widget.NewEntry() - mongoForm := widget.NewForm( - widget.NewFormItem("Addr", container.NewBorder(nil, nil, nil, port, mongoUrl)), - widget.NewFormItem("User", user), - widget.NewFormItem("Pass", passd), - widget.NewFormItem("DBName", mongoDatabase), - ) - if this.conf.ServiceDBInfo != nil { - user.Text = this.conf.MgoDB.User - passd.Text = this.conf.MgoDB.Password - mongoUrl.Text = this.conf.MgoDB.Host - port.Text = cast.ToString(this.conf.MgoDB.Port) - mongoDatabase.Text = this.conf.MgoDB.Database + // 表单 + createForm := func() *widget.Form { + name := widget.NewEntry() + mongoUrl := widget.NewEntry() + port := widget.NewEntry() + user := widget.NewEntry() + passd := widget.NewEntry() + mongoDatabase := widget.NewEntry() + mongoForm := widget.NewForm( + widget.NewFormItem("Name", name), + widget.NewFormItem("Addr", container.NewBorder(nil, nil, nil, port, mongoUrl)), + widget.NewFormItem("User", user), + widget.NewFormItem("Pass", passd), + widget.NewFormItem("DBName", mongoDatabase), + ) + return mongoForm } - bottomBtn := widget.NewButton("保存", func() { - if err := this.storage.StoreConfig(this.conf); err != nil { - logrus.Error(err) + center := container.NewHBox() + + topBtn := widget.NewButton("新建", func() { + //mongo form + mongoForm := createForm() + dconf := dialog.NewCustom("创建数据源", "关闭", mongoForm, this.w) + mongoForm.OnSubmit = func() { + if this.conf.MultiMgo == nil { + this.conf.MultiMgo = make(map[string]*os_storage.MgoDB) + } + name := mongoForm.Items[0] + mongoUrl := mongoForm.Items[1] + port := mongoForm.Items[2] + user := mongoForm.Items[3] + passd := mongoForm.Items[4] + mongoDatabase := mongoForm.Items[5] + if _, ok := this.conf.MultiMgo[name.Text]; ok { + dialog.NewInformation("提示", name.Text+" 数据源已存在", this.w) + return + } + + this.conf.MultiMgo[name.Text] = &os_storage.MgoDB{ + Name: name.Text, + Host: mongoUrl.Text, + Port: cast.ToInt32(port.Text), + User: user.Text, + Password: passd.Text, + Database: mongoDatabase.Text, + } + if err := this.storage.StoreConfig(this.conf); err != nil { + logrus.Error(err) + } + dconf.Hide() + center.Refresh() } + mongoForm.SubmitText = "确定" + + dconf.Resize(fyne.NewSize(400, 200)) + dconf.Show() }) - layout := container.NewGridWithRows(2, redisForm, mongoForm) - c := container.NewBorder(nil, bottomBtn, nil, nil, layout) + editBtn := widget.NewButtonWithIcon("", theme.SettingsIcon(), func() {}) + // 创建Card + for k, v := range this.conf.MultiMgo { + data := binding.BindStringList(&[]string{}) + data.Append(fmt.Sprintf("%-3s\t: %s", "addr", strings.Join([]string{v.Host, cast.ToString(v.Port)}, ":"))) + data.Append(fmt.Sprintf("user:%v", v.User)) + data.Append(fmt.Sprintf("pass:%v", v.Password)) + data.Append(fmt.Sprintf("DB:%v", v.Database)) + dataList := widget.NewListWithData(data, + func() fyne.CanvasObject { + return widget.NewLabel("template") + }, + func(i binding.DataItem, o fyne.CanvasObject) { + o.(*widget.Label).Bind(i.(binding.String)) + }, + ) + + obj := widget.NewCard("", "", + container.NewBorder(container.NewHBox(widget.NewLabel(k), layout.NewSpacer(), editBtn), nil, nil, nil, dataList), + ) + obj.Resize(fyne.NewSize(400, 450)) + center.AddObject(obj) + } + + c := container.NewBorder(container.NewHBox(topBtn), nil, nil, nil, container.NewWithoutLayout(container.NewHBox(center))) return c } diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 9fd52d523..39eab486e 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -309,6 +309,19 @@ func (this *ModuleRtask) processOneTask(session comm.IUserSession, rtaskType com return } + if conf.Data == 1 { //接取 + if r, ok := record.Vals[handle.condId]; ok { + if r.Flag == 0 { + r.Data = make(map[int32]int32) + r.Flag = 1 + } + } else { + record.Vals[handle.condId] = &pb.RtaskData{ + Flag: 1, + } + } + } + if handle.update != nil { if err := handle.update(uid, record, conf, params...); err != nil { log.Errorf("update task:%v", err) diff --git a/pb/task_db.pb.go b/pb/task_db.pb.go index 6df2f7f03..4bf5b2a85 100644 --- a/pb/task_db.pb.go +++ b/pb/task_db.pb.go @@ -455,6 +455,7 @@ type RtaskData struct { Data map[int32]int32 `protobuf:"bytes,1,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"data"` // 当前任务值 Rtype int32 `protobuf:"varint,2,opt,name=rtype,proto3" json:"rtype" bson:"rtype"` // 任务类型 Timestamp int64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp"` //@go_tasg(`bson:"timestamp"`) 时间戳 + Flag int32 `protobuf:"varint,4,opt,name=flag,proto3" json:"flag"` //@go_tasg(`bson:"flag"`) 任务是接取时记录 flag:1表示已记录 再次记录时不清除 } func (x *RtaskData) Reset() { @@ -510,6 +511,13 @@ func (x *RtaskData) GetTimestamp() int64 { return 0 } +func (x *RtaskData) GetFlag() int32 { + if x != nil { + return x.Flag + } + return 0 +} + // 玩家任务记录 type DBRtaskRecord struct { state protoimpl.MessageState @@ -636,30 +644,31 @@ var file_task_task_db_proto_rawDesc = []byte{ 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x66, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x22, 0xa2, 0x01, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, + 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 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, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xba, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x52, 0x74, - 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x76, - 0x61, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x52, 0x74, - 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x56, 0x61, 0x6c, 0x73, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x04, 0x76, 0x61, 0x6c, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, - 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x1a, - 0x43, 0x0a, 0x09, 0x56, 0x61, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, - 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x12, + 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x6c, + 0x61, 0x67, 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, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xba, 0x01, 0x0a, 0x0d, + 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x2c, 0x0a, 0x04, 0x76, 0x61, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, + 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x56, 0x61, + 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x76, 0x61, 0x6c, 0x73, 0x12, 0x14, 0x0a, + 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, + 0x69, 0x6d, 0x65, 0x1a, 0x43, 0x0a, 0x09, 0x56, 0x61, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/sys/configure/structs/Game.RdtaskCondiData.go b/sys/configure/structs/Game.RdtaskCondiData.go index 0edd2b71d..cd95b99b9 100644 --- a/sys/configure/structs/Game.RdtaskCondiData.go +++ b/sys/configure/structs/Game.RdtaskCondiData.go @@ -12,6 +12,7 @@ import "errors" type GameRdtaskCondiData struct { Id int32 + Data int32 TypeSp int32 Tasktxt string Type int32 @@ -32,6 +33,7 @@ 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["data"].(float64); !_ok_ { err = errors.New("data error"); return }; _v.Data = 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; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tasktxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tasktxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tasktxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text 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_) }