From 23f1bee9fc7c8fd921c5c3f81e124444d5330642 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 20 Jun 2023 18:16:20 +0800 Subject: [PATCH] =?UTF-8?q?worldtask=20npc=E9=85=8D=E7=BD=AE=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 360 ++++++++++++++-------------- bin/json/game_rdtasknpc.json | 420 +++++++++++++++++++++++++++++++++ modules/worldtask/configure.go | 22 ++ modules/worldtask/module.go | 40 +++- 4 files changed, 655 insertions(+), 187 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index d4d51d201..0c40cc317 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -309,7 +309,7 @@ }, "type": 14, "valid": 0, - "NPC": 101, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -1158,7 +1158,7 @@ }, "type": 61, "valid": 0, - "NPC": 105, + "NPC": 0, "value": 1, "filter": [ 1100105 @@ -1412,7 +1412,7 @@ }, "type": 70, "valid": 0, - "NPC": 10022, + "NPC": 0, "value": 1, "filter": [ 101 @@ -1792,7 +1792,7 @@ }, "type": 70, "valid": 0, - "NPC": 1, + "NPC": 0, "value": 1, "filter": [ 111 @@ -1816,7 +1816,7 @@ }, "type": 70, "valid": 0, - "NPC": 2, + "NPC": 0, "value": 1, "filter": [ 112 @@ -1840,7 +1840,7 @@ }, "type": 70, "valid": 0, - "NPC": 3, + "NPC": 0, "value": 1, "filter": [ 113 @@ -1864,7 +1864,7 @@ }, "type": 70, "valid": 0, - "NPC": 10110, + "NPC": 0, "value": 1, "filter": [ 114 @@ -2080,7 +2080,7 @@ }, "type": 149, "valid": 0, - "NPC": 104, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -2102,7 +2102,7 @@ }, "type": 61, "valid": 0, - "NPC": 29, + "NPC": 0, "value": 1, "filter": [ 1100101 @@ -2174,7 +2174,7 @@ }, "type": 73, "valid": 0, - "NPC": 70022, + "NPC": 0, "value": 1, "filter": [ 1, @@ -2199,7 +2199,7 @@ }, "type": 61, "valid": 0, - "NPC": 105, + "NPC": 0, "value": 1, "filter": [ 1100106 @@ -2223,7 +2223,7 @@ }, "type": 14, "valid": 0, - "NPC": 101, + "NPC": 0, "value": 10, "filter": [], "filter2": [ @@ -2245,7 +2245,7 @@ }, "type": 70, "valid": 0, - "NPC": 10121, + "NPC": 0, "value": 1, "filter": [ 102 @@ -2269,7 +2269,7 @@ }, "type": 73, "valid": 0, - "NPC": 70022, + "NPC": 0, "value": 1, "filter": [ 1, @@ -2294,7 +2294,7 @@ }, "type": 73, "valid": 0, - "NPC": 70032, + "NPC": 0, "value": 1, "filter": [ 1, @@ -7455,7 +7455,7 @@ }, "type": 20001, "valid": 1, - "NPC": 10012, + "NPC": 0, "value": 1, "filter": [ 602 @@ -7479,7 +7479,7 @@ }, "type": 20001, "valid": 1, - "NPC": 10021, + "NPC": 0, "value": 1, "filter": [ 432 @@ -7503,7 +7503,7 @@ }, "type": 20001, "valid": 1, - "NPC": 70010, + "NPC": 0, "value": 1, "filter": [ 9010 @@ -7527,7 +7527,7 @@ }, "type": 20001, "valid": 1, - "NPC": 70020, + "NPC": 0, "value": 1, "filter": [ 9020 @@ -7551,7 +7551,7 @@ }, "type": 20001, "valid": 1, - "NPC": 70030, + "NPC": 0, "value": 1, "filter": [ 9030 @@ -7575,7 +7575,7 @@ }, "type": 20001, "valid": 1, - "NPC": 70040, + "NPC": 0, "value": 1, "filter": [ 9040 @@ -7599,7 +7599,7 @@ }, "type": 20001, "valid": 1, - "NPC": 70050, + "NPC": 0, "value": 1, "filter": [ 9050 @@ -7623,7 +7623,7 @@ }, "type": 20001, "valid": 1, - "NPC": 70060, + "NPC": 0, "value": 1, "filter": [ 9060 @@ -7647,7 +7647,7 @@ }, "type": 5, "valid": 0, - "NPC": 10141, + "NPC": 0, "value": 3, "filter": [ 25001 @@ -7671,7 +7671,7 @@ }, "type": 92, "valid": 0, - "NPC": 10151, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -7693,7 +7693,7 @@ }, "type": 46, "valid": 0, - "NPC": 10161, + "NPC": 0, "value": 1, "filter": [ 3, @@ -7718,7 +7718,7 @@ }, "type": 73, "valid": 0, - "NPC": 10171, + "NPC": 0, "value": 1, "filter": [ 2, @@ -7743,7 +7743,7 @@ }, "type": 42, "valid": 0, - "NPC": 10181, + "NPC": 0, "value": 1, "filter": [ 3 @@ -7767,7 +7767,7 @@ }, "type": 61, "valid": 0, - "NPC": 10191, + "NPC": 0, "value": 1, "filter": [ 1100206 @@ -7791,7 +7791,7 @@ }, "type": 43, "valid": 0, - "NPC": 10201, + "NPC": 0, "value": 6, "filter": [ 6 @@ -7815,7 +7815,7 @@ }, "type": 149, "valid": 0, - "NPC": 10211, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -7837,7 +7837,7 @@ }, "type": 73, "valid": 0, - "NPC": 10221, + "NPC": 0, "value": 1, "filter": [ 11, @@ -7862,7 +7862,7 @@ }, "type": 168, "valid": 0, - "NPC": 10231, + "NPC": 0, "value": 5, "filter": [ 1 @@ -7886,7 +7886,7 @@ }, "type": 61, "valid": 0, - "NPC": 10241, + "NPC": 0, "value": 1, "filter": [ 1100301 @@ -7910,7 +7910,7 @@ }, "type": 61, "valid": 0, - "NPC": 10251, + "NPC": 0, "value": 1, "filter": [ 1100306 @@ -7934,7 +7934,7 @@ }, "type": 80, "valid": 0, - "NPC": 10261, + "NPC": 0, "value": 1, "filter": [ 1, @@ -7959,7 +7959,7 @@ }, "type": 34, "valid": 0, - "NPC": 10271, + "NPC": 0, "value": 1, "filter": [ 1 @@ -7983,7 +7983,7 @@ }, "type": 43, "valid": 0, - "NPC": 10281, + "NPC": 0, "value": 9, "filter": [ 6 @@ -8007,7 +8007,7 @@ }, "type": 61, "valid": 0, - "NPC": 10291, + "NPC": 0, "value": 1, "filter": [ 1100406 @@ -8031,7 +8031,7 @@ }, "type": 73, "valid": 0, - "NPC": 10301, + "NPC": 0, "value": 1, "filter": [ 21, @@ -8056,7 +8056,7 @@ }, "type": 43, "valid": 0, - "NPC": 10311, + "NPC": 0, "value": 12, "filter": [ 6 @@ -8080,7 +8080,7 @@ }, "type": 152, "valid": 0, - "NPC": 10321, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -8102,7 +8102,7 @@ }, "type": 168, "valid": 0, - "NPC": 10331, + "NPC": 0, "value": 10, "filter": [ 1 @@ -8126,7 +8126,7 @@ }, "type": 61, "valid": 0, - "NPC": 10341, + "NPC": 0, "value": 1, "filter": [ 1100506 @@ -8150,7 +8150,7 @@ }, "type": 169, "valid": 0, - "NPC": 10351, + "NPC": 0, "value": 1, "filter": [ 1 @@ -8174,7 +8174,7 @@ }, "type": 188, "valid": 0, - "NPC": 10361, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -8196,7 +8196,7 @@ }, "type": 73, "valid": 0, - "NPC": 10371, + "NPC": 0, "value": 1, "filter": [ 21, @@ -8221,7 +8221,7 @@ }, "type": 80, "valid": 0, - "NPC": 10261, + "NPC": 0, "value": 1, "filter": [ 1, @@ -8246,7 +8246,7 @@ }, "type": 187, "valid": 0, - "NPC": 10391, + "NPC": 0, "value": 5, "filter": [ 132000 @@ -8270,7 +8270,7 @@ }, "type": 34, "valid": 0, - "NPC": 10401, + "NPC": 0, "value": 1, "filter": [ 3 @@ -8294,7 +8294,7 @@ }, "type": 61, "valid": 0, - "NPC": 10411, + "NPC": 0, "value": 1, "filter": [ 1100606 @@ -8318,7 +8318,7 @@ }, "type": 43, "valid": 0, - "NPC": 10421, + "NPC": 0, "value": 12, "filter": [ 9 @@ -8342,7 +8342,7 @@ }, "type": 131, "valid": 0, - "NPC": 10431, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -8364,7 +8364,7 @@ }, "type": 80, "valid": 0, - "NPC": 10261, + "NPC": 0, "value": 1, "filter": [ 1, @@ -8389,7 +8389,7 @@ }, "type": 34, "valid": 0, - "NPC": 10451, + "NPC": 0, "value": 3, "filter": [ 3 @@ -8413,7 +8413,7 @@ }, "type": 61, "valid": 0, - "NPC": 10461, + "NPC": 0, "value": 1, "filter": [ 1100706 @@ -8437,7 +8437,7 @@ }, "type": 50, "valid": 0, - "NPC": 10471, + "NPC": 0, "value": 12, "filter": [ 4 @@ -8461,7 +8461,7 @@ }, "type": 168, "valid": 0, - "NPC": 10481, + "NPC": 0, "value": 5, "filter": [ 2 @@ -8485,7 +8485,7 @@ }, "type": 61, "valid": 0, - "NPC": 10491, + "NPC": 0, "value": 1, "filter": [ 1100806 @@ -8509,7 +8509,7 @@ }, "type": 73, "valid": 0, - "NPC": 10501, + "NPC": 0, "value": 1, "filter": [ 11, @@ -8534,7 +8534,7 @@ }, "type": 43, "valid": 0, - "NPC": 10511, + "NPC": 0, "value": 18, "filter": [ 9 @@ -8558,7 +8558,7 @@ }, "type": 61, "valid": 0, - "NPC": 10521, + "NPC": 0, "value": 1, "filter": [ 1100906 @@ -8582,7 +8582,7 @@ }, "type": 34, "valid": 0, - "NPC": 10531, + "NPC": 0, "value": 4, "filter": [ 3 @@ -8606,7 +8606,7 @@ }, "type": 61, "valid": 0, - "NPC": 10541, + "NPC": 0, "value": 1, "filter": [ 11001006 @@ -8630,7 +8630,7 @@ }, "type": 73, "valid": 0, - "NPC": 10551, + "NPC": 0, "value": 1, "filter": [ 21, @@ -8655,7 +8655,7 @@ }, "type": 43, "valid": 0, - "NPC": 10561, + "NPC": 0, "value": 8, "filter": [ 12 @@ -8679,7 +8679,7 @@ }, "type": 61, "valid": 0, - "NPC": 10571, + "NPC": 0, "value": 1, "filter": [ 11001106 @@ -8703,7 +8703,7 @@ }, "type": 131, "valid": 0, - "NPC": 10581, + "NPC": 0, "value": 10, "filter": [], "filter2": [ @@ -8725,7 +8725,7 @@ }, "type": 61, "valid": 0, - "NPC": 10591, + "NPC": 0, "value": 1, "filter": [ 11001206 @@ -8749,7 +8749,7 @@ }, "type": 61, "valid": 0, - "NPC": 10601, + "NPC": 0, "value": 1, "filter": [ 1200103 @@ -8773,7 +8773,7 @@ }, "type": 61, "valid": 0, - "NPC": 10611, + "NPC": 0, "value": 1, "filter": [ 1200106 @@ -8797,7 +8797,7 @@ }, "type": 61, "valid": 0, - "NPC": 10621, + "NPC": 0, "value": 1, "filter": [ 1200203 @@ -8821,7 +8821,7 @@ }, "type": 61, "valid": 0, - "NPC": 10631, + "NPC": 0, "value": 1, "filter": [ 1200206 @@ -8845,7 +8845,7 @@ }, "type": 61, "valid": 0, - "NPC": 10641, + "NPC": 0, "value": 1, "filter": [ 1200303 @@ -8869,7 +8869,7 @@ }, "type": 61, "valid": 0, - "NPC": 10651, + "NPC": 0, "value": 1, "filter": [ 1200306 @@ -8893,7 +8893,7 @@ }, "type": 61, "valid": 0, - "NPC": 10661, + "NPC": 0, "value": 1, "filter": [ 1200403 @@ -8917,7 +8917,7 @@ }, "type": 61, "valid": 0, - "NPC": 10671, + "NPC": 0, "value": 1, "filter": [ 1200406 @@ -8941,7 +8941,7 @@ }, "type": 61, "valid": 0, - "NPC": 10681, + "NPC": 0, "value": 1, "filter": [ 1200503 @@ -8965,7 +8965,7 @@ }, "type": 61, "valid": 0, - "NPC": 10691, + "NPC": 0, "value": 1, "filter": [ 1200506 @@ -8989,7 +8989,7 @@ }, "type": 61, "valid": 0, - "NPC": 10701, + "NPC": 0, "value": 1, "filter": [ 1200603 @@ -9013,7 +9013,7 @@ }, "type": 61, "valid": 0, - "NPC": 10711, + "NPC": 0, "value": 1, "filter": [ 1200606 @@ -9037,7 +9037,7 @@ }, "type": 61, "valid": 0, - "NPC": 10721, + "NPC": 0, "value": 1, "filter": [ 1200703 @@ -9061,7 +9061,7 @@ }, "type": 61, "valid": 0, - "NPC": 10731, + "NPC": 0, "value": 1, "filter": [ 1200706 @@ -9085,7 +9085,7 @@ }, "type": 61, "valid": 0, - "NPC": 10741, + "NPC": 0, "value": 1, "filter": [ 1200803 @@ -9109,7 +9109,7 @@ }, "type": 61, "valid": 0, - "NPC": 10751, + "NPC": 0, "value": 1, "filter": [ 1200806 @@ -9133,7 +9133,7 @@ }, "type": 61, "valid": 0, - "NPC": 10761, + "NPC": 0, "value": 1, "filter": [ 1200903 @@ -9157,7 +9157,7 @@ }, "type": 61, "valid": 0, - "NPC": 10771, + "NPC": 0, "value": 1, "filter": [ 1200906 @@ -9181,7 +9181,7 @@ }, "type": 61, "valid": 0, - "NPC": 10781, + "NPC": 0, "value": 1, "filter": [ 12001003 @@ -9205,7 +9205,7 @@ }, "type": 61, "valid": 0, - "NPC": 10791, + "NPC": 0, "value": 1, "filter": [ 12001006 @@ -9229,7 +9229,7 @@ }, "type": 61, "valid": 0, - "NPC": 10801, + "NPC": 0, "value": 1, "filter": [ 12001103 @@ -9253,7 +9253,7 @@ }, "type": 61, "valid": 0, - "NPC": 10811, + "NPC": 0, "value": 1, "filter": [ 12001106 @@ -9277,7 +9277,7 @@ }, "type": 61, "valid": 0, - "NPC": 10821, + "NPC": 0, "value": 1, "filter": [ 12001203 @@ -9301,7 +9301,7 @@ }, "type": 61, "valid": 0, - "NPC": 10831, + "NPC": 0, "value": 1, "filter": [ 12001206 @@ -9325,7 +9325,7 @@ }, "type": 171, "valid": 0, - "NPC": 10141, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -9347,7 +9347,7 @@ }, "type": 171, "valid": 0, - "NPC": 10151, + "NPC": 0, "value": 2, "filter": [], "filter2": [ @@ -9369,7 +9369,7 @@ }, "type": 171, "valid": 0, - "NPC": 10161, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -9391,7 +9391,7 @@ }, "type": 52, "valid": 0, - "NPC": 10171, + "NPC": 0, "value": 1, "filter": [ 25001 @@ -9415,7 +9415,7 @@ }, "type": 52, "valid": 0, - "NPC": 10181, + "NPC": 0, "value": 5, "filter": [ 25001 @@ -9439,7 +9439,7 @@ }, "type": 53, "valid": 0, - "NPC": 10191, + "NPC": 0, "value": 9, "filter": [], "filter2": [ @@ -9461,7 +9461,7 @@ }, "type": 57, "valid": 0, - "NPC": 10201, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -9483,7 +9483,7 @@ }, "type": 53, "valid": 0, - "NPC": 10211, + "NPC": 0, "value": 15, "filter": [], "filter2": [ @@ -9505,7 +9505,7 @@ }, "type": 57, "valid": 0, - "NPC": 10221, + "NPC": 0, "value": 4, "filter": [], "filter2": [ @@ -9527,7 +9527,7 @@ }, "type": 80, "valid": 0, - "NPC": 10231, + "NPC": 0, "value": 1, "filter": [ 3, @@ -9552,7 +9552,7 @@ }, "type": 172, "valid": 0, - "NPC": 10241, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -9574,7 +9574,7 @@ }, "type": 34, "valid": 0, - "NPC": 10251, + "NPC": 0, "value": 1, "filter": [ 3 @@ -9598,7 +9598,7 @@ }, "type": 131, "valid": 0, - "NPC": 10261, + "NPC": 0, "value": 5, "filter": [], "filter2": [ @@ -9620,7 +9620,7 @@ }, "type": 173, "valid": 0, - "NPC": 10271, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -9642,7 +9642,7 @@ }, "type": 12, "valid": 0, - "NPC": 10281, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -9664,7 +9664,7 @@ }, "type": 119, "valid": 0, - "NPC": 10291, + "NPC": 0, "value": 4, "filter": [ 25001 @@ -9688,7 +9688,7 @@ }, "type": 121, "valid": 0, - "NPC": 10301, + "NPC": 0, "value": 2, "filter": [ 2 @@ -9712,7 +9712,7 @@ }, "type": 121, "valid": 0, - "NPC": 10311, + "NPC": 0, "value": 3, "filter": [ 2 @@ -9736,7 +9736,7 @@ }, "type": 121, "valid": 0, - "NPC": 10321, + "NPC": 0, "value": 5, "filter": [ 2 @@ -9760,7 +9760,7 @@ }, "type": 57, "valid": 0, - "NPC": 10331, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -9782,7 +9782,7 @@ }, "type": 67, "valid": 0, - "NPC": 10341, + "NPC": 0, "value": 10000, "filter": [ 1 @@ -9806,7 +9806,7 @@ }, "type": 121, "valid": 0, - "NPC": 10351, + "NPC": 0, "value": 2, "filter": [ 2 @@ -9830,7 +9830,7 @@ }, "type": 121, "valid": 0, - "NPC": 10361, + "NPC": 0, "value": 3, "filter": [ 2 @@ -9854,7 +9854,7 @@ }, "type": 121, "valid": 0, - "NPC": 10371, + "NPC": 0, "value": 5, "filter": [ 2 @@ -9878,7 +9878,7 @@ }, "type": 174, "valid": 0, - "NPC": 10381, + "NPC": 0, "value": 1, "filter": [ 5 @@ -9902,7 +9902,7 @@ }, "type": 73, "valid": 0, - "NPC": 10141, + "NPC": 0, "value": 1, "filter": [ 1, @@ -9927,7 +9927,7 @@ }, "type": 148, "valid": 0, - "NPC": 10151, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -9949,7 +9949,7 @@ }, "type": 148, "valid": 0, - "NPC": 10161, + "NPC": 0, "value": 6, "filter": [], "filter2": [ @@ -9971,7 +9971,7 @@ }, "type": 175, "valid": 0, - "NPC": 10171, + "NPC": 0, "value": 100, "filter": [], "filter2": [ @@ -9993,7 +9993,7 @@ }, "type": 166, "valid": 0, - "NPC": 10181, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -10015,7 +10015,7 @@ }, "type": 166, "valid": 0, - "NPC": 10191, + "NPC": 0, "value": 6, "filter": [], "filter2": [ @@ -10037,7 +10037,7 @@ }, "type": 177, "valid": 0, - "NPC": 10201, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -10059,7 +10059,7 @@ }, "type": 177, "valid": 0, - "NPC": 10211, + "NPC": 0, "value": 4, "filter": [], "filter2": [ @@ -10081,7 +10081,7 @@ }, "type": 177, "valid": 0, - "NPC": 10221, + "NPC": 0, "value": 6, "filter": [], "filter2": [ @@ -10103,7 +10103,7 @@ }, "type": 179, "valid": 0, - "NPC": 10231, + "NPC": 0, "value": 1, "filter": [ 2 @@ -10127,7 +10127,7 @@ }, "type": 179, "valid": 0, - "NPC": 10241, + "NPC": 0, "value": 2, "filter": [ 3 @@ -10151,7 +10151,7 @@ }, "type": 179, "valid": 0, - "NPC": 10251, + "NPC": 0, "value": 3, "filter": [ 5 @@ -10175,7 +10175,7 @@ }, "type": 50, "valid": 0, - "NPC": 10261, + "NPC": 0, "value": 10, "filter": [ 3 @@ -10199,7 +10199,7 @@ }, "type": 73, "valid": 0, - "NPC": 10271, + "NPC": 0, "value": 1, "filter": [ 11, @@ -10224,7 +10224,7 @@ }, "type": 180, "valid": 0, - "NPC": 10281, + "NPC": 0, "value": 1, "filter": [ 1 @@ -10248,7 +10248,7 @@ }, "type": 93, "valid": 0, - "NPC": 10291, + "NPC": 0, "value": 1, "filter": [ 1, @@ -10273,7 +10273,7 @@ }, "type": 93, "valid": 0, - "NPC": 10301, + "NPC": 0, "value": 6, "filter": [ 2, @@ -10298,7 +10298,7 @@ }, "type": 50, "valid": 0, - "NPC": 10311, + "NPC": 0, "value": 10, "filter": [ 4 @@ -10322,7 +10322,7 @@ }, "type": 73, "valid": 0, - "NPC": 10321, + "NPC": 0, "value": 1, "filter": [ 11, @@ -10347,7 +10347,7 @@ }, "type": 73, "valid": 0, - "NPC": 10331, + "NPC": 0, "value": 1, "filter": [ 21, @@ -10372,7 +10372,7 @@ }, "type": 73, "valid": 0, - "NPC": 10341, + "NPC": 0, "value": 1, "filter": [ 11, @@ -10397,7 +10397,7 @@ }, "type": 73, "valid": 0, - "NPC": 10351, + "NPC": 0, "value": 1, "filter": [ 21, @@ -10422,7 +10422,7 @@ }, "type": 50, "valid": 0, - "NPC": 10361, + "NPC": 0, "value": 12, "filter": [ 5 @@ -10446,7 +10446,7 @@ }, "type": 73, "valid": 0, - "NPC": 10371, + "NPC": 0, "value": 1, "filter": [ 11, @@ -10471,7 +10471,7 @@ }, "type": 73, "valid": 0, - "NPC": 10381, + "NPC": 0, "value": 1, "filter": [ 21, @@ -10496,7 +10496,7 @@ }, "type": 50, "valid": 0, - "NPC": 10391, + "NPC": 0, "value": 3, "filter": [ 6 @@ -10520,7 +10520,7 @@ }, "type": 73, "valid": 0, - "NPC": 10401, + "NPC": 0, "value": 1, "filter": [ 11, @@ -10545,7 +10545,7 @@ }, "type": 73, "valid": 0, - "NPC": 10411, + "NPC": 0, "value": 1, "filter": [ 21, @@ -10570,7 +10570,7 @@ }, "type": 50, "valid": 0, - "NPC": 10421, + "NPC": 0, "value": 8, "filter": [ 6 @@ -10594,7 +10594,7 @@ }, "type": 73, "valid": 0, - "NPC": 10431, + "NPC": 0, "value": 1, "filter": [ 11, @@ -10619,7 +10619,7 @@ }, "type": 73, "valid": 0, - "NPC": 10441, + "NPC": 0, "value": 1, "filter": [ 21, @@ -10644,7 +10644,7 @@ }, "type": 50, "valid": 0, - "NPC": 10451, + "NPC": 0, "value": 15, "filter": [ 6 @@ -10668,7 +10668,7 @@ }, "type": 181, "valid": 0, - "NPC": 10461, + "NPC": 0, "value": 1, "filter": [ 11, @@ -10693,7 +10693,7 @@ }, "type": 181, "valid": 0, - "NPC": 10471, + "NPC": 0, "value": 1, "filter": [ 11, @@ -10718,7 +10718,7 @@ }, "type": 50, "valid": 0, - "NPC": 10481, + "NPC": 0, "value": 30, "filter": [ 6 @@ -10742,7 +10742,7 @@ }, "type": 152, "valid": 0, - "NPC": 10491, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -10764,7 +10764,7 @@ }, "type": 152, "valid": 0, - "NPC": 10501, + "NPC": 0, "value": 2, "filter": [], "filter2": [ @@ -10786,7 +10786,7 @@ }, "type": 152, "valid": 0, - "NPC": 10511, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -10808,7 +10808,7 @@ }, "type": 182, "valid": 0, - "NPC": 10521, + "NPC": 0, "value": 2, "filter": [], "filter2": [ @@ -10830,7 +10830,7 @@ }, "type": 182, "valid": 0, - "NPC": 10531, + "NPC": 0, "value": 4, "filter": [], "filter2": [ @@ -10852,7 +10852,7 @@ }, "type": 182, "valid": 0, - "NPC": 10541, + "NPC": 0, "value": 6, "filter": [], "filter2": [ @@ -10874,7 +10874,7 @@ }, "type": 183, "valid": 0, - "NPC": 10551, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -10896,7 +10896,7 @@ }, "type": 184, "valid": 0, - "NPC": 10561, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -10918,7 +10918,7 @@ }, "type": 185, "valid": 0, - "NPC": 10571, + "NPC": 0, "value": 1, "filter": [], "filter2": [ @@ -10940,7 +10940,7 @@ }, "type": 185, "valid": 0, - "NPC": 10581, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -10962,7 +10962,7 @@ }, "type": 185, "valid": 0, - "NPC": 10591, + "NPC": 0, "value": 5, "filter": [], "filter2": [ @@ -10984,7 +10984,7 @@ }, "type": 73, "valid": 0, - "NPC": 10601, + "NPC": 0, "value": 1, "filter": [ 31, @@ -11009,7 +11009,7 @@ }, "type": 73, "valid": 0, - "NPC": 10611, + "NPC": 0, "value": 1, "filter": [ 31, @@ -11034,7 +11034,7 @@ }, "type": 111, "valid": 0, - "NPC": 10621, + "NPC": 0, "value": 5, "filter": [ 25 @@ -11058,7 +11058,7 @@ }, "type": 111, "valid": 0, - "NPC": 10631, + "NPC": 0, "value": 5, "filter": [ 40 @@ -11082,7 +11082,7 @@ }, "type": 111, "valid": 0, - "NPC": 10641, + "NPC": 0, "value": 5, "filter": [ 50 @@ -11106,7 +11106,7 @@ }, "type": 186, "valid": 0, - "NPC": 10651, + "NPC": 0, "value": 3, "filter": [], "filter2": [ @@ -11128,7 +11128,7 @@ }, "type": 186, "valid": 0, - "NPC": 10661, + "NPC": 0, "value": 8, "filter": [], "filter2": [ @@ -11150,7 +11150,7 @@ }, "type": 73, "valid": 0, - "NPC": 10671, + "NPC": 0, "value": 1, "filter": [ 31, @@ -11175,7 +11175,7 @@ }, "type": 73, "valid": 0, - "NPC": 10681, + "NPC": 0, "value": 1, "filter": [ 31, @@ -11200,7 +11200,7 @@ }, "type": 186, "valid": 0, - "NPC": 10691, + "NPC": 0, "value": 10, "filter": [], "filter2": [ @@ -11222,7 +11222,7 @@ }, "type": 73, "valid": 0, - "NPC": 10701, + "NPC": 0, "value": 1, "filter": [ 31, @@ -11247,7 +11247,7 @@ }, "type": 111, "valid": 0, - "NPC": 10711, + "NPC": 0, "value": 10, "filter": [ 50 @@ -11271,7 +11271,7 @@ }, "type": 73, "valid": 0, - "NPC": 10721, + "NPC": 0, "value": 1, "filter": [ 31, @@ -11296,7 +11296,7 @@ }, "type": 73, "valid": 0, - "NPC": 10731, + "NPC": 0, "value": 1, "filter": [ 31, @@ -11321,7 +11321,7 @@ }, "type": 73, "valid": 0, - "NPC": 10741, + "NPC": 0, "value": 1, "filter": [ 31, @@ -11346,7 +11346,7 @@ }, "type": 73, "valid": 0, - "NPC": 10751, + "NPC": 0, "value": 1, "filter": [ 31, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index a6d340f35..8b5a68416 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -4878,5 +4878,425 @@ 10030 ], "goto": 0 + }, + { + "id": 11100, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔4", + "901" + ], + "event": [ + 2, + 10031 + ], + "goto": 0 + }, + { + "id": 11104, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔5", + "901" + ], + "event": [ + 2, + 10032 + ], + "goto": 0 + }, + { + "id": 11108, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔6", + "901" + ], + "event": [ + 2, + 10033 + ], + "goto": 0 + }, + { + "id": 11110, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔7", + "901" + ], + "event": [ + 2, + 10034 + ], + "goto": 0 + }, + { + "id": 11114, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔8", + "901" + ], + "event": [ + 2, + 10035 + ], + "goto": 0 + }, + { + "id": 11118, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔9", + "901" + ], + "event": [ + 2, + 10036 + ], + "goto": 0 + }, + { + "id": 11120, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔10", + "901" + ], + "event": [ + 2, + 10037 + ], + "goto": 0 + }, + { + "id": 11124, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔11", + "901" + ], + "event": [ + 2, + 10038 + ], + "goto": 0 + }, + { + "id": 11128, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔12", + "901" + ], + "event": [ + 2, + 10039 + ], + "goto": 0 + }, + { + "id": 11130, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔13", + "901" + ], + "event": [ + 2, + 10040 + ], + "goto": 0 + }, + { + "id": 11134, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔14", + "901" + ], + "event": [ + 2, + 10041 + ], + "goto": 0 + }, + { + "id": 11138, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔15", + "901" + ], + "event": [ + 2, + 10042 + ], + "goto": 0 + }, + { + "id": 11140, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔16", + "901" + ], + "event": [ + 2, + 10043 + ], + "goto": 0 + }, + { + "id": 11144, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔17", + "901" + ], + "event": [ + 2, + 10044 + ], + "goto": 0 + }, + { + "id": 11148, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔18", + "901" + ], + "event": [ + 2, + 10045 + ], + "goto": 0 + }, + { + "id": 11150, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔19", + "901" + ], + "event": [ + 2, + 10046 + ], + "goto": 0 + }, + { + "id": 11154, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔20", + "901" + ], + "event": [ + 2, + 10047 + ], + "goto": 0 + }, + { + "id": 11158, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔21", + "901" + ], + "event": [ + 2, + 10048 + ], + "goto": 0 + }, + { + "id": 11160, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔22", + "901" + ], + "event": [ + 2, + 10049 + ], + "goto": 0 + }, + { + "id": 11164, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔23", + "901" + ], + "event": [ + 2, + 10050 + ], + "goto": 0 + }, + { + "id": 11168, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔24", + "901" + ], + "event": [ + 2, + 10051 + ], + "goto": 0 + }, + { + "id": 11170, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔25", + "901" + ], + "event": [ + 2, + 10052 + ], + "goto": 0 + }, + { + "id": 11174, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔26", + "901" + ], + "event": [ + 2, + 10053 + ], + "goto": 0 + }, + { + "id": 11178, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔27", + "901" + ], + "event": [ + 2, + 10054 + ], + "goto": 0 + }, + { + "id": 11180, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔28", + "901" + ], + "event": [ + 2, + 10055 + ], + "goto": 0 + }, + { + "id": 11184, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔29", + "901" + ], + "event": [ + 2, + 10056 + ], + "goto": 0 + }, + { + "id": 11188, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔30", + "901" + ], + "event": [ + 2, + 10057 + ], + "goto": 0 + }, + { + "id": 11190, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔31", + "901" + ], + "event": [ + 2, + 10058 + ], + "goto": 0 + }, + { + "id": 11194, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔32", + "901" + ], + "event": [ + 2, + 10059 + ], + "goto": 0 + }, + { + "id": 11198, + "heroid": 25001, + "datas": [ + "GameMain", + "20030_邦尼兔33", + "901" + ], + "event": [ + 2, + 10060 + ], + "goto": 0 } ] \ No newline at end of file diff --git a/modules/worldtask/configure.go b/modules/worldtask/configure.go index b2b9ae2e9..da203277b 100644 --- a/modules/worldtask/configure.go +++ b/modules/worldtask/configure.go @@ -15,6 +15,7 @@ const ( gameWorldtaskBattle = "game_worldbattle.json" gameWorldAll = "game_worldall.json" gameburiedCond = "game_buriedcondi.json" + gamerdtasknpc = "game_rdtasknpc.json" ) type configureComp struct { @@ -30,6 +31,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp gameWorldtaskBattle: cfg.NewGameWorldBattle, gameWorldAll: cfg.NewGameWorldAll, gameburiedCond: cfg.NewGameBuriedCondi, + gamerdtasknpc: cfg.NewGameRdtaskNpc, }) this.worldtaskConf = make(map[int32]*cfg.GameWorldTaskData) configure.RegisterConfigure(gameWorldTask, cfg.NewGameBuriedCondi, this.updateconfigure) @@ -90,6 +92,26 @@ func (this *configureComp) getWorldtaskById(taskId int32) (*cfg.GameWorldTaskDat return nil, comm.NewNotFoundConfErr(moduleName_cn, gameWorldTask, taskId) } +func (this *configureComp) getNPCById(npcId int32) (npc *cfg.GameRdtaskNpcData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(gamerdtasknpc); err != nil { + return + } else { + data, ok := v.(*cfg.GameRdtaskNpc) + if !ok { + err = fmt.Errorf("%T is *cfg.GameRdtaskNpc", v) + return + } + if npc, ok = data.GetDataMap()[npcId]; ok { + return + } + err = comm.NewNotFoundConfErr(moduleName_cn, gamerdtasknpc, npc) + } + return +} + func (this *configureComp) getWorldtaskBattleCfg() (data *cfg.GameWorldBattle, err error) { var ( v interface{} diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index 768e9ab54..bfb07239a 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -11,6 +11,7 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" + "strings" ) var _ comm.IWorldtask = (*Worldtask)(nil) @@ -60,6 +61,8 @@ func (this *Worldtask) Start() (err error) { return } +var errs []string + // 配置文件校验 func (this *Worldtask) checkWorldtaskConf() (err error) { worldtaskConf, err := this.configure.getWorldtaskCfg() @@ -73,26 +76,49 @@ func (this *Worldtask) checkWorldtaskConf() (err error) { for _, data := range worldtaskConf.GetDataList() { // 检查 lock if data.Lock < 1 { - return fmt.Errorf("taskId:%v lock:%v可能存在问题", data.Key, data.Lock) + errs = append(errs, fmt.Sprintf("taskId:%v lock:%v可能存在问题", data.Key, data.Lock)) } //检查group if data.Group <= 0 { - return fmt.Errorf("taskId:%v group:%v可能存在问题", data.Key, data.Group) + errs = append(errs, fmt.Sprintf("taskId:%v group:%v可能存在问题", data.Key, data.Group)) } //检查des if data.Des < 1 || data.Des > 5 { - return fmt.Errorf("taskId:%v des:%v可能存在问题", data.Key, data.Des) + errs = append(errs, fmt.Sprintf("taskId:%v des:%v可能存在问题", data.Key, data.Des)) } // 检查completetask 是否有效 for _, condId := range data.Completetask { - if condId == 0 { - continue + if condId > 0 { + if _, ok := buriedCondConf.GetDataMap()[condId]; !ok { + errs = append(errs, fmt.Sprintf("taskId:%v completetask:%v可能是无效的ID", data.Key, condId)) + } } - if _, ok := buriedCondConf.GetDataMap()[condId]; !ok { - return fmt.Errorf("taskId:%v completetask:%v可能是无效的ID", data.Key, condId) + } + //检查NPC + if data.Npc > 0 { + if _, err := this.configure.getNPCById(data.Npc); err != nil { + errs = append(errs, fmt.Sprintf("npcId:%v 可能无效,检查world_task表字段Npc值是否存在于buried/rdtasknpc", data.Npc)) + } + } + if data.DeliverNpc > 0 { + if _, err := this.configure.getNPCById(data.Npc); err != nil { + errs = append(errs, fmt.Sprintf("npcId:%v 可能无效,检查world_task表字段deliver_npc值是否存在于buried/rdtasknpc", data.Npc)) } } } + + for _, data := range buriedCondConf.GetDataList() { + if data.NPC > 0 { + if _, err := this.configure.getNPCById(data.NPC); err != nil { + errs = append(errs, fmt.Sprintf("npcId:%v 可能无效,检查buried_condi表字段NPC值是否存在于buried/rdtasknpc", data.NPC)) + } + } + } + + if len(errs) > 0 { + return fmt.Errorf("%s", strings.Join(errs, "|")) + } + this.Debug("check worldtask conf completed") return }