From 3b45e361bc378022253cb43410f2ecf4edd75b59 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 6 Jul 2023 17:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B5=8B=E8=AF=95=E6=9C=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_worldtask.json | 872 ++++++++------------------------- modules/worldtask/configure.go | 73 +++ modules/worldtask/module.go | 71 +-- modules/wtask/module.go | 4 +- 4 files changed, 278 insertions(+), 742 deletions(-) diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 7d893b2eb..4119fc7d4 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -3,7 +3,7 @@ "key": 20010, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 0, "id_after": 20011, "group": 10, @@ -42,7 +42,7 @@ "key": 20011, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20010, "id_after": 20012, "group": 10, @@ -81,7 +81,7 @@ "key": 20012, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20011, "id_after": 20020, "group": 10, @@ -125,7 +125,7 @@ "key": 20020, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20012, "id_after": 20030, "group": 10, @@ -164,7 +164,7 @@ "key": 20030, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20020, "id_after": 20040, "group": 10, @@ -203,7 +203,7 @@ "key": 20040, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20030, "id_after": 20050, "group": 10, @@ -247,7 +247,7 @@ "key": 20050, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20040, "id_after": 20060, "group": 10, @@ -291,7 +291,7 @@ "key": 20060, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20050, "id_after": 20070, "group": 10, @@ -330,7 +330,7 @@ "key": 20070, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20060, "id_after": 20080, "group": 10, @@ -369,7 +369,7 @@ "key": 20080, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20070, "id_after": 20090, "group": 10, @@ -410,7 +410,7 @@ "key": 20090, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20080, "id_after": 20100, "group": 10, @@ -454,7 +454,7 @@ "key": 20100, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20090, "id_after": 20110, "group": 10, @@ -518,7 +518,7 @@ "key": 20110, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20100, "id_after": 20120, "group": 10, @@ -557,7 +557,7 @@ "key": 20120, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20110, "id_after": 20130, "group": 10, @@ -596,7 +596,7 @@ "key": 20130, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20120, "id_after": 20140, "group": 10, @@ -635,7 +635,7 @@ "key": 20140, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20130, "id_after": 20150, "group": 10, @@ -699,7 +699,7 @@ "key": 20150, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20140, "id_after": 20160, "group": 10, @@ -738,7 +738,7 @@ "key": 20160, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20150, "id_after": 20170, "group": 10, @@ -777,7 +777,7 @@ "key": 20170, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20160, "id_after": 20180, "group": 10, @@ -821,7 +821,7 @@ "key": 20180, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20170, "id_after": 20190, "group": 10, @@ -865,7 +865,7 @@ "key": 20190, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20180, "id_after": 20200, "group": 10, @@ -904,7 +904,7 @@ "key": 20200, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20190, "id_after": 20210, "group": 10, @@ -943,7 +943,7 @@ "key": 20210, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20200, "id_after": 20220, "group": 10, @@ -982,7 +982,7 @@ "key": 20220, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20210, "id_after": 0, "group": 10, @@ -1021,7 +1021,7 @@ "key": 20230, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20220, "id_after": 20240, "group": 20, @@ -1065,7 +1065,7 @@ "key": 20240, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20230, "id_after": 20250, "group": 20, @@ -1104,7 +1104,7 @@ "key": 20250, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20240, "id_after": 20260, "group": 20, @@ -1168,7 +1168,7 @@ "key": 20260, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20250, "id_after": 20270, "group": 20, @@ -1207,7 +1207,7 @@ "key": 20270, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20260, "id_after": 20280, "group": 20, @@ -1246,7 +1246,7 @@ "key": 20280, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20270, "id_after": 20290, "group": 20, @@ -1290,7 +1290,7 @@ "key": 20290, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20280, "id_after": 0, "group": 20, @@ -1331,7 +1331,7 @@ "key": 20300, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20290, "id_after": 20310, "group": 30, @@ -1375,7 +1375,7 @@ "key": 20310, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20300, "id_after": 20320, "group": 30, @@ -1414,7 +1414,7 @@ "key": 20320, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20310, "id_after": 20330, "group": 30, @@ -1453,7 +1453,7 @@ "key": 20330, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20320, "id_after": 20340, "group": 30, @@ -1492,7 +1492,7 @@ "key": 20340, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20330, "id_after": 20350, "group": 30, @@ -1541,7 +1541,7 @@ "key": 20350, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20340, "id_after": 20360, "group": 30, @@ -1581,7 +1581,7 @@ "key": 20360, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20350, "id_after": 0, "group": 30, @@ -1625,7 +1625,7 @@ "key": 20370, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20360, "id_after": 20380, "group": 40, @@ -1669,7 +1669,7 @@ "key": 20380, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20370, "id_after": 20390, "group": 40, @@ -1708,7 +1708,7 @@ "key": 20390, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20380, "id_after": 20400, "group": 40, @@ -1747,7 +1747,7 @@ "key": 20400, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20390, "id_after": 20410, "group": 40, @@ -1786,7 +1786,7 @@ "key": 20410, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20400, "id_after": 20420, "group": 40, @@ -1825,7 +1825,7 @@ "key": 20420, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20410, "id_after": 20430, "group": 40, @@ -1864,7 +1864,7 @@ "key": 20430, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20420, "id_after": 0, "group": 40, @@ -1907,8 +1907,8 @@ { "key": 20440, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20430, "id_after": 20450, "group": 50, @@ -1946,8 +1946,8 @@ { "key": 20450, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20440, "id_after": 20460, "group": 50, @@ -1985,8 +1985,8 @@ { "key": 20460, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20450, "id_after": 20470, "group": 50, @@ -2024,8 +2024,8 @@ { "key": 20470, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20460, "id_after": 20480, "group": 50, @@ -2063,8 +2063,8 @@ { "key": 20480, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20470, "id_after": 20490, "group": 50, @@ -2102,8 +2102,8 @@ { "key": 20490, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20480, "id_after": 20500, "group": 50, @@ -2141,8 +2141,8 @@ { "key": 20500, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20490, "id_after": 20510, "group": 50, @@ -2185,8 +2185,8 @@ { "key": 20510, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20500, "id_after": 20520, "group": 50, @@ -2224,8 +2224,8 @@ { "key": 20520, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20510, "id_after": 20530, "group": 50, @@ -2263,8 +2263,8 @@ { "key": 20530, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20520, "id_after": 20540, "group": 50, @@ -2307,8 +2307,8 @@ { "key": 20540, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20530, "id_after": 20550, "group": 50, @@ -2346,8 +2346,8 @@ { "key": 20550, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20540, "id_after": 20560, "group": 50, @@ -2385,8 +2385,8 @@ { "key": 20560, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20550, "id_after": 20570, "group": 50, @@ -2424,8 +2424,8 @@ { "key": 20570, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20560, "id_after": 20580, "group": 50, @@ -2463,8 +2463,8 @@ { "key": 20580, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20570, "id_after": 20590, "group": 50, @@ -2502,8 +2502,8 @@ { "key": 20590, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20580, "id_after": 20600, "group": 50, @@ -2541,8 +2541,8 @@ { "key": 20600, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20590, "id_after": 20610, "group": 50, @@ -2580,8 +2580,8 @@ { "key": 20610, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20600, "id_after": 20620, "group": 50, @@ -2619,8 +2619,8 @@ { "key": 20620, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20610, "id_after": 20630, "group": 50, @@ -2658,8 +2658,8 @@ { "key": 20630, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20620, "id_after": 20640, "group": 50, @@ -2702,8 +2702,8 @@ { "key": 20640, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20630, "id_after": 20650, "group": 50, @@ -2741,8 +2741,8 @@ { "key": 20650, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20640, "id_after": 20660, "group": 50, @@ -2780,8 +2780,8 @@ { "key": 20660, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20650, "id_after": 20670, "group": 50, @@ -2819,8 +2819,8 @@ { "key": 20670, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20660, "id_after": 20680, "group": 50, @@ -2863,8 +2863,8 @@ { "key": 20680, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20670, "id_after": 20690, "group": 50, @@ -2907,8 +2907,8 @@ { "key": 20690, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20680, "id_after": 20700, "group": 50, @@ -2946,8 +2946,8 @@ { "key": 20700, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20690, "id_after": 20710, "group": 50, @@ -2985,8 +2985,8 @@ { "key": 20710, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20700, "id_after": 20720, "group": 50, @@ -3024,8 +3024,8 @@ { "key": 20720, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20710, "id_after": 20730, "group": 50, @@ -3063,8 +3063,8 @@ { "key": 20730, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20720, "id_after": 20740, "group": 50, @@ -3102,8 +3102,8 @@ { "key": 20740, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20730, "id_after": 20750, "group": 50, @@ -3141,8 +3141,8 @@ { "key": 20750, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20740, "id_after": 20760, "group": 50, @@ -3180,8 +3180,8 @@ { "key": 20760, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20750, "id_after": 20770, "group": 50, @@ -3219,8 +3219,8 @@ { "key": 20770, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20760, "id_after": 20780, "group": 50, @@ -3263,8 +3263,8 @@ { "key": 20780, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20770, "id_after": 20790, "group": 50, @@ -3302,8 +3302,8 @@ { "key": 20790, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20780, "id_after": 20800, "group": 50, @@ -3341,8 +3341,8 @@ { "key": 20800, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20790, "id_after": 20810, "group": 50, @@ -3380,8 +3380,8 @@ { "key": 20810, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20800, "id_after": 20820, "group": 50, @@ -3419,8 +3419,8 @@ { "key": 20820, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20810, "id_after": 20830, "group": 50, @@ -3463,8 +3463,8 @@ { "key": 20830, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20820, "id_after": 20840, "group": 50, @@ -3502,8 +3502,8 @@ { "key": 20840, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20830, "id_after": 20850, "group": 50, @@ -3546,8 +3546,8 @@ { "key": 20850, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20840, "id_after": 20860, "group": 50, @@ -3590,8 +3590,8 @@ { "key": 20860, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20850, "id_after": 20870, "group": 50, @@ -3629,8 +3629,8 @@ { "key": 20870, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20860, "id_after": 20880, "group": 50, @@ -3668,8 +3668,8 @@ { "key": 20880, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20870, "id_after": 20890, "group": 50, @@ -3712,8 +3712,8 @@ { "key": 20890, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20880, "id_after": 20900, "group": 50, @@ -3751,8 +3751,8 @@ { "key": 20900, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20890, "id_after": 20910, "group": 50, @@ -3790,8 +3790,8 @@ { "key": 20910, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20900, "id_after": 20920, "group": 50, @@ -3829,8 +3829,8 @@ { "key": 20920, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20910, "id_after": 20930, "group": 50, @@ -3868,8 +3868,8 @@ { "key": 20930, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20920, "id_after": 20940, "group": 50, @@ -3907,8 +3907,8 @@ { "key": 20940, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20930, "id_after": 20950, "group": 50, @@ -3946,8 +3946,8 @@ { "key": 20950, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20940, "id_after": 20960, "group": 50, @@ -3990,8 +3990,8 @@ { "key": 20960, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20950, "id_after": 20970, "group": 50, @@ -4029,8 +4029,8 @@ { "key": 20970, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20960, "id_after": 20980, "group": 50, @@ -4068,8 +4068,8 @@ { "key": 20980, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20970, "id_after": 20990, "group": 50, @@ -4107,8 +4107,8 @@ { "key": 20990, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20980, "id_after": 21000, "group": 50, @@ -4146,8 +4146,8 @@ { "key": 21000, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20990, "id_after": 21010, "group": 50, @@ -4185,8 +4185,8 @@ { "key": 21010, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21000, "id_after": 21020, "group": 50, @@ -4224,8 +4224,8 @@ { "key": 21020, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21010, "id_after": 21030, "group": 50, @@ -4263,8 +4263,8 @@ { "key": 21030, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21020, "id_after": 21040, "group": 50, @@ -4302,8 +4302,8 @@ { "key": 21040, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21030, "id_after": 21050, "group": 50, @@ -4341,8 +4341,8 @@ { "key": 21050, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21040, "id_after": 21060, "group": 50, @@ -4380,8 +4380,8 @@ { "key": 21060, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21050, "id_after": 21070, "group": 50, @@ -4419,8 +4419,8 @@ { "key": 21070, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21060, "id_after": 21080, "group": 50, @@ -4458,8 +4458,8 @@ { "key": 21080, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21070, "id_after": 21090, "group": 50, @@ -4497,8 +4497,8 @@ { "key": 21090, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21080, "id_after": 21100, "group": 50, @@ -4536,8 +4536,8 @@ { "key": 21100, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21090, "id_after": 21110, "group": 50, @@ -4575,8 +4575,8 @@ { "key": 21110, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21100, "id_after": 21120, "group": 50, @@ -4614,8 +4614,8 @@ { "key": 21120, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21110, "id_after": 21130, "group": 50, @@ -4653,8 +4653,8 @@ { "key": 21130, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21120, "id_after": 21140, "group": 50, @@ -4692,8 +4692,8 @@ { "key": 21140, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21130, "id_after": 21150, "group": 50, @@ -4731,8 +4731,8 @@ { "key": 21150, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21140, "id_after": 21160, "group": 50, @@ -4770,8 +4770,8 @@ { "key": 21160, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21150, "id_after": 21170, "group": 50, @@ -4809,8 +4809,8 @@ { "key": 21170, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21160, "id_after": 21180, "group": 50, @@ -4848,8 +4848,8 @@ { "key": 21180, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21170, "id_after": 21190, "group": 50, @@ -4887,8 +4887,8 @@ { "key": 21190, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21180, "id_after": 0, "group": 50, @@ -4923,479 +4923,11 @@ ], "module": [] }, - { - "key": 300010, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 0, - "id_after": 300020, - "group": 301, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_122", - "text": "阿宝悍娇虎日常一" - }, - "task_details": { - "key": "worldtask_world_task_task_details_122", - "text": "阿宝悍娇虎日常一" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_122", - "text": "阿宝悍娇虎日常一" - }, - "npc": 300010, - "completetask": [ - 1 - ], - "deliver_npc": 300019, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300020, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300010, - "id_after": 0, - "group": 301, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_123", - "text": "阿宝悍娇虎日常二" - }, - "task_details": { - "key": "worldtask_world_task_task_details_123", - "text": "阿宝悍娇虎日常二" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_123", - "text": "阿宝悍娇虎日常二" - }, - "npc": 300020, - "completetask": [ - 1 - ], - "deliver_npc": 300029, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300030, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300020, - "id_after": 300040, - "group": 302, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_124", - "text": "希卡普&亚丝翠&鼻涕粗日常一" - }, - "task_details": { - "key": "worldtask_world_task_task_details_124", - "text": "希卡普&亚丝翠&鼻涕粗日常一" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_124", - "text": "希卡普&亚丝翠&鼻涕粗日常一" - }, - "npc": 300030, - "completetask": [ - 1 - ], - "deliver_npc": 300039, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300040, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300030, - "id_after": 300050, - "group": 302, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_125", - "text": "希卡普&亚丝翠&鼻涕粗日常二" - }, - "task_details": { - "key": "worldtask_world_task_task_details_125", - "text": "希卡普&亚丝翠&鼻涕粗日常二" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_125", - "text": "希卡普&亚丝翠&鼻涕粗日常二" - }, - "npc": 300040, - "completetask": [ - 1 - ], - "deliver_npc": 300049, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300050, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300040, - "id_after": 0, - "group": 302, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_126", - "text": "希卡普&亚丝翠&鼻涕粗日常三" - }, - "task_details": { - "key": "worldtask_world_task_task_details_126", - "text": "希卡普&亚丝翠&鼻涕粗日常三" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_126", - "text": "希卡普&亚丝翠&鼻涕粗日常三" - }, - "npc": 300050, - "completetask": [ - 1 - ], - "deliver_npc": 300059, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300060, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300050, - "id_after": 0, - "group": 0, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_127", - "text": "希卡普&亚丝翠&鼻涕粗日常四" - }, - "task_details": { - "key": "worldtask_world_task_task_details_127", - "text": "希卡普&亚丝翠&鼻涕粗日常四" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_127", - "text": "希卡普&亚丝翠&鼻涕粗日常四" - }, - "npc": 300060, - "completetask": [ - 1 - ], - "deliver_npc": 300069, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300070, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300060, - "id_after": 0, - "group": 303, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_128", - "text": "平先生的焦急" - }, - "task_details": { - "key": "worldtask_world_task_task_details_128", - "text": "平先生的焦急" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_128", - "text": "平先生的焦急" - }, - "npc": 300070, - "completetask": [ - 1 - ], - "deliver_npc": 300079, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300080, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300070, - "id_after": 0, - "group": 304, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_129", - "text": "赛龙的故事" - }, - "task_details": { - "key": "worldtask_world_task_task_details_129", - "text": "赛龙的故事" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_129", - "text": "赛龙的故事" - }, - "npc": 300080, - "completetask": [ - 1 - ], - "deliver_npc": 300089, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300090, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300080, - "id_after": 0, - "group": 305, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_130", - "text": "中轴城历史荣耀墙" - }, - "task_details": { - "key": "worldtask_world_task_task_details_130", - "text": "中轴城历史荣耀墙" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_130", - "text": "中轴城历史荣耀墙" - }, - "npc": 300090, - "completetask": [ - 1 - ], - "deliver_npc": 300099, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300100, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300090, - "id_after": 0, - "group": 306, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_131", - "text": "贪玩的云朵先生" - }, - "task_details": { - "key": "worldtask_world_task_task_details_131", - "text": "贪玩的云朵先生" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_131", - "text": "贪玩的云朵先生" - }, - "npc": 300100, - "completetask": [ - 1 - ], - "deliver_npc": 300109, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300110, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300100, - "id_after": 0, - "group": 307, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_132", - "text": "魔鬼教官邦尼兔" - }, - "task_details": { - "key": "worldtask_world_task_task_details_132", - "text": "魔鬼教官邦尼兔" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_132", - "text": "魔鬼教官邦尼兔" - }, - "npc": 300110, - "completetask": [ - 1 - ], - "deliver_npc": 300119, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300120, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300110, - "id_after": 0, - "group": 308, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_133", - "text": "扫地僧鹤大师" - }, - "task_details": { - "key": "worldtask_world_task_task_details_133", - "text": "扫地僧鹤大师" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_133", - "text": "扫地僧鹤大师" - }, - "npc": 300120, - "completetask": [ - 1 - ], - "deliver_npc": 300129, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, { "key": 500010, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 0, "id_after": 500020, "group": 500, @@ -5436,7 +4968,7 @@ "key": 500020, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 500010, "id_after": 500030, "group": 500, @@ -5477,7 +5009,7 @@ "key": 500030, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 500020, "id_after": 0, "group": 500, @@ -5518,7 +5050,7 @@ "key": 500040, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 0, "id_after": 0, "group": 510, @@ -5559,7 +5091,7 @@ "key": 500050, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 0, "id_after": 0, "group": 520, diff --git a/modules/worldtask/configure.go b/modules/worldtask/configure.go index da203277b..545034387 100644 --- a/modules/worldtask/configure.go +++ b/modules/worldtask/configure.go @@ -20,12 +20,14 @@ const ( type configureComp struct { modules.MCompConfigure + module *Worldtask lock sync.RWMutex worldtaskConf map[int32]*cfg.GameWorldTaskData //key 条件ID } func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompConfigure.Init(service, module, comp, options) + this.module = module.(*Worldtask) err = this.LoadMultiConfigure(map[string]interface{}{ gameWorldTask: cfg.NewGameWorldTask, gameWorldtaskBattle: cfg.NewGameWorldBattle, @@ -38,6 +40,77 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp return } +func (this *configureComp) Start() (err error) { + err = this.MCompConfigure.Start() + this.checkWorldtaskConf() + conf, err := this.getWorldtaskCfg() + if err != nil { + return err + } + this.worldtaskConf = conf.GetDataMap() + return +} + +// 配置文件校验 +func (this *configureComp) checkWorldtaskConf() (err error) { + worldtaskConf, err := this.getWorldtaskCfg() + if err != nil { + return err + } + buriedCondConf, err := this.getBuriedCondCfg() + if err != nil { + return err + } + for _, data := range worldtaskConf.GetDataList() { + // 检查 lock + if data.Lock < 1 { + this.module.Errorf("taskId:%v lock:%v可能存在问题", data.Key, data.Lock) + } + //检查group + if data.Group <= 0 { + this.module.Errorf("taskId:%v group:%v可能存在问题", data.Key, data.Group) + } + //检查des + if data.Des < 1 || data.Des > 5 { + // errs = append(errs, fmt.Sprintf("taskId:%v des:%v可能存在问题", data.Key, data.Des)) + this.module.Errorf("taskId:%v des:%v可能存在问题", data.Key, data.Des) + } + // 检查completetask 是否有效 + for _, condId := range data.Completetask { + if condId > 0 { + if _, ok := buriedCondConf.GetDataMap()[condId]; !ok { + this.module.Errorf("taskId:%v completetask:%v可能是无效的ID", data.Key, condId) + // errs = append(errs, fmt.Sprintf("taskId:%v completetask:%v可能是无效的ID", data.Key, condId)) + } + } + } + //检查NPC + if data.Npc > 0 { + if _, err := this.getNPCById(data.Npc); err != nil { + this.module.Errorf("npcId:%v 可能无效,检查world_task表字段Npc值是否存在于buried/rdtasknpc", data.Npc) + // errs = append(errs, fmt.Sprintf("npcId:%v 可能无效,检查world_task表字段Npc值是否存在于buried/rdtasknpc", data.Npc)) + } + } + if data.DeliverNpc > 0 { + if _, err := this.getNPCById(data.Npc); err != nil { + this.module.Errorf("npcId:%v 可能无效,检查world_task表字段deliver_npc值是否存在于buried/rdtasknpc", data.Npc) + // 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.getNPCById(data.NPC); err != nil { + this.module.Errorf("npcId:%v 可能无效,检查buried_condi表字段NPC值是否存在于buried/rdtasknpc", data.NPC) + + } + } + } + + return +} + func (this *configureComp) getWorldtaskCfg() (data *cfg.GameWorldTask, err error) { var ( v interface{} diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index f504a982e..3bc5c32ce 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -11,7 +11,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" - "strings" ) var _ comm.IWorldtask = (*Worldtask)(nil) @@ -37,7 +36,6 @@ func (this *Worldtask) Init(service core.IService, module core.IModule, options func (this *Worldtask) OnInstallComp() { this.ModuleBase.OnInstallComp() - event.Register(comm.EventBuriedComplete, this.TCondFinishNotify) this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelWorldtask = this.RegisterComp(new(ModelWorldtask)).(*ModelWorldtask) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) @@ -50,14 +48,7 @@ func (this *Worldtask) GetType() core.M_Modules { func (this *Worldtask) Start() (err error) { err = this.ModuleBase.Start() - if err = this.checkWorldtaskConf(); err != nil { - return err - } - conf, err := this.configure.getWorldtaskCfg() - if err != nil { - return err - } - this.configure.worldtaskConf = conf.GetDataMap() + event.Register(comm.EventBuriedComplete, this.TCondFinishNotify) return } @@ -68,66 +59,6 @@ func (this *Worldtask) OpenCmdNotice(session comm.IUserSession, keys ...string) var errs []string -// 配置文件校验 -func (this *Worldtask) checkWorldtaskConf() (err error) { - worldtaskConf, err := this.configure.getWorldtaskCfg() - if err != nil { - return err - } - buriedCondConf, err := this.configure.getBuriedCondCfg() - if err != nil { - return err - } - for _, data := range worldtaskConf.GetDataList() { - // 检查 lock - if data.Lock < 1 { - errs = append(errs, fmt.Sprintf("taskId:%v lock:%v可能存在问题", data.Key, data.Lock)) - } - //检查group - if data.Group <= 0 { - errs = append(errs, fmt.Sprintf("taskId:%v group:%v可能存在问题", data.Key, data.Group)) - } - //检查des - if data.Des < 1 || data.Des > 5 { - errs = append(errs, fmt.Sprintf("taskId:%v des:%v可能存在问题", data.Key, data.Des)) - } - // 检查completetask 是否有效 - for _, condId := range data.Completetask { - if condId > 0 { - if _, ok := buriedCondConf.GetDataMap()[condId]; !ok { - errs = append(errs, fmt.Sprintf("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 -} - // 完成条件通知 func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) { this.Debug("世界任务完成条件通知", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condIds", Value: conds}) diff --git a/modules/wtask/module.go b/modules/wtask/module.go index f2465fd00..af6e9634e 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -238,7 +238,7 @@ func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask) { opencmd = append(opencmd, k) } } - if user = this.ModuleUser.GetUser(session.GetUserId()); user != nil { + if user = this.ModuleUser.GetUser(session.GetUserId()); user == nil { this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()}) return } @@ -295,7 +295,7 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa if _, ok = activatMap[v.Key]; ok { //已在可接取列表中 continue } - if _, ok = acceptsMap[v.Key]; ok { //已在已接取任务列表中 + if _, ok = acceptsMap[v.Key]; v.LockAdd == 0 && ok { //已在已接取任务列表中 LockAdd 0 表示只能接取一次 1 表示可以重复接取 continue } if _, ok = completeMap[v.Key]; ok { //已在完成列表中