From c0bc22d916c97164f3503639901a1df5117ecebc Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 11 Jan 2024 17:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=8E=B7=E5=8F=96=E7=BC=93=E5=AD=98=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_global.json | 1 + bin/json/game_huntingboss.json | 96 ++++ bin/json/game_opencond.json | 357 ++++++++++++++ bin/json/game_vikingboss.json | 136 ++++++ bin/json/game_worldtask.json | 462 +++++++++--------- comm/imodule.go | 4 +- modules/arena/api_info.go | 2 +- modules/capturesheep/api_info.go | 2 +- modules/caravan/api_ranklist.go | 2 +- modules/catchbugs/api_singlegame.go | 2 +- modules/chat/api_send.go | 2 +- modules/combat/api_drop.go | 2 +- modules/dailytask/module.go | 2 +- modules/dcolor/api_accept.go | 2 +- modules/dcolor/api_qiecuo.go | 2 +- modules/dcolor/api_refuse.go | 2 +- modules/enchant/api_challengeover.go | 2 +- modules/entertainment/api_boxreward.go | 2 +- modules/entertainment/api_create.go | 2 +- modules/entertainment/api_joinroom.go | 2 +- modules/entertainment/api_match.go | 2 +- modules/equipment/api_upgrade.go | 2 +- modules/gameinvite/api_accept.go | 2 +- modules/gameinvite/api_qiecuo.go | 2 +- modules/gameinvite/api_refuse.go | 2 +- modules/guildgve/api_challengefinish.go | 4 +- modules/guildgve/api_roulette.go | 2 +- modules/hero/api_awaken.go | 2 +- modules/hero/api_drawCard.go | 4 +- modules/hero/api_peachreward.go | 2 +- modules/hero/api_selectcard.go | 2 +- modules/hero/api_strengthenUpSkill.go | 2 +- modules/hero/api_strengthenUpStar.go | 2 +- modules/hero/api_strengthenUplv.go | 2 +- modules/hero/api_talentlearn.go | 2 +- modules/hero/model_hero.go | 2 +- modules/hunting/api_challenge.go | 2 +- modules/hunting/api_challengeover.go | 2 +- modules/integral/api_challengeover.go | 4 +- modules/items/modelitems.go | 4 +- modules/kftask/api_receive.go | 2 +- modules/mainline/api_challengeover.go | 2 +- modules/mainline/api_levelpass.go | 2 +- modules/modulebase.go | 26 + modules/moonfantasy/api_ask.go | 2 +- modules/moonfantasy/modelDream.go | 4 +- modules/pagoda/api_challengeover.go | 2 +- modules/pagoda/pagoda_test.go | 2 +- modules/parkour/api_Info.go | 2 +- modules/privilege/api_buygift.go | 2 +- modules/shop/api_getlist.go | 2 +- modules/shopcenter/api_receive.go | 2 +- modules/smithy/api_forgeequip.go | 4 +- modules/stonehenge/api_event.go | 6 +- modules/sys/api_funcactivate.go | 1 - modules/sys/api_funcgetList.go | 1 - modules/turntable/module.go | 2 +- modules/user/module.go | 35 +- modules/venture/api_lvreward.go | 2 +- modules/venture/api_signlist.go | 2 +- modules/viking/api_challengeover.go | 2 +- modules/wtask/api_battlefinish.go | 2 +- modules/wtask/api_boxreceive.go | 2 +- modules/wtask/api_info.go | 2 +- modules/wtask/configure.go | 20 +- modules/wtask/module.go | 316 ++---------- sys/configure/structs/Game.HuntingBossData.go | 17 + sys/configure/structs/Game.VikingBossData.go | 17 + sys/configure/structs/Game.WorldTaskData.go | 17 +- sys/configure/structs/TEnum.ETrackType.go | 1 + sys/configure/structs/game.globalData.go | 2 + sys/configure/structs/game.opencondData.go | 15 + 72 files changed, 1055 insertions(+), 593 deletions(-) diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 7dba54bad..750b9c4f1 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -631,6 +631,7 @@ "buzkashi_catchspeed": 800, "buzkashi_catchqtetime": 2000, "buzkashi_recentPlayer": 10, + "buzkashi_trackpartdis": 200, "task_activation": 10000007, "favorability_attenuation": [ { diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json index 3898727f1..f51fb8f85 100644 --- a/bin/json/game_huntingboss.json +++ b/bin/json/game_huntingboss.json @@ -7,6 +7,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 1, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -63,6 +65,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 2, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -119,6 +123,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 3, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -180,6 +186,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 4, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -241,6 +249,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 5, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -302,6 +312,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 6, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -363,6 +375,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 7, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -429,6 +443,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 8, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -495,6 +511,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 9, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -561,6 +579,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 10, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -627,6 +647,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 11, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -693,6 +715,8 @@ "text": "巨型猩猩怪兽" }, "difficulty": 12, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400001, "firstprize": [ { @@ -759,6 +783,8 @@ "text": "火龙" }, "difficulty": 1, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -815,6 +841,8 @@ "text": "火龙" }, "difficulty": 2, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -871,6 +899,8 @@ "text": "火龙" }, "difficulty": 3, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -932,6 +962,8 @@ "text": "火龙" }, "difficulty": 4, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -993,6 +1025,8 @@ "text": "火龙" }, "difficulty": 5, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -1054,6 +1088,8 @@ "text": "火龙" }, "difficulty": 6, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -1115,6 +1151,8 @@ "text": "火龙" }, "difficulty": 7, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -1181,6 +1219,8 @@ "text": "火龙" }, "difficulty": 8, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -1247,6 +1287,8 @@ "text": "火龙" }, "difficulty": 9, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -1313,6 +1355,8 @@ "text": "火龙" }, "difficulty": 10, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -1379,6 +1423,8 @@ "text": "火龙" }, "difficulty": 11, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -1445,6 +1491,8 @@ "text": "火龙" }, "difficulty": 12, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400002, "firstprize": [ { @@ -1511,6 +1559,8 @@ "text": "大厨" }, "difficulty": 1, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -1567,6 +1617,8 @@ "text": "大厨" }, "difficulty": 2, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -1623,6 +1675,8 @@ "text": "大厨" }, "difficulty": 3, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -1684,6 +1738,8 @@ "text": "大厨" }, "difficulty": 4, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -1745,6 +1801,8 @@ "text": "大厨" }, "difficulty": 5, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -1806,6 +1864,8 @@ "text": "大厨" }, "difficulty": 6, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -1867,6 +1927,8 @@ "text": "大厨" }, "difficulty": 7, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -1933,6 +1995,8 @@ "text": "大厨" }, "difficulty": 8, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -1999,6 +2063,8 @@ "text": "大厨" }, "difficulty": 9, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -2065,6 +2131,8 @@ "text": "大厨" }, "difficulty": 10, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -2131,6 +2199,8 @@ "text": "大厨" }, "difficulty": 11, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -2197,6 +2267,8 @@ "text": "大厨" }, "difficulty": 12, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400003, "firstprize": [ { @@ -2263,6 +2335,8 @@ "text": "格尔族" }, "difficulty": 1, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2319,6 +2393,8 @@ "text": "格尔族" }, "difficulty": 2, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2375,6 +2451,8 @@ "text": "格尔族" }, "difficulty": 3, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2436,6 +2514,8 @@ "text": "格尔族" }, "difficulty": 4, + "sweepId": 7, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2497,6 +2577,8 @@ "text": "格尔族" }, "difficulty": 5, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2558,6 +2640,8 @@ "text": "格尔族" }, "difficulty": 6, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2619,6 +2703,8 @@ "text": "格尔族" }, "difficulty": 7, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2685,6 +2771,8 @@ "text": "格尔族" }, "difficulty": 8, + "sweepId": 8, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2751,6 +2839,8 @@ "text": "格尔族" }, "difficulty": 9, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2817,6 +2907,8 @@ "text": "格尔族" }, "difficulty": 10, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2883,6 +2975,8 @@ "text": "格尔族" }, "difficulty": 11, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { @@ -2949,6 +3043,8 @@ "text": "格尔族" }, "difficulty": 12, + "sweepId": 9, + "sweepOpenId": [], "BattleReadyID": 10400004, "firstprize": [ { diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 1828443b4..74ece5427 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -11,6 +11,9 @@ "param": 20034 } ], + "opencondi": [ + 18000001 + ], "wkqbx": 2, "img": "ty_icon_shz", "prompt": { @@ -39,6 +42,9 @@ "param": 1 } ], + "opencondi": [ + 18000002 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -67,6 +73,9 @@ "param": 1 } ], + "opencondi": [ + 18000003 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -95,6 +104,9 @@ "param": 1 } ], + "opencondi": [ + 18000004 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -123,6 +135,9 @@ "param": 1 } ], + "opencondi": [ + 18000005 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -151,6 +166,9 @@ "param": 20261 } ], + "opencondi": [ + 18000006 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -179,6 +197,9 @@ "param": 20034 } ], + "opencondi": [ + 18000007 + ], "wkqbx": 2, "img": "zc_icon_08_ct", "prompt": { @@ -207,6 +228,9 @@ "param": 1 } ], + "opencondi": [ + 18000008 + ], "wkqbx": 2, "img": "icon_sd", "prompt": { @@ -235,6 +259,9 @@ "param": 1101000 } ], + "opencondi": [ + 18000009 + ], "wkqbx": 2, "img": "zc_shuru02", "prompt": { @@ -263,6 +290,9 @@ "param": 1101016 } ], + "opencondi": [ + 18000010 + ], "wkqbx": 2, "img": "icon_sd", "prompt": { @@ -291,6 +321,9 @@ "param": 1 } ], + "opencondi": [ + 18000011 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -319,6 +352,9 @@ "param": 1 } ], + "opencondi": [ + 18000012 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -347,6 +383,9 @@ "param": 20050 } ], + "opencondi": [ + 18000013 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -375,6 +414,9 @@ "param": 1101000 } ], + "opencondi": [ + 18000014 + ], "wkqbx": 2, "img": "icon_rw", "prompt": { @@ -403,6 +445,9 @@ "param": 20030 } ], + "opencondi": [ + 18000015 + ], "wkqbx": 2, "img": "zc_icon_05_ct", "prompt": { @@ -431,6 +476,9 @@ "param": 20032 } ], + "opencondi": [ + 18000016 + ], "wkqbx": 2, "img": "ty_icon_zh", "prompt": { @@ -459,6 +507,9 @@ "param": 1 } ], + "opencondi": [ + 18000017 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -487,6 +538,9 @@ "param": 1 } ], + "opencondi": [ + 18000018 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -515,6 +569,9 @@ "param": 1 } ], + "opencondi": [ + 18000019 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -543,6 +600,9 @@ "param": 1 } ], + "opencondi": [ + 18000020 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -571,6 +631,9 @@ "param": 1 } ], + "opencondi": [ + 18000021 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -599,6 +662,9 @@ "param": 9999 } ], + "opencondi": [ + 18000022 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -627,6 +693,9 @@ "param": 9999 } ], + "opencondi": [ + 18000023 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -655,6 +724,9 @@ "param": 1 } ], + "opencondi": [ + 18000024 + ], "wkqbx": 0, "img": "zc_icon_05_ct", "prompt": { @@ -683,6 +755,9 @@ "param": 1 } ], + "opencondi": [ + 18000025 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -711,6 +786,9 @@ "param": 1 } ], + "opencondi": [ + 18000026 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -739,6 +817,9 @@ "param": 1 } ], + "opencondi": [ + 18000027 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -767,6 +848,9 @@ "param": 1 } ], + "opencondi": [ + 18000028 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -795,6 +879,9 @@ "param": 1 } ], + "opencondi": [ + 18000029 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -823,6 +910,9 @@ "param": 20130 } ], + "opencondi": [ + 18000030 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -851,6 +941,9 @@ "param": 1 } ], + "opencondi": [ + 18000031 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -879,6 +972,9 @@ "param": 1 } ], + "opencondi": [ + 18000032 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -907,6 +1003,9 @@ "param": 1 } ], + "opencondi": [ + 18000033 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -935,6 +1034,9 @@ "param": 1 } ], + "opencondi": [ + 18000034 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -963,6 +1065,9 @@ "param": 1 } ], + "opencondi": [ + 18000035 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -991,6 +1096,9 @@ "param": 20050 } ], + "opencondi": [ + 18000036 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1019,6 +1127,9 @@ "param": 1 } ], + "opencondi": [ + 18000037 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1047,6 +1158,9 @@ "param": 1 } ], + "opencondi": [ + 18000038 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1075,6 +1189,9 @@ "param": 1 } ], + "opencondi": [ + 18000039 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1103,6 +1220,9 @@ "param": 1 } ], + "opencondi": [ + 18000040 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1131,6 +1251,9 @@ "param": 1 } ], + "opencondi": [ + 18000041 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1159,6 +1282,9 @@ "param": 20128 } ], + "opencondi": [ + 18000042 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1187,6 +1313,9 @@ "param": 20140 } ], + "opencondi": [ + 18000043 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1215,6 +1344,9 @@ "param": 1 } ], + "opencondi": [ + 18000044 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1243,6 +1375,9 @@ "param": 1 } ], + "opencondi": [ + 18000045 + ], "wkqbx": 1, "img": "icon_sytj", "prompt": { @@ -1271,6 +1406,9 @@ "param": 1 } ], + "opencondi": [ + 18000046 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1299,6 +1437,9 @@ "param": 1 } ], + "opencondi": [ + 18000047 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1327,6 +1468,9 @@ "param": 20020 } ], + "opencondi": [ + 18000048 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1355,6 +1499,9 @@ "param": 20020 } ], + "opencondi": [ + 18000049 + ], "wkqbx": 2, "img": "", "prompt": { @@ -1383,6 +1530,9 @@ "param": 70 } ], + "opencondi": [ + 18000050 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1411,6 +1561,9 @@ "param": 1 } ], + "opencondi": [ + 18000051 + ], "wkqbx": 1, "img": "icon_sytj", "prompt": { @@ -1439,6 +1592,9 @@ "param": 1 } ], + "opencondi": [ + 18000052 + ], "wkqbx": 1, "img": "icon_sytj", "prompt": { @@ -1467,6 +1623,9 @@ "param": 1 } ], + "opencondi": [ + 18000053 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1495,6 +1654,9 @@ "param": 1 } ], + "opencondi": [ + 18000054 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1523,6 +1685,9 @@ "param": 1 } ], + "opencondi": [ + 18000055 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1551,6 +1716,9 @@ "param": 1 } ], + "opencondi": [ + 18000056 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1579,6 +1747,9 @@ "param": 20140 } ], + "opencondi": [ + 18000057 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1607,6 +1778,9 @@ "param": 1 } ], + "opencondi": [ + 18000058 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1635,6 +1809,9 @@ "param": 1 } ], + "opencondi": [ + 18000059 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1663,6 +1840,9 @@ "param": 1 } ], + "opencondi": [ + 18000060 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1691,6 +1871,9 @@ "param": 20033 } ], + "opencondi": [ + 18000061 + ], "wkqbx": 2, "img": "zc_shuru01", "prompt": { @@ -1719,6 +1902,9 @@ "param": 1 } ], + "opencondi": [ + 18000062 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1747,6 +1933,9 @@ "param": 1 } ], + "opencondi": [ + 18000063 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1775,6 +1964,9 @@ "param": 1 } ], + "opencondi": [ + 18000064 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -1803,6 +1995,9 @@ "param": 1 } ], + "opencondi": [ + 18000065 + ], "wkqbx": 1, "img": "icon_sytj", "prompt": { @@ -1826,6 +2021,9 @@ "text": "维京远征总入口" }, "main": [], + "opencondi": [ + 18000066 + ], "wkqbx": 1, "img": "icon_sytj", "prompt": { @@ -1854,6 +2052,9 @@ "param": 1 } ], + "opencondi": [ + 18000067 + ], "wkqbx": 1, "img": "icon_sytj", "prompt": { @@ -1882,6 +2083,9 @@ "param": 1 } ], + "opencondi": [ + 18000068 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1910,6 +2114,9 @@ "param": 1 } ], + "opencondi": [ + 18000069 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1938,6 +2145,9 @@ "param": 1 } ], + "opencondi": [ + 18000070 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -1966,6 +2176,9 @@ "param": 1 } ], + "opencondi": [ + 18000071 + ], "wkqbx": 1, "img": "ty_qp_tzt", "prompt": { @@ -1994,6 +2207,9 @@ "param": 1 } ], + "opencondi": [ + 18000072 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -2024,6 +2240,9 @@ "param": 6 } ], + "opencondi": [ + 18000073 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -2054,6 +2273,9 @@ "param": 10 } ], + "opencondi": [ + 18000074 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -2084,6 +2306,9 @@ "param": 2 } ], + "opencondi": [ + 18000075 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -2112,6 +2337,9 @@ "param": 1101012 } ], + "opencondi": [ + 18000076 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -2140,6 +2368,9 @@ "param": 10 } ], + "opencondi": [ + 18000077 + ], "wkqbx": 3, "img": "ty_qp_jx", "prompt": { @@ -2168,6 +2399,9 @@ "param": 70 } ], + "opencondi": [ + 18000078 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -2196,6 +2430,9 @@ "param": 1 } ], + "opencondi": [ + 18000079 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -2224,6 +2461,9 @@ "param": 1 } ], + "opencondi": [ + 18000080 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -2252,6 +2492,9 @@ "param": 1 } ], + "opencondi": [ + 18000081 + ], "wkqbx": 0, "img": "ty_qp_jy", "prompt": { @@ -2280,6 +2523,9 @@ "param": 20050 } ], + "opencondi": [ + 18000082 + ], "wkqbx": 0, "img": "ty_qp_mryj", "prompt": { @@ -2308,6 +2554,9 @@ "param": 1 } ], + "opencondi": [ + 18000083 + ], "wkqbx": 0, "img": "ty_qp_gsb", "prompt": { @@ -2336,6 +2585,9 @@ "param": 1 } ], + "opencondi": [ + 18000084 + ], "wkqbx": 0, "img": "icon_qd", "prompt": { @@ -2364,6 +2616,9 @@ "param": 20250 } ], + "opencondi": [ + 18000085 + ], "wkqbx": 0, "img": "ty_qp_pr", "prompt": { @@ -2392,6 +2647,9 @@ "param": 10 } ], + "opencondi": [ + 18000086 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -2420,6 +2678,9 @@ "param": 1 } ], + "opencondi": [ + 18000087 + ], "wkqbx": 0, "img": "ty_icon_lht", "prompt": { @@ -2443,6 +2704,9 @@ "text": "无极塔" }, "main": [], + "opencondi": [ + 18000088 + ], "wkqbx": 0, "img": "ty_icon_wjt", "prompt": { @@ -2471,6 +2735,9 @@ "param": 1 } ], + "opencondi": [ + 18000089 + ], "wkqbx": 2, "img": "cgt_icon_hfsj", "prompt": { @@ -2499,6 +2766,9 @@ "param": 1 } ], + "opencondi": [ + 18000090 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2527,6 +2797,9 @@ "param": 1 } ], + "opencondi": [ + 18000091 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2555,6 +2828,9 @@ "param": 40 } ], + "opencondi": [ + 18000092 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2585,6 +2861,9 @@ "param": 20050 } ], + "opencondi": [ + 18000093 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2613,6 +2892,9 @@ "param": 10 } ], + "opencondi": [ + 18000094 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2641,6 +2923,9 @@ "param": 1101000 } ], + "opencondi": [ + 18000095 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2669,6 +2954,9 @@ "param": 20140 } ], + "opencondi": [ + 18000096 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2697,6 +2985,9 @@ "param": 1 } ], + "opencondi": [ + 18000097 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2725,6 +3016,9 @@ "param": 1 } ], + "opencondi": [ + 18000098 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2753,6 +3047,9 @@ "param": 1 } ], + "opencondi": [ + 18000099 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2781,6 +3078,9 @@ "param": 1 } ], + "opencondi": [ + 18000100 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2809,6 +3109,9 @@ "param": 1 } ], + "opencondi": [ + 18000101 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2837,6 +3140,9 @@ "param": 2 } ], + "opencondi": [ + 18000102 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2865,6 +3171,9 @@ "param": 3 } ], + "opencondi": [ + 18000103 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2893,6 +3202,9 @@ "param": 1101017 } ], + "opencondi": [ + 18000104 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2921,6 +3233,9 @@ "param": 1102020 } ], + "opencondi": [ + 18000105 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2949,6 +3264,9 @@ "param": 1103015 } ], + "opencondi": [ + 18000106 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -2977,6 +3295,9 @@ "param": 1104031 } ], + "opencondi": [ + 18000107 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -3005,6 +3326,9 @@ "param": 70 } ], + "opencondi": [ + 18000108 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -3033,6 +3357,9 @@ "param": 71 } ], + "opencondi": [ + 18000109 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -3061,6 +3388,9 @@ "param": 72 } ], + "opencondi": [ + 18000110 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -3089,6 +3419,9 @@ "param": 73 } ], + "opencondi": [ + 18000111 + ], "wkqbx": 2, "img": "icon_sytj", "prompt": { @@ -3117,6 +3450,9 @@ "param": 1101037 } ], + "opencondi": [ + 18000112 + ], "wkqbx": 0, "img": "ty_qp_by", "prompt": { @@ -3145,6 +3481,9 @@ "param": 1101004 } ], + "opencondi": [ + 18000113 + ], "wkqbx": 0, "img": "icon_cbt_bs", "prompt": { @@ -3173,6 +3512,9 @@ "param": 1101012 } ], + "opencondi": [ + 18000114 + ], "wkqbx": 2, "img": "zm_icon_shzl", "prompt": { @@ -3201,6 +3543,9 @@ "param": 1101018 } ], + "opencondi": [ + 18000115 + ], "wkqbx": 0, "img": "ty_icon_xlyc", "prompt": { @@ -3229,6 +3574,9 @@ "param": 20250 } ], + "opencondi": [ + 18000116 + ], "wkqbx": 2, "img": "", "prompt": { @@ -3257,6 +3605,9 @@ "param": 1 } ], + "opencondi": [ + 18000117 + ], "wkqbx": 0, "img": "icon_sytj", "prompt": { @@ -3285,6 +3636,9 @@ "param": 1101012 } ], + "opencondi": [ + 18000118 + ], "wkqbx": 2, "img": "", "prompt": { @@ -3313,6 +3667,9 @@ "param": 1102023 } ], + "opencondi": [ + 18000119 + ], "wkqbx": 2, "img": "", "prompt": { diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index 1a9ccaad9..6815976e1 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -8,6 +8,8 @@ "text": "火焰泰坦" }, "difficulty": 1, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500004, "captionrecommend": [ 25001, @@ -73,6 +75,8 @@ "text": "火焰泰坦" }, "difficulty": 2, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -133,6 +137,8 @@ "text": "火焰泰坦" }, "difficulty": 3, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -198,6 +204,8 @@ "text": "火焰泰坦" }, "difficulty": 4, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -258,6 +266,8 @@ "text": "火焰泰坦" }, "difficulty": 5, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -323,6 +333,8 @@ "text": "火焰泰坦" }, "difficulty": 6, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -388,6 +400,8 @@ "text": "火焰泰坦" }, "difficulty": 7, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -458,6 +472,8 @@ "text": "火焰泰坦" }, "difficulty": 8, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -523,6 +539,8 @@ "text": "火焰泰坦" }, "difficulty": 9, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -593,6 +611,8 @@ "text": "火焰泰坦" }, "difficulty": 10, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -663,6 +683,8 @@ "text": "火焰泰坦" }, "difficulty": 11, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -733,6 +755,8 @@ "text": "火焰泰坦" }, "difficulty": 12, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500001, "captionrecommend": [ 25001, @@ -798,6 +822,8 @@ "text": "冰霜泰坦" }, "difficulty": 1, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -863,6 +889,8 @@ "text": "冰霜泰坦" }, "difficulty": 2, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -923,6 +951,8 @@ "text": "冰霜泰坦" }, "difficulty": 3, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -988,6 +1018,8 @@ "text": "冰霜泰坦" }, "difficulty": 4, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -1048,6 +1080,8 @@ "text": "冰霜泰坦" }, "difficulty": 5, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -1113,6 +1147,8 @@ "text": "冰霜泰坦" }, "difficulty": 6, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -1178,6 +1214,8 @@ "text": "冰霜泰坦" }, "difficulty": 7, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -1248,6 +1286,8 @@ "text": "冰霜泰坦" }, "difficulty": 8, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -1313,6 +1353,8 @@ "text": "冰霜泰坦" }, "difficulty": 9, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -1383,6 +1425,8 @@ "text": "冰霜泰坦" }, "difficulty": 10, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -1453,6 +1497,8 @@ "text": "冰霜泰坦" }, "difficulty": 11, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -1523,6 +1569,8 @@ "text": "冰霜泰坦" }, "difficulty": 12, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500003, "captionrecommend": [ 14007, @@ -1588,6 +1636,8 @@ "text": "森林泰坦" }, "difficulty": 1, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -1653,6 +1703,8 @@ "text": "森林泰坦" }, "difficulty": 2, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -1713,6 +1765,8 @@ "text": "森林泰坦" }, "difficulty": 3, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -1778,6 +1832,8 @@ "text": "森林泰坦" }, "difficulty": 4, + "sweepId": 4, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -1838,6 +1894,8 @@ "text": "森林泰坦" }, "difficulty": 5, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -1903,6 +1961,8 @@ "text": "森林泰坦" }, "difficulty": 6, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -1968,6 +2028,8 @@ "text": "森林泰坦" }, "difficulty": 7, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -2038,6 +2100,8 @@ "text": "森林泰坦" }, "difficulty": 8, + "sweepId": 5, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -2103,6 +2167,8 @@ "text": "森林泰坦" }, "difficulty": 9, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -2173,6 +2239,8 @@ "text": "森林泰坦" }, "difficulty": 10, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -2243,6 +2311,8 @@ "text": "森林泰坦" }, "difficulty": 11, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -2313,6 +2383,8 @@ "text": "森林泰坦" }, "difficulty": 12, + "sweepId": 6, + "sweepOpenId": [], "BattleReadyID": 10500002, "captionrecommend": [ 25003, @@ -2378,6 +2450,8 @@ "text": "武器BOSS" }, "difficulty": 1, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -2458,6 +2532,8 @@ "text": "武器BOSS" }, "difficulty": 2, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -2538,6 +2614,8 @@ "text": "武器BOSS" }, "difficulty": 3, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -2618,6 +2696,8 @@ "text": "武器BOSS" }, "difficulty": 4, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -2698,6 +2778,8 @@ "text": "武器BOSS" }, "difficulty": 5, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -2778,6 +2860,8 @@ "text": "武器BOSS" }, "difficulty": 6, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -2858,6 +2942,8 @@ "text": "武器BOSS" }, "difficulty": 7, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -2938,6 +3024,8 @@ "text": "武器BOSS" }, "difficulty": 8, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3018,6 +3106,8 @@ "text": "武器BOSS" }, "difficulty": 9, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3098,6 +3188,8 @@ "text": "武器BOSS" }, "difficulty": 10, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3178,6 +3270,8 @@ "text": "饰品BOSS" }, "difficulty": 1, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3258,6 +3352,8 @@ "text": "饰品BOSS" }, "difficulty": 2, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3338,6 +3434,8 @@ "text": "饰品BOSS" }, "difficulty": 3, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3418,6 +3516,8 @@ "text": "饰品BOSS" }, "difficulty": 4, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3498,6 +3598,8 @@ "text": "饰品BOSS" }, "difficulty": 5, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3578,6 +3680,8 @@ "text": "饰品BOSS" }, "difficulty": 6, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3658,6 +3762,8 @@ "text": "饰品BOSS" }, "difficulty": 7, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3738,6 +3844,8 @@ "text": "饰品BOSS" }, "difficulty": 8, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3818,6 +3926,8 @@ "text": "饰品BOSS" }, "difficulty": 9, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3898,6 +4008,8 @@ "text": "饰品BOSS" }, "difficulty": 10, + "sweepId": 0, + "sweepOpenId": [], "BattleReadyID": 11106001, "captionrecommend": [ 25001, @@ -3978,6 +4090,8 @@ "text": "梦境回廊" }, "difficulty": 1, + "sweepId": 1, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4043,6 +4157,8 @@ "text": "梦境回廊" }, "difficulty": 2, + "sweepId": 1, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4108,6 +4224,8 @@ "text": "梦境回廊" }, "difficulty": 3, + "sweepId": 1, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4173,6 +4291,8 @@ "text": "梦境回廊" }, "difficulty": 4, + "sweepId": 1, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4239,6 +4359,8 @@ "text": "梦境回廊" }, "difficulty": 5, + "sweepId": 2, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4305,6 +4427,8 @@ "text": "梦境回廊" }, "difficulty": 6, + "sweepId": 2, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4371,6 +4495,8 @@ "text": "梦境回廊" }, "difficulty": 7, + "sweepId": 2, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4437,6 +4563,8 @@ "text": "梦境回廊" }, "difficulty": 8, + "sweepId": 2, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4504,6 +4632,8 @@ "text": "梦境回廊" }, "difficulty": 9, + "sweepId": 3, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4576,6 +4706,8 @@ "text": "梦境回廊" }, "difficulty": 10, + "sweepId": 3, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4648,6 +4780,8 @@ "text": "梦境回廊" }, "difficulty": 11, + "sweepId": 3, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, @@ -4720,6 +4854,8 @@ "text": "梦境回廊" }, "difficulty": 12, + "sweepId": 3, + "sweepOpenId": [], "BattleReadyID": 11904001, "captionrecommend": [ 25001, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 83cb50392..be9568b01 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -1,7 +1,7 @@ [ { "key": 20010, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -60,7 +60,7 @@ }, { "key": 20011, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20010, @@ -102,7 +102,7 @@ }, { "key": 20012, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20011, @@ -170,7 +170,7 @@ }, { "key": 20020, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20012, @@ -228,7 +228,7 @@ }, { "key": 20030, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20020, @@ -282,7 +282,7 @@ }, { "key": 20031, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20030, @@ -333,7 +333,7 @@ }, { "key": 20032, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20031, @@ -386,7 +386,7 @@ }, { "key": 20033, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20032, @@ -442,7 +442,7 @@ }, { "key": 20034, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20033, @@ -500,7 +500,7 @@ }, { "key": 20035, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20034, @@ -561,7 +561,7 @@ }, { "key": 20042, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20035, @@ -617,7 +617,7 @@ }, { "key": 20043, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20042, @@ -659,7 +659,7 @@ }, { "key": 20050, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20043, @@ -717,7 +717,7 @@ }, { "key": 20100, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20050, @@ -775,7 +775,7 @@ }, { "key": 20102, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20100, @@ -833,7 +833,7 @@ }, { "key": 20104, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20102, @@ -891,7 +891,7 @@ }, { "key": 20106, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20104, @@ -949,7 +949,7 @@ }, { "key": 20108, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20106, @@ -1007,7 +1007,7 @@ }, { "key": 20109, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20108, @@ -1065,7 +1065,7 @@ }, { "key": 20110, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20109, @@ -1123,7 +1123,7 @@ }, { "key": 20112, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20110, @@ -1181,7 +1181,7 @@ }, { "key": 20114, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20112, @@ -1239,7 +1239,7 @@ }, { "key": 20118, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20114, @@ -1297,7 +1297,7 @@ }, { "key": 20120, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20118, @@ -1355,7 +1355,7 @@ }, { "key": 20122, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20120, @@ -1413,7 +1413,7 @@ }, { "key": 20124, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20122, @@ -1471,7 +1471,7 @@ }, { "key": 20126, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20124, @@ -1529,7 +1529,7 @@ }, { "key": 20128, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20126, @@ -1597,7 +1597,7 @@ }, { "key": 20140, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20128, @@ -1655,7 +1655,7 @@ }, { "key": 20150, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20140, @@ -1723,7 +1723,7 @@ }, { "key": 20160, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20150, @@ -1791,7 +1791,7 @@ }, { "key": 20161, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20160, @@ -1854,7 +1854,7 @@ }, { "key": 20230, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20161, @@ -1917,7 +1917,7 @@ }, { "key": 20240, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20230, @@ -1983,7 +1983,7 @@ }, { "key": 20250, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20240, @@ -2046,7 +2046,7 @@ }, { "key": 20252, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -2109,7 +2109,7 @@ }, { "key": 20253, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20252, @@ -2172,7 +2172,7 @@ }, { "key": 20254, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20253, @@ -2235,7 +2235,7 @@ }, { "key": 20255, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20254, @@ -2298,7 +2298,7 @@ }, { "key": 20256, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20255, @@ -2361,7 +2361,7 @@ }, { "key": 20257, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20256, @@ -2424,7 +2424,7 @@ }, { "key": 20258, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20257, @@ -2487,7 +2487,7 @@ }, { "key": 20259, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20258, @@ -2550,7 +2550,7 @@ }, { "key": 20260, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20259, @@ -2613,7 +2613,7 @@ }, { "key": 20261, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20260, @@ -2699,7 +2699,7 @@ }, { "key": 20310, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20261, @@ -2747,7 +2747,7 @@ }, { "key": 20320, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20310, @@ -2789,7 +2789,7 @@ }, { "key": 20330, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20320, @@ -2831,7 +2831,7 @@ }, { "key": 20340, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20330, @@ -2873,7 +2873,7 @@ }, { "key": 20350, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20340, @@ -2915,7 +2915,7 @@ }, { "key": 20351, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20350, @@ -2957,7 +2957,7 @@ }, { "key": 20352, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20351, @@ -2999,7 +2999,7 @@ }, { "key": 20353, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20352, @@ -3041,7 +3041,7 @@ }, { "key": 20360, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20353, @@ -3104,7 +3104,7 @@ }, { "key": 20361, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20360, @@ -3167,7 +3167,7 @@ }, { "key": 20362, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20361, @@ -3230,7 +3230,7 @@ }, { "key": 20363, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20362, @@ -3293,7 +3293,7 @@ }, { "key": 20364, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20363, @@ -3356,7 +3356,7 @@ }, { "key": 20365, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20364, @@ -3398,7 +3398,7 @@ }, { "key": 20366, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20365, @@ -3440,7 +3440,7 @@ }, { "key": 20370, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20366, @@ -3504,7 +3504,7 @@ }, { "key": 20371, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20370, @@ -3546,7 +3546,7 @@ }, { "key": 20372, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20371, @@ -3588,7 +3588,7 @@ }, { "key": 20373, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20372, @@ -3630,7 +3630,7 @@ }, { "key": 20374, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20373, @@ -3672,7 +3672,7 @@ }, { "key": 20375, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20374, @@ -3714,7 +3714,7 @@ }, { "key": 20376, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20375, @@ -3756,7 +3756,7 @@ }, { "key": 20377, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20376, @@ -3798,7 +3798,7 @@ }, { "key": 20378, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20377, @@ -3840,7 +3840,7 @@ }, { "key": 20379, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20378, @@ -3882,7 +3882,7 @@ }, { "key": 20440, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20379, @@ -3945,7 +3945,7 @@ }, { "key": 20441, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20440, @@ -3987,7 +3987,7 @@ }, { "key": 20442, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20441, @@ -4029,7 +4029,7 @@ }, { "key": 20443, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20442, @@ -4071,7 +4071,7 @@ }, { "key": 20444, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20443, @@ -4113,7 +4113,7 @@ }, { "key": 20445, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20444, @@ -4155,7 +4155,7 @@ }, { "key": 20450, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20445, @@ -4213,7 +4213,7 @@ }, { "key": 20460, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20450, @@ -4274,7 +4274,7 @@ }, { "key": 20470, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20460, @@ -4332,7 +4332,7 @@ }, { "key": 20480, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20470, @@ -4395,7 +4395,7 @@ }, { "key": 20490, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20480, @@ -4453,7 +4453,7 @@ }, { "key": 20500, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20490, @@ -4516,7 +4516,7 @@ }, { "key": 20510, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20500, @@ -4572,7 +4572,7 @@ }, { "key": 20520, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20510, @@ -4633,7 +4633,7 @@ }, { "key": 20530, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20520, @@ -4691,7 +4691,7 @@ }, { "key": 20540, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20530, @@ -4754,7 +4754,7 @@ }, { "key": 20550, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20540, @@ -4812,7 +4812,7 @@ }, { "key": 20560, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20550, @@ -4875,7 +4875,7 @@ }, { "key": 20570, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20560, @@ -4933,7 +4933,7 @@ }, { "key": 20580, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20570, @@ -4996,7 +4996,7 @@ }, { "key": 20590, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20580, @@ -5054,7 +5054,7 @@ }, { "key": 20600, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20590, @@ -5117,7 +5117,7 @@ }, { "key": 20610, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20600, @@ -5175,7 +5175,7 @@ }, { "key": 20620, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20610, @@ -5236,7 +5236,7 @@ }, { "key": 20630, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20620, @@ -5294,7 +5294,7 @@ }, { "key": 20640, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20630, @@ -5357,7 +5357,7 @@ }, { "key": 20650, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20640, @@ -5415,7 +5415,7 @@ }, { "key": 20660, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20650, @@ -5478,7 +5478,7 @@ }, { "key": 20670, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20660, @@ -5536,7 +5536,7 @@ }, { "key": 20680, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20670, @@ -5599,7 +5599,7 @@ }, { "key": 20690, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20680, @@ -5657,7 +5657,7 @@ }, { "key": 20700, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20690, @@ -5720,7 +5720,7 @@ }, { "key": 20710, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20700, @@ -5778,7 +5778,7 @@ }, { "key": 20720, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20710, @@ -5841,7 +5841,7 @@ }, { "key": 20730, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20720, @@ -5899,7 +5899,7 @@ }, { "key": 20740, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20730, @@ -5962,7 +5962,7 @@ }, { "key": 20750, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20740, @@ -6020,7 +6020,7 @@ }, { "key": 20760, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20750, @@ -6083,7 +6083,7 @@ }, { "key": 20770, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20760, @@ -6141,7 +6141,7 @@ }, { "key": 20780, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20770, @@ -6204,7 +6204,7 @@ }, { "key": 20790, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20780, @@ -6262,7 +6262,7 @@ }, { "key": 20800, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20790, @@ -6325,7 +6325,7 @@ }, { "key": 20810, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20800, @@ -6383,7 +6383,7 @@ }, { "key": 20820, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20810, @@ -6446,7 +6446,7 @@ }, { "key": 20830, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20820, @@ -6504,7 +6504,7 @@ }, { "key": 20840, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20830, @@ -6567,7 +6567,7 @@ }, { "key": 20850, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20840, @@ -6625,7 +6625,7 @@ }, { "key": 20860, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20850, @@ -6688,7 +6688,7 @@ }, { "key": 20870, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20860, @@ -6746,7 +6746,7 @@ }, { "key": 20880, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20870, @@ -6809,7 +6809,7 @@ }, { "key": 20890, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20880, @@ -6867,7 +6867,7 @@ }, { "key": 20900, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20890, @@ -6930,7 +6930,7 @@ }, { "key": 20910, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20900, @@ -6988,7 +6988,7 @@ }, { "key": 20920, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20910, @@ -7051,7 +7051,7 @@ }, { "key": 20930, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20920, @@ -7109,7 +7109,7 @@ }, { "key": 20940, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20930, @@ -7172,7 +7172,7 @@ }, { "key": 20950, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20940, @@ -7230,7 +7230,7 @@ }, { "key": 20960, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20950, @@ -7288,7 +7288,7 @@ }, { "key": 20970, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20960, @@ -7351,7 +7351,7 @@ }, { "key": 20980, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20970, @@ -7409,7 +7409,7 @@ }, { "key": 20990, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20980, @@ -7472,7 +7472,7 @@ }, { "key": 21000, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20990, @@ -7530,7 +7530,7 @@ }, { "key": 21010, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21000, @@ -7593,7 +7593,7 @@ }, { "key": 21020, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21010, @@ -7641,7 +7641,7 @@ }, { "key": 21030, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21020, @@ -7689,7 +7689,7 @@ }, { "key": 21040, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21030, @@ -7737,7 +7737,7 @@ }, { "key": 21050, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21040, @@ -7785,7 +7785,7 @@ }, { "key": 21060, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21050, @@ -7833,7 +7833,7 @@ }, { "key": 21070, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21060, @@ -7881,7 +7881,7 @@ }, { "key": 21080, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21070, @@ -7929,7 +7929,7 @@ }, { "key": 21090, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21080, @@ -7977,7 +7977,7 @@ }, { "key": 21100, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21090, @@ -8025,7 +8025,7 @@ }, { "key": 21110, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21100, @@ -8073,7 +8073,7 @@ }, { "key": 21120, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21110, @@ -8121,7 +8121,7 @@ }, { "key": 21130, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21120, @@ -8169,7 +8169,7 @@ }, { "key": 21140, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21130, @@ -8217,7 +8217,7 @@ }, { "key": 21150, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21140, @@ -8265,7 +8265,7 @@ }, { "key": 21160, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21150, @@ -8313,7 +8313,7 @@ }, { "key": 21170, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21160, @@ -8361,7 +8361,7 @@ }, { "key": 21180, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21170, @@ -8409,7 +8409,7 @@ }, { "key": 21190, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21180, @@ -8457,7 +8457,7 @@ }, { "key": 500010, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -8517,7 +8517,7 @@ }, { "key": 500020, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -8577,7 +8577,7 @@ }, { "key": 500030, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -8637,7 +8637,7 @@ }, { "key": 500040, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -8697,7 +8697,7 @@ }, { "key": 300010, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20364, @@ -8743,7 +8743,7 @@ }, { "key": 300011, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 300010, @@ -8789,7 +8789,7 @@ }, { "key": 300020, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 300011, @@ -8837,7 +8837,7 @@ }, { "key": 300030, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -8883,7 +8883,7 @@ }, { "key": 300031, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20114, @@ -8931,7 +8931,7 @@ }, { "key": 300040, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20124, @@ -8985,7 +8985,7 @@ }, { "key": 300050, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 300040, @@ -9033,7 +9033,7 @@ }, { "key": 300060, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 300050, @@ -9081,7 +9081,7 @@ }, { "key": 300070, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 300060, @@ -9127,7 +9127,7 @@ }, { "key": 300080, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 300070, @@ -9173,7 +9173,7 @@ }, { "key": 300090, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 300080, @@ -9219,7 +9219,7 @@ }, { "key": 300100, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20118, @@ -9265,7 +9265,7 @@ }, { "key": 300101, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20252, @@ -9319,7 +9319,7 @@ }, { "key": 300102, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20255, @@ -9367,7 +9367,7 @@ }, { "key": 300103, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 300102, @@ -9415,7 +9415,7 @@ }, { "key": 300104, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20257, @@ -9469,7 +9469,7 @@ }, { "key": 300105, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20109, @@ -9511,7 +9511,7 @@ }, { "key": 300106, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20109, @@ -9553,7 +9553,7 @@ }, { "key": 320110, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -9601,7 +9601,7 @@ }, { "key": 320120, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -9649,7 +9649,7 @@ }, { "key": 320130, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -9695,7 +9695,7 @@ }, { "key": 320140, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -9741,7 +9741,7 @@ }, { "key": 320150, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21190, @@ -9787,7 +9787,7 @@ }, { "key": 320160, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21190, @@ -9835,7 +9835,7 @@ }, { "key": 320161, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 320160, @@ -9883,7 +9883,7 @@ }, { "key": 320170, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 21190, @@ -9931,7 +9931,7 @@ }, { "key": 320180, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -9977,7 +9977,7 @@ }, { "key": 320190, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -10023,7 +10023,7 @@ }, { "key": 320200, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -10069,7 +10069,7 @@ }, { "key": 320210, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -10115,7 +10115,7 @@ }, { "key": 320220, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -10161,7 +10161,7 @@ }, { "key": 320230, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -10207,7 +10207,7 @@ }, { "key": 320231, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 320230, @@ -10253,7 +10253,7 @@ }, { "key": 320240, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -10299,7 +10299,7 @@ }, { "key": 320250, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -10345,7 +10345,7 @@ }, { "key": 320260, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 20250, @@ -10393,7 +10393,7 @@ }, { "key": 100010, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -10456,7 +10456,7 @@ }, { "key": 100030, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -10519,7 +10519,7 @@ }, { "key": 100040, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -10582,7 +10582,7 @@ }, { "key": 100050, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -10645,7 +10645,7 @@ }, { "key": 100060, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -10708,7 +10708,7 @@ }, { "key": 100070, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -10771,7 +10771,7 @@ }, { "key": 100080, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -10834,7 +10834,7 @@ }, { "key": 100090, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -10897,7 +10897,7 @@ }, { "key": 100100, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -10960,7 +10960,7 @@ }, { "key": 100110, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11023,7 +11023,7 @@ }, { "key": 100120, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11086,7 +11086,7 @@ }, { "key": 100130, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11149,7 +11149,7 @@ }, { "key": 100140, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11212,7 +11212,7 @@ }, { "key": 100150, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11275,7 +11275,7 @@ }, { "key": 100160, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11338,7 +11338,7 @@ }, { "key": 100170, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11401,7 +11401,7 @@ }, { "key": 100180, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11464,7 +11464,7 @@ }, { "key": 100190, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11527,7 +11527,7 @@ }, { "key": 100200, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11590,7 +11590,7 @@ }, { "key": 100210, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11653,7 +11653,7 @@ }, { "key": 100220, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11716,7 +11716,7 @@ }, { "key": 100230, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11779,7 +11779,7 @@ }, { "key": 100240, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11844,7 +11844,7 @@ }, { "key": 100250, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11909,7 +11909,7 @@ }, { "key": 100260, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -11974,7 +11974,7 @@ }, { "key": 100270, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -12039,7 +12039,7 @@ }, { "key": 100280, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -12104,7 +12104,7 @@ }, { "key": 100290, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -12165,7 +12165,7 @@ }, { "key": 100300, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 100290, @@ -12228,7 +12228,7 @@ }, { "key": 100320, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -12289,7 +12289,7 @@ }, { "key": 100330, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 100320, @@ -12352,7 +12352,7 @@ }, { "key": 100350, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -12413,7 +12413,7 @@ }, { "key": 100360, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 100350, @@ -12476,7 +12476,7 @@ }, { "key": 100380, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -12539,7 +12539,7 @@ }, { "key": 100410, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -12600,7 +12600,7 @@ }, { "key": 100420, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 100410, @@ -12663,7 +12663,7 @@ }, { "key": 600010, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -12711,7 +12711,7 @@ }, { "key": 600020, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 1111111, @@ -12762,7 +12762,7 @@ }, { "key": 600030, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, @@ -12810,7 +12810,7 @@ }, { "key": 600040, - "opencond": "", + "opencond": [], "lock": 1, "lockend": 999, "ontxe": 0, diff --git a/comm/imodule.go b/comm/imodule.go index 3c73b5ab4..302414dd2 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -422,7 +422,7 @@ type ( } // 世界任务 IWorldtask interface { - IOpenCmdNotice + // IOpenCmdNotice // bingo任务 BingoJumpTask(session IUserSession, groupId, rtaskId int32) error // 通过任务ID bingo @@ -577,7 +577,7 @@ type ( // 世界任务 IWtask interface { IBuriedUpdateNotify - IOpenCmdNotice + // IOpenCmdNotice AcceptCaravanTask(session IUserSession, groupId int32) (tid, groud int32, errdata *pb.ErrorData) ClearCaravanTask(session IUserSession, task int32) // bingo任务 diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go index 50d0f6f28..dcb4a02e4 100644 --- a/modules/arena/api_info.go +++ b/modules/arena/api_info.go @@ -28,7 +28,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd if errdata = this.InfoCheck(session, req); errdata != nil { return } - user, err = this.module.ModuleUser.GetUser(session.GetUserId()) + user, err = this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/capturesheep/api_info.go b/modules/capturesheep/api_info.go index d3bdcf4f0..510df74b8 100644 --- a/modules/capturesheep/api_info.go +++ b/modules/capturesheep/api_info.go @@ -26,7 +26,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.CapturesheepInfoReq if errdata = this.InfoCheck(session, req); errdata != nil { return } - user, err = this.module.ModuleUser.GetUser(session.GetUserId()) + user, err = this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/caravan/api_ranklist.go b/modules/caravan/api_ranklist.go index ce512770f..bd25c8c31 100644 --- a/modules/caravan/api_ranklist.go +++ b/modules/caravan/api_ranklist.go @@ -22,7 +22,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.CaravanRankList } //resp.List, rankid = this.module.modelCaravan.GetRankListData(comm.MaxRankList, session.GetUserId()) resp.List, rankid = this.module.rank.getRankList(session.GetUserId()) // 2023.10.10 改跨服 - userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId()) + userinfo, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/catchbugs/api_singlegame.go b/modules/catchbugs/api_singlegame.go index 4e216058b..91a4ebd98 100644 --- a/modules/catchbugs/api_singlegame.go +++ b/modules/catchbugs/api_singlegame.go @@ -28,7 +28,7 @@ func (this *apiComp) SingleGame(session comm.IUserSession, req *pb.CatchbugsSing return } //发起者 red - user, err = this.module.ModuleUser.GetUser(session.GetUserId()) + user, err = this.module.GetUserForSession(session) if err != nil { this.module.Error("未找到红方信息", log.Field{Key: "uid", Value: session.GetUserId()}) return diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index 72f227a2d..ee0fe6a66 100644 --- a/modules/chat/api_send.go +++ b/modules/chat/api_send.go @@ -36,7 +36,7 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda } // 禁言校验 - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_UserNofound, Title: pb.ErrorCode_UserNofound.ToString(), diff --git a/modules/combat/api_drop.go b/modules/combat/api_drop.go index af34a0183..793f0a470 100644 --- a/modules/combat/api_drop.go +++ b/modules/combat/api_drop.go @@ -75,7 +75,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err } return } - user, err = this.module.ModuleUser.GetUser(session.GetUserId()) + user, err = this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/dailytask/module.go b/modules/dailytask/module.go index 39d5d8338..b796d2b83 100644 --- a/modules/dailytask/module.go +++ b/modules/dailytask/module.go @@ -159,7 +159,7 @@ func (this *Dailytask) refreshtask(session comm.IUserSession) { } if !utils.IsToday(dtask.Rtime) { //不是同一天 重置 - if user, err = this.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.GetUserForSession(session); err != nil { this.Error("no found user", log.Field{Key: "uid", Value: session.GetUserId()}) return } diff --git a/modules/dcolor/api_accept.go b/modules/dcolor/api_accept.go index 2afef5f2a..85f28facc 100644 --- a/modules/dcolor/api_accept.go +++ b/modules/dcolor/api_accept.go @@ -102,7 +102,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.DColorAcceptReq) this.module.Error("未找到红方信息", log.Field{Key: "uid", Value: req.Uid}) return } - blue, err := this.module.ModuleUser.GetUser(session.GetUserId()) + blue, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_UserNofound, diff --git a/modules/dcolor/api_qiecuo.go b/modules/dcolor/api_qiecuo.go index 1ff970d48..ba319dbd5 100644 --- a/modules/dcolor/api_qiecuo.go +++ b/modules/dcolor/api_qiecuo.go @@ -92,7 +92,7 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.DColorQiecuoReq) return } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/dcolor/api_refuse.go b/modules/dcolor/api_refuse.go index 44d0e3de0..123056f86 100644 --- a/modules/dcolor/api_refuse.go +++ b/modules/dcolor/api_refuse.go @@ -21,7 +21,7 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.DColorRefuseReq) result *pb.DBDColorQiecuoRecord keep bool ) - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/enchant/api_challengeover.go b/modules/enchant/api_challengeover.go index 890486ad8..cba4b58b3 100644 --- a/modules/enchant/api_challengeover.go +++ b/modules/enchant/api_challengeover.go @@ -75,7 +75,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EnchantChallengeOverReq", cfgEnchant[0].PsConsume) }) - userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId()) + userinfo, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/entertainment/api_boxreward.go b/modules/entertainment/api_boxreward.go index 23eb70dde..bb198d7a1 100644 --- a/modules/entertainment/api_boxreward.go +++ b/modules/entertainment/api_boxreward.go @@ -57,7 +57,7 @@ func (this *apiComp) BoxReward(session comm.IUserSession, req *pb.EntertainBoxRe } return } else { - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/entertainment/api_create.go b/modules/entertainment/api_create.go index cdd0a489f..8fccdce05 100644 --- a/modules/entertainment/api_create.go +++ b/modules/entertainment/api_create.go @@ -61,7 +61,7 @@ func (this *apiComp) CreateRoom(session comm.IUserSession, req *pb.EntertainCrea } } } - user, err = this.module.ModuleUser.GetUser(session.GetUserId()) + user, err = this.module.GetUserForSession(session) if err != nil { return } diff --git a/modules/entertainment/api_joinroom.go b/modules/entertainment/api_joinroom.go index d1e376a88..fa5aa77fa 100644 --- a/modules/entertainment/api_joinroom.go +++ b/modules/entertainment/api_joinroom.go @@ -59,7 +59,7 @@ func (this *apiComp) JoinRoom(session comm.IUserSession, req *pb.EntertainJoinRo } } } - user, err = this.module.ModuleUser.GetUser(session.GetUserId()) + user, err = this.module.GetUserForSession(session) if err != nil { return } diff --git a/modules/entertainment/api_match.go b/modules/entertainment/api_match.go index fcf531b87..853b62055 100644 --- a/modules/entertainment/api_match.go +++ b/modules/entertainment/api_match.go @@ -25,7 +25,7 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.EntertainMatchReq) conf *cfg.GameConsumeHeroData list *pb.DBXXLData ) - user, err = this.module.ModuleUser.GetUser(session.GetUserId()) + user, err = this.module.GetUserForSession(session) if err != nil { return } diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index cba2b4d7c..fe10facab 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -289,7 +289,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) if issucc { //聊天公告通知 - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err = this.module.GetUserForSession(session); err == nil { this.module.chat.SendSysChatToWorld(session, comm.ChatSystem3, equipment, equipment.Lv, 0, user.Name, conf.Id) } else { this.module.Errorf("no found userdata uid:%s", session.GetUserId()) diff --git a/modules/gameinvite/api_accept.go b/modules/gameinvite/api_accept.go index 87eae0e77..e6f3f9c82 100644 --- a/modules/gameinvite/api_accept.go +++ b/modules/gameinvite/api_accept.go @@ -108,7 +108,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR sessions = append(sessions, redsession) } sessions = append(sessions, session.Clone()) - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/gameinvite/api_qiecuo.go b/modules/gameinvite/api_qiecuo.go index caff8e20f..8c795d863 100644 --- a/modules/gameinvite/api_qiecuo.go +++ b/modules/gameinvite/api_qiecuo.go @@ -51,7 +51,7 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.GameInviteQiecuoR return } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/gameinvite/api_refuse.go b/modules/gameinvite/api_refuse.go index 797e4794c..dcdb9ae5f 100644 --- a/modules/gameinvite/api_refuse.go +++ b/modules/gameinvite/api_refuse.go @@ -23,7 +23,7 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.GameInviteRefuseR ok bool keep bool ) - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/guildgve/api_challengefinish.go b/modules/guildgve/api_challengefinish.go index 663d6bfeb..89395bb50 100644 --- a/modules/guildgve/api_challengefinish.go +++ b/modules/guildgve/api_challengefinish.go @@ -77,7 +77,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve // } // return // } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), @@ -156,7 +156,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve if ok { member.Boosticket-- this.module.modelGuildMember.updateGuildMember(member) - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/guildgve/api_roulette.go b/modules/guildgve/api_roulette.go index 93652b031..4a08c46e4 100644 --- a/modules/guildgve/api_roulette.go +++ b/modules/guildgve/api_roulette.go @@ -54,7 +54,7 @@ func (this *apiComp) Roulette(session comm.IUserSession, req *pb.GuildGveRoulett }) } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 451dbb45d..96d81b6f2 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -141,7 +141,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { //英雄觉醒 【玩家名称】已将【英雄名称】觉醒至满级！ - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.module.GetUserForSession(session); err == nil { this.chat.SendSysChatToWorld(session, comm.ChatSystem11, _hero, _hero.JuexingLv, _hero.Star, user.Name, _hero.HeroID) } else { this.module.Errorf("no found userdata uid:%s", session.GetUserId()) diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 66b597019..948b8c162 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -329,7 +329,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq var szHero []*pb.DBHero for _, hero := range add { // 奖励一次性发放 - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { // 广播 首次获得英雄 + if user, err := this.module.GetUserForSession(session); err == nil { // 广播 首次获得英雄 HeroConf, _ := this.module.configure.GetHeroConfig(hero.HeroID) this.chat.SendSysChatToWorld(session, comm.ChatSystem13, hero, HeroConf.Star, 0, user.Name, hero.HeroID) } @@ -457,7 +457,7 @@ func (this *apiComp) wishDrawCard(session comm.IUserSession, heroRecord *pb.DBHe rsp.Record = heroRecord session.SendMsg(string(this.module.GetType()), DrawCard, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { // 广播 首次获得英雄 + if user, err := this.module.GetUserForSession(session); err == nil { // 广播 首次获得英雄 for _, v := range atno { if v.A == "hero" && v.T == heroRecord.WishHero && v.N == 1 { if HeroConf, err := this.module.configure.GetHeroConfig(heroRecord.WishHero); err == nil { diff --git a/modules/hero/api_peachreward.go b/modules/hero/api_peachreward.go index 76b84656e..20ac73230 100644 --- a/modules/hero/api_peachreward.go +++ b/modules/hero/api_peachreward.go @@ -34,7 +34,7 @@ func (this *apiComp) PeachReward(session comm.IUserSession, req *pb.HeroPeachRew } return } - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.module.GetUserForSession(session); err == nil { if drawConf.Etime != -1 { if user.Ctime+int64(drawConf.Etime*3600*24) < configure.Now().Unix() { errdata = &pb.ErrorData{ diff --git a/modules/hero/api_selectcard.go b/modules/hero/api_selectcard.go index 0f29dd3bc..e842e375c 100644 --- a/modules/hero/api_selectcard.go +++ b/modules/hero/api_selectcard.go @@ -79,7 +79,7 @@ func (this *apiComp) SelectCard(session comm.IUserSession, req *pb.HeroSelectCar } var szHero []*pb.DBHero for _, hero := range add { // 奖励一次性发放 - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { // 广播 首次获得英雄 + if user, err := this.module.GetUserForSession(session); err == nil { // 广播 首次获得英雄 HeroConf, _ := this.module.configure.GetHeroConfig(hero.HeroID) this.chat.SendSysChatToWorld(session, comm.ChatSystem13, hero, HeroConf.Star, 0, user.Name, hero.HeroID) } diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index 5bb78eadf..5a088f092 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -150,7 +150,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { //英雄技能培养 【玩家名称】已将【英雄名称】技能培养至满级！ if maxLv { // 满级星级参数 - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.module.GetUserForSession(session); err == nil { this.chat.SendSysChatToWorld(session, comm.ChatSystem9, _hero, _hero.Star, 0, user.Name, _hero.HeroID) } else { this.module.Errorf("no found userdata uid:%s", session.GetUserId()) diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index 43ecf18ca..843173a05 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -109,7 +109,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr tasks = append(tasks, comm.GetBuriedParam(comm.Rtype115, 1, _hero.Star)) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { //英雄升星 【玩家名称】已将【英雄名称】培养至6星！ - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.module.GetUserForSession(session); err == nil { this.chat.SendSysChatToWorld(session, comm.ChatSystem8, _hero, _hero.Star, 0, user.Name, _hero.HeroID) } else { this.module.Errorf("no found userdata uid:%s", session.GetUserId()) diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index 9e867d2cd..d8ca9d981 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -98,7 +98,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { //英雄升级 【玩家名称】已将【英雄名称】培养至60级！ - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.module.GetUserForSession(session); err == nil { this.chat.SendSysChatToWorld(session, comm.ChatSystem7, _hero, _hero.Lv, 0, user.Name, _hero.HeroID) } else { this.module.Errorf("no found userdata uid:%s", session.GetUserId()) diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index 3d7a3d292..51b74a9df 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -217,7 +217,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe // 满回响 if this.module.configure.GetHeroTalentMaxLv(heroObj.HeroID) == int32(len(talent.Talent)) { tasks = append(tasks, comm.GetBuriedParam(comm.Rtype128, 1, cfg.Race)) - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.module.GetUserForSession(session); err == nil { this.chat.SendSysChatToWorld(session, comm.ChatSystem10, heroObj, heroObj.Star, 0, user.Name, heroObj.HeroID) } else { this.module.Errorf("no found userdata uid:%s", session.GetUserId()) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 1206e5d8e..8bcd8df88 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -427,7 +427,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, var maxLv int32 // 校验等级达到上限 maxLv = this.module.configure.GetHeroMaxLv(hero.Star) // 校验玩家等级 - if _user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if _user, err := this.module.GetUserForSession(session); err == nil { if expConf := this.module.configure.GetPlayerlvConf(_user.Lv); expConf != nil { if maxLv > expConf.HeroLv { maxLv = expConf.HeroLv // 英雄最大等级限制 diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go index 29788b845..6fd36e598 100644 --- a/modules/hunting/api_challenge.go +++ b/modules/hunting/api_challenge.go @@ -128,7 +128,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.module.GetUserForSession(session); err == nil { this.chat.SendSysChatToWorld(session, comm.ChatSystem15, nil, req.BossType, req.Difficulty, user.Name) } else { this.module.Errorf("no found userdata uid:%s", session.GetUserId()) diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index a386bee0d..ac9cb1697 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -116,7 +116,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha } // 发放通关随机奖励 - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/integral/api_challengeover.go b/modules/integral/api_challengeover.go index 8ee47400d..3c4cc2e05 100644 --- a/modules/integral/api_challengeover.go +++ b/modules/integral/api_challengeover.go @@ -66,7 +66,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh return } - userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId()) + userinfo, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -122,7 +122,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh if first { res = append(res, cfgData.Firstprize...) } - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.module.GetUserForSession(session); err == nil { reward = this.module.ModuleTools.GetGroupDataByLottery(cfgData.Drop, user.Vip, user.Lv) res = append(res, reward...) } diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index fc20c7b9d..ebe905b28 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -573,7 +573,7 @@ func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (errdata *p return } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), @@ -756,7 +756,7 @@ func (this *ModelItemsComp) useitem(session comm.IUserSession, gid string, amoun return } case itemuse_randombox: //宝箱 - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/kftask/api_receive.go b/modules/kftask/api_receive.go index 21577f170..85c36ecf0 100644 --- a/modules/kftask/api_receive.go +++ b/modules/kftask/api_receive.go @@ -54,7 +54,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq } return } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index 765d3dc92..c27f6bffd 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -140,7 +140,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh } else { res = append(res, conf.Commonaward...) } - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go index d9f7b4cd4..ca04fc3e9 100644 --- a/modules/mainline/api_levelpass.go +++ b/modules/mainline/api_levelpass.go @@ -108,7 +108,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP // return // } // aeward = append(aeward, atno...) - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/modulebase.go b/modules/modulebase.go index 53ab8be76..1aa08fef8 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -1001,3 +1001,29 @@ func (this *ModuleBase) AsynHandleSession(session comm.IUserSession, handle func func (this *ModuleBase) WriteUserLog(uid string, req interface{}, itype int32, tag string, data interface{}) { this.userlog.AddUserLog(uid, req, itype, tag, data) } + +func (this *ModuleBase) GetUserForSession(session comm.IUserSession) (user *pb.DBUser, err error) { + if ok, userMate := session.GetMate(comm.Session_User); ok { + user = userMate.(*pb.DBUser) + } else { + if user, err = this.GetUserForSession(session); err != nil { + this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()}) + return + } + session.SetMate(comm.Session_User, user) + } + return +} + +func (this *ModuleBase) GetUserExpandForSession(session comm.IUserSession) (user *pb.DBUserExpand, err error) { + if ok, userMate := session.GetMate(comm.Session_UserExpand); ok { + user = userMate.(*pb.DBUserExpand) + } else { + if user, err = this.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { + this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()}) + return + } + session.SetMate(comm.Session_UserExpand, user) + } + return +} diff --git a/modules/moonfantasy/api_ask.go b/modules/moonfantasy/api_ask.go index d9320a332..4a6ab4b1d 100644 --- a/modules/moonfantasy/api_ask.go +++ b/modules/moonfantasy/api_ask.go @@ -85,7 +85,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.MoonfantasyAskReq) ( // this.module.modelUserMF.Change(session.GetUserId(), map[string]interface{}{ // "mfantasys": umfantasy.Mfantasys, // }) - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { this.module.Errorf("no found uer:%d", session.GetUserId()) errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/moonfantasy/modelDream.go b/modules/moonfantasy/modelDream.go index db5c5cf67..8f6330f25 100644 --- a/modules/moonfantasy/modelDream.go +++ b/modules/moonfantasy/modelDream.go @@ -109,7 +109,7 @@ func (this *modelDreamComp) trigger(session comm.IUserSession) { this.module.Errorln(err) return } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { this.module.Errorf("no found uer:%d", session.GetUserId()) return } @@ -170,7 +170,7 @@ func (this *modelDreamComp) triggerbyid(session comm.IUserSession, boosid string this.module.Errorln(err) return } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { this.module.Errorf("no found uer:%d", session.GetUserId()) return } diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 7276a9676..9ff531a2d 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -132,7 +132,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal } } // 数据直接插入跨服数据库中 - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/pagoda/pagoda_test.go b/modules/pagoda/pagoda_test.go index fc75082c3..ed382c4e3 100644 --- a/modules/pagoda/pagoda_test.go +++ b/modules/pagoda/pagoda_test.go @@ -90,7 +90,7 @@ func TestXxx(t *testing.T) { // uid := session.GetUserId() // if !this.module.IsCross() { // if conn, err := db.Cross(); err == nil { - // userinfo := this.module.ModuleUser.GetUser(session.GetUserId()) + // userinfo := this.module.GetUserForSession(session) // newData := &pb.DBPagodaRecord{ // Id: primitive.NewObjectID().Hex(), // Uid: session.GetUserId(), diff --git a/modules/parkour/api_Info.go b/modules/parkour/api_Info.go index 11bca3d71..98ec24c3b 100644 --- a/modules/parkour/api_Info.go +++ b/modules/parkour/api_Info.go @@ -26,7 +26,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (er if errdata = this.InfoCheck(session, req); errdata != nil { return } - user, err = this.module.ModuleUser.GetUser(session.GetUserId()) + user, err = this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index a873da81e..fa577fa32 100644 --- a/modules/privilege/api_buygift.go +++ b/modules/privilege/api_buygift.go @@ -27,7 +27,7 @@ func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGift return } - userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId()) + userinfo, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_SystemError, diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index b81735895..d650c1b29 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -56,7 +56,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) } return } - if udata, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if udata, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_SystemError, Title: pb.ErrorCode_SystemError.ToString(), diff --git a/modules/shopcenter/api_receive.go b/modules/shopcenter/api_receive.go index 30d622261..319a18db9 100644 --- a/modules/shopcenter/api_receive.go +++ b/modules/shopcenter/api_receive.go @@ -78,7 +78,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv Message: "activity is close", } } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index b81927530..19b5080cf 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -237,7 +237,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq } else if bQuality { // 精炼打造 newdrop := this.module.modelStove.CheckUnlockSuid(req.ReelId, stove.Data[req.ReelId].Lv, reelcfg.BasicDrop) - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_SystemError, @@ -264,7 +264,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq } else { // 普通打造 // 获取掉落id newdrop := this.module.modelStove.CheckUnlockSuid(req.ReelId, stove.Data[req.ReelId].Lv, reelcfg.BasicDrop) - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_SystemError, diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go index becb4d96d..b5817ae5b 100644 --- a/modules/stonehenge/api_event.go +++ b/modules/stonehenge/api_event.go @@ -101,7 +101,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq switch eventConf.EventType { case EventType16: // 捡垃圾事件 - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -170,7 +170,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq // 掉落奖励 if conf, err := this.module.configure.GetStoneEventDataById(req.Eventid); err == nil { if battleConf, err := this.module.configure.GetBattleConfById(conf.Value1); err == nil { - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -244,7 +244,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq } // 次数校验 if stone.Rooms.Box[req.Eventid] < eventConf.Value2 { - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/sys/api_funcactivate.go b/modules/sys/api_funcactivate.go index 7fe82dff8..a975f79e5 100644 --- a/modules/sys/api_funcactivate.go +++ b/modules/sys/api_funcactivate.go @@ -66,7 +66,6 @@ func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActi } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.wtask.OpenCmdNotice(session, req.Cid) //手动激活通知模块 for _, m := range opencfg.Notify { i, err := this.service.GetModule(core.M_Modules(m)) diff --git a/modules/sys/api_funcgetList.go b/modules/sys/api_funcgetList.go index 234ffd0c8..be6dfba9f 100644 --- a/modules/sys/api_funcgetList.go +++ b/modules/sys/api_funcgetList.go @@ -81,7 +81,6 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi if len(change) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.wtask.OpenCmdNotice(session, change...) //手动激活通知模块 for _, m := range change { opencfg, _ := this.module.configure.GetOpenCondCfgById(m) diff --git a/modules/turntable/module.go b/modules/turntable/module.go index 48161b8ae..ceec25bbc 100644 --- a/modules/turntable/module.go +++ b/modules/turntable/module.go @@ -133,7 +133,7 @@ func (this *Turntable) EventUserLogin(session comm.IUserSession) { err error ) endTime := this.ModuleTools.GetGlobalConf().SignAccount - if user, err := this.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.GetUserForSession(session); err == nil { if configure.Now().Unix() > user.Ctime+int64(endTime*24*3600) { bEnd = true } diff --git a/modules/user/module.go b/modules/user/module.go index 12b6a844f..a12937a9b 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -475,32 +475,23 @@ func (this *User) change(session comm.IUserSession, attrs map[string]int32) (atn temp *pb.UserAtno err error ) - if ok, userMate := session.GetMate(comm.Session_User); ok { - user = userMate.(*pb.DBUser) - session.SetMate(comm.Session_User, user) - } else { - if user, err = this.GetUser(session.GetUserId()); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_UserSessionNobeing, - Title: pb.ErrorCode_UserSessionNobeing.ToString(), - Message: err.Error(), - } - return + + if user, err = this.GetUserForSession(session); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserSessionNobeing, + Title: pb.ErrorCode_UserSessionNobeing.ToString(), + Message: err.Error(), } + return } - if ok, userMate := session.GetMate(comm.Session_UserExpand); ok { - userEx = userMate.(*pb.DBUserExpand) - session.SetMate(comm.Session_UserExpand, userEx) - } else { - if userEx, err = this.GetUserExpand(uid); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_UserExpandNull, - Title: pb.ErrorCode_UserExpandNull.ToString(), - Message: err.Error(), - } - return + if userEx, err = this.GetUserExpandForSession(session); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserExpandNull, + Title: pb.ErrorCode_UserExpandNull.ToString(), + Message: err.Error(), } + return } change = &pb.UserResChangedPush{ diff --git a/modules/venture/api_lvreward.go b/modules/venture/api_lvreward.go index d75f4e4c3..056e7dd7b 100644 --- a/modules/venture/api_lvreward.go +++ b/modules/venture/api_lvreward.go @@ -47,7 +47,7 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.VentureLvReward return } // 等级校验 - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/venture/api_signlist.go b/modules/venture/api_signlist.go index f0294d5b9..7de0882c8 100644 --- a/modules/venture/api_signlist.go +++ b/modules/venture/api_signlist.go @@ -23,7 +23,7 @@ func (this *apiComp) SignGetList(session comm.IUserSession, req *pb.VentureSignG return } endTime := this.module.ModuleTools.GetGlobalConf().SignAccount - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + if user, err := this.module.GetUserForSession(session); err == nil { if configure.Now().Unix() > user.Ctime+int64(endTime*24*3600) { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ActivityOver, diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index b0e6bcc57..a1da7e099 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -79,7 +79,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal viking.Boss[req.BossId] = req.Difficulty mapData["boss"] = viking.Boss } - if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + if user, err = this.module.GetUserForSession(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/wtask/api_battlefinish.go b/modules/wtask/api_battlefinish.go index e6a8b5534..251e603c8 100644 --- a/modules/wtask/api_battlefinish.go +++ b/modules/wtask/api_battlefinish.go @@ -67,7 +67,7 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle } } if conf.Reward > 0 { - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/wtask/api_boxreceive.go b/modules/wtask/api_boxreceive.go index fbd48b023..5d9711407 100644 --- a/modules/wtask/api_boxreceive.go +++ b/modules/wtask/api_boxreceive.go @@ -72,7 +72,7 @@ func (this *apiComp) BoxReceive(session comm.IUserSession, req *pb.WTaskBoxRecei return } - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) + user, err := this.module.GetUserForSession(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/wtask/api_info.go b/modules/wtask/api_info.go index c8e09dcdd..762179393 100644 --- a/modules/wtask/api_info.go +++ b/modules/wtask/api_info.go @@ -30,7 +30,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WTaskInfoReq) (errd } return } - if _, errdata = this.module.fishtask(session, wtask, false); errdata != nil { + if errdata = this.module.fishtask(session, wtask, false); errdata != nil { return } // if progress, errdata = this.module.pushtaskprogress(session, wtask, false); errdata != nil { diff --git a/modules/wtask/configure.go b/modules/wtask/configure.go index b2cd559ce..7df2312e6 100644 --- a/modules/wtask/configure.go +++ b/modules/wtask/configure.go @@ -26,10 +26,10 @@ type configureComp struct { modules.MCompConfigure module *WTask lock sync.RWMutex - condlTask map[int32][]*cfg.GameWorldTaskData //key 条件ID - desTask map[int32][]*cfg.GameWorldTaskData //key 分类 - groupTask map[int32][]*cfg.GameWorldTaskData //key 任务组 - opencmdTask map[string][]*cfg.GameWorldTaskData //key 功能开启 + condlTask map[int32][]*cfg.GameWorldTaskData //key 条件ID + desTask map[int32][]*cfg.GameWorldTaskData //key 分类 + groupTask map[int32][]*cfg.GameWorldTaskData //key 任务组 + opencmdTask map[int32][]*cfg.GameWorldTaskData //key 功能开启 daylock sync.RWMutex daygroupTasks map[int32][]*cfg.GameAnnulartask_LibraryData //key 条件ID evevtlock sync.RWMutex @@ -82,7 +82,7 @@ func (this *configureComp) updateconfigure() { worldtaskConf := make(map[int32][]*cfg.GameWorldTaskData) destaskConf := make(map[int32][]*cfg.GameWorldTaskData) grouptaskConf := make(map[int32][]*cfg.GameWorldTaskData) - opencmdConf := make(map[string][]*cfg.GameWorldTaskData) + opencmdConf := make(map[int32][]*cfg.GameWorldTaskData) for _, v := range gwt.GetDataList() { if _, ok := destaskConf[v.Des]; !ok { @@ -95,11 +95,11 @@ func (this *configureComp) updateconfigure() { } grouptaskConf[v.Group] = append(grouptaskConf[v.Group], v) - if v.Opencond != "" { - if _, ok := opencmdConf[v.Opencond]; !ok { - opencmdConf[v.Opencond] = make([]*cfg.GameWorldTaskData, 0) + for _, v1 := range v.Opencond { + if _, ok := opencmdConf[v1]; !ok { + opencmdConf[v1] = make([]*cfg.GameWorldTaskData, 0) } - opencmdConf[v.Opencond] = append(opencmdConf[v.Opencond], v) + opencmdConf[v1] = append(opencmdConf[v1], v) } for _, condl := range v.Completetask { @@ -164,7 +164,7 @@ func (this *configureComp) getgroupTask() map[int32][]*cfg.GameWorldTaskData { return this.groupTask } -func (this *configureComp) getopencmdTask() map[string][]*cfg.GameWorldTaskData { +func (this *configureComp) getopencmdTask() map[int32][]*cfg.GameWorldTaskData { this.lock.RLock() defer this.lock.RUnlock() return this.opencmdTask diff --git a/modules/wtask/module.go b/modules/wtask/module.go index d481daf86..a081341e4 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -73,117 +73,50 @@ func (this *WTask) OnInstallComp() { // 埋点通知 func (this *WTask) BuriedsNotify(session comm.IUserSession, condis []*pb.ConIProgress) { - // var ( - // condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress) - // utask *pb.DBWTask - // accepttaskMap map[int32]struct{} = make(map[int32]struct{}) - // condlTask map[int32][]*cfg.GameWorldTaskData - // temptasks []*cfg.GameWorldTaskData - // changetasks map[int32]*cfg.GameWorldTaskData = make(map[int32]*cfg.GameWorldTaskData) - // checkcondlsMap map[int32]struct{} = make(map[int32]struct{}) - // checkcondls []int32 = make([]int32, 0) - // detailstasks []*pb.DBWTaskItem = make([]*pb.DBWTaskItem, 0) - // ok bool - // needcheck bool //是否需要校验 - - // err error - // ) - // this.Debug("收到子任务进度变化推送", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condis", Value: condis}) - // if utask, err = this.modelwtask.getUserWTasks(session.GetUserId()); err != nil { - // this.Error("读取玩家世界任务数据 失败", log.Field{Key: "err", Value: err.Error()}) - // return - // } - // condlTask = this.configure.getcondlTask() - - // for _, v := range condis { - // condisMap[v.Conid] = v - // } - - // for _, v := range utask.Accepts { - // accepttaskMap[v] = struct{}{} - // } - - // for _, v := range condis { - // if temptasks, ok = condlTask[v.Conid]; ok { - // for _, task := range temptasks { - // if _, ok = accepttaskMap[task.Key]; ok { //任务列表进度有变化 - // if _, ok = changetasks[task.Key]; !ok { - // changetasks[task.Key] = task - // for _, cid := range task.Completetask { - // if _, ok = checkcondlsMap[cid]; !ok { - // checkcondlsMap[cid] = struct{}{} - // checkcondls = append(checkcondls, cid) - // } - // } - // } - // } - // } - // } - // } - // if len(changetasks) == 0 { //没有任务变化 - // return - // } - // for k, _ := range checkcondlsMap { - // if _, ok = condisMap[k]; !ok { - // needcheck = true - // } - // } - // if needcheck { //校验有变化的任务 的完成条件 - // if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil { - // this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) - // return - // } - // for _, v := range condis { - // condisMap[v.Conid] = v - // } - // } - - // //推送进度变化消息 - // for k, v := range changetasks { - // task := &pb.DBWTaskItem{ - // Tid: k, - // Conlds: make([]*pb.ConIProgress, len(v.Completetask)), - // } - // for i, v := range v.Completetask { - // task.Conlds[i] = condisMap[v] - // } - // detailstasks = append(detailstasks, task) - // } - // //发送进度变化消息 - // session.SendMsg(string(this.GetType()), "acceptchange", &pb.WTaskAcceptChangePush{Accepts: detailstasks}) -} - -// 功能开启 -func (this *WTask) OpenCmdNotice(session comm.IUserSession, keys ...string) { + this.Debug("收到子任务进度变化推送", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condis", Value: condis}) var ( - opencmdTask map[string][]*cfg.GameWorldTaskData - user *pb.DBUser - wtask *pb.DBWTask - err error - ok bool + wtask *pb.DBWTask + opencmdCondis map[int32][]*cfg.GameWorldTaskData + condisAll []int32 + progress []*pb.ConIProgress + complete []int32 + user *pb.DBUser + err error + errdata *pb.ErrorData + ok bool ) //初步校验 - opencmdTask = this.configure.getopencmdTask() - for _, key := range keys { - if _, ok = opencmdTask[key]; ok { + opencmdCondis = this.configure.getopencmdTask() + for _, condi := range condis { + if _, ok = opencmdCondis[condi.Conid]; ok { break } } if !ok { return } - - if user, err = this.ModuleUser.GetUser(session.GetUserId()); err != nil { - this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()}) - return + for k, _ := range opencmdCondis { + condisAll = append(condisAll, k) } - if wtask, err = this.modelwtask.getUserWTasks(session.GetUserId()); err != nil { - this.Error("获取世界任务数据 失败!", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "err", Value: err.Error()}) + this.Error("读取玩家世界任务数据 失败", log.Field{Key: "err", Value: err.Error()}) return } - - this.inquireActivations(session, wtask, user.Lv, keys, true) + if _, progress, err = this.ModuleBuried.CheckCondition(session, condisAll...); err != nil { + this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) + return + } + for _, v := range progress { + if v.State == pb.BuriedItemFinishState_buried_finish { + complete = append(complete, v.Conid) + } + } + if user, err = this.GetUserForSession(session); err != nil { + return + } + if errdata = this.inquireActivations(session, wtask, user.Lv, complete, true); errdata != nil { + this.Error("查询任务失败", log.Field{Key: "err", Value: errdata.String()}) + } } // 获取商队任务 @@ -390,71 +323,6 @@ func (this *WTask) InquireCompletes(uid string) []int32 { return completes } -// 查询日常任务进度 -// func (this *WTask) InquireTaskProgress(session comm.IUserSession, tasks ...int32) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) { -// var ( -// checkcondlsMap map[int32]struct{} = make(map[int32]struct{}) -// checkcondls []int32 = make([]int32, 0) -// conf *cfg.GameWorldTaskData -// condis []*pb.ConIProgress = make([]*pb.ConIProgress, 0) -// condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress) -// err error -// ok bool -// ) - -// for _, v := range tasks { -// if conf, err = this.configure.gettaskconfconfigure(v); err != nil { -// this.Errorln(err) -// errdata = &pb.ErrorData{ -// Code: pb.ErrorCode_ConfigNoFound, -// Title: pb.ErrorCode_ConfigNoFound.ToString(), -// Message: err.Error(), -// } -// return -// } -// for _, v := range conf.Completetask { -// if _, ok = checkcondlsMap[v]; !ok { -// checkcondlsMap[v] = struct{}{} -// checkcondls = append(checkcondls, v) -// } -// } -// } -// if len(checkcondls) > 0 { -// if _, condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil { -// this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) -// errdata = &pb.ErrorData{ -// Code: pb.ErrorCode_ExternalModule, -// Title: pb.ErrorCode_ExternalModule.ToString(), -// Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%s", err.Error()), -// } -// return -// } -// for _, v := range condis { -// condisMap[v.Conid] = v -// } -// } - -// for _, v := range tasks { -// if conf, err = this.configure.gettaskconfconfigure(v); err != nil { -// errdata = &pb.ErrorData{ -// Code: pb.ErrorCode_ConfigNoFound, -// Title: pb.ErrorCode_ConfigNoFound.ToString(), -// Message: err.Error(), -// } -// return -// } -// task := &pb.DBWTaskItem{ -// Tid: v, -// Conlds: make([]*pb.ConIProgress, len(conf.Completetask)), -// } -// for i, v := range conf.Completetask { -// task.Conlds[i] = condisMap[v] -// } -// progress = append(progress, task) -// } -// return -// } - // 清除商队任务 func (this *WTask) ClearCaravanTask(session comm.IUserSession, task int32) { var ( @@ -576,103 +444,21 @@ func (this *WTask) BingoJumpTask(session comm.IUserSession, taskId int32) (errda return } -// 校验任务进度 -// func (this *WTask) pushtaskprogress(session comm.IUserSession, wtask *pb.DBWTask, ispush bool) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) { -// var ( -// checkcondlsMap map[int32]struct{} = make(map[int32]struct{}) -// checkcondls []int32 = make([]int32, 0) -// conf *cfg.GameWorldTaskData -// condis []*pb.ConIProgress = make([]*pb.ConIProgress, 0) -// condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress) -// err error -// ok bool -// ) -// progress = make([]*pb.DBWTaskItem, 0) -// if len(wtask.Accepts) == 0 { -// return -// } - -// for _, v := range wtask.Accepts { -// if conf, err = this.configure.gettaskconfconfigure(v); err != nil { -// this.Errorln(err) -// errdata = &pb.ErrorData{ -// Code: pb.ErrorCode_ConfigNoFound, -// Title: pb.ErrorCode_ConfigNoFound.ToString(), -// Message: err.Error(), -// } -// return -// } -// for _, v := range conf.Completetask { -// if _, ok = checkcondlsMap[v]; !ok { -// checkcondlsMap[v] = struct{}{} -// checkcondls = append(checkcondls, v) -// } -// } -// } -// if len(checkcondls) > 0 { -// if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil { -// this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) -// errdata = &pb.ErrorData{ -// Code: pb.ErrorCode_ExternalModule, -// Title: pb.ErrorCode_ExternalModule.ToString(), -// Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%s", err.Error()), -// } -// return -// } -// for _, v := range condis { -// condisMap[v.Conid] = v -// } -// } - -// for _, v := range wtask.Accepts { -// if conf, err = this.configure.gettaskconfconfigure(v); err != nil { -// errdata = &pb.ErrorData{ -// Code: pb.ErrorCode_ConfigNoFound, -// Title: pb.ErrorCode_ConfigNoFound.ToString(), -// Message: err.Error(), -// } -// return -// } -// task := &pb.DBWTaskItem{ -// Tid: v, -// Conlds: make([]*pb.ConIProgress, len(conf.Completetask)), -// } -// ok = true -// for i, v := range conf.Completetask { -// task.Conlds[i] = condisMap[v] -// } -// progress = append(progress, task) -// } -// if ispush { -// session.SendMsg(string(this.GetType()), "acceptchange", &pb.WTaskAcceptChangePush{Accepts: progress}) -// } -// return -// } - // 完成任务 -func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask, ispush bool) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) { +func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask, ispush bool) (errdata *pb.ErrorData) { var ( - opencmdMap map[string]int32 - opencmd []string - user *pb.DBUser - err error + opencmd []int32 = make([]int32, 0) + user *pb.DBUser + err error ) - - if opencmdMap, errdata = this.sys.QueryOpenCondData(session.GetUserId()); errdata != nil { - this.Error("查询用户功能是否开启表 失败!", log.Field{Key: "key", Value: errdata}) - return - } - opencmd = make([]string, 0) - for k, v := range opencmdMap { - if v == 2 { - opencmd = append(opencmd, k) + if user, err = this.GetUserForSession(session); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), } - } - if user, err = this.ModuleUser.GetUser(session.GetUserId()); err != nil { - this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()}) return } - progress, errdata = this.inquireActivations(session, wtask, user.Lv, opencmd, ispush) + errdata = this.inquireActivations(session, wtask, user.Lv, opencmd, ispush) return } @@ -703,15 +489,15 @@ func (this *WTask) checkgroupState(session comm.IUserSession, wtask *pb.DBWTask, } // 查询可接取任务列表 -func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTask, lv int32, opencmd []string, ispush bool) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) { +func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTask, lv int32, opencmd []int32, ispush bool) (errdata *pb.ErrorData) { var ( conf *cfg.GameWorldTask err error - activatMap map[int32]struct{} = make(map[int32]struct{}) - acceptsMap map[int32]struct{} = make(map[int32]struct{}) - completeMap map[int32]struct{} = make(map[int32]struct{}) - opencmdMap map[string]struct{} = make(map[string]struct{}) - condiIds []int32 = make([]int32, 0) + activatMap map[int32]struct{} = make(map[int32]struct{}) + acceptsMap map[int32]struct{} = make(map[int32]struct{}) + completeMap map[int32]struct{} = make(map[int32]struct{}) + opencmdMap map[int32]struct{} = make(map[int32]struct{}) + condiIds []int32 = make([]int32, 0) ok bool changeActiva bool changeAccept bool @@ -744,9 +530,16 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa if lv < v.Lock || lv > v.Lockend { //等级不符合 continue } - if _, ok = opencmdMap[v.Opencond]; v.Opencond != "" && !ok { //功能未开启 + ok = true + for _, v1 := range v.Opencond { + if _, ok = opencmdMap[v1]; !ok { //功能未开启 + break + } + } + if !ok { continue } + if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断 continue } @@ -772,7 +565,6 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa if errdata = this.ModuleBuried.ActiveCondition(session, condiIds...); err != nil { return } - // progress, errdata = this.pushtaskprogress(session, wtask, ispush) } return } diff --git a/sys/configure/structs/Game.HuntingBossData.go b/sys/configure/structs/Game.HuntingBossData.go index 7d12efdf8..e76aa8484 100644 --- a/sys/configure/structs/Game.HuntingBossData.go +++ b/sys/configure/structs/Game.HuntingBossData.go @@ -15,6 +15,8 @@ type GameHuntingBossData struct { Type int32 Name string Difficulty int32 + SweepId int32 + SweepOpenId []int32 BattleReadyID int32 Firstprize []*Gameatn Dropshow []*Gameatn @@ -38,6 +40,21 @@ func (_v *GameHuntingBossData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sweepId"].(float64); !_ok_ { err = errors.New("sweepId error"); return }; _v.SweepId = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["sweepOpenId"].([]interface{}); !_ok_ { err = errors.New("sweepOpenId error"); return } + + _v.SweepOpenId = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.SweepOpenId = append(_v.SweepOpenId, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.VikingBossData.go b/sys/configure/structs/Game.VikingBossData.go index d5addc5be..47dec1431 100644 --- a/sys/configure/structs/Game.VikingBossData.go +++ b/sys/configure/structs/Game.VikingBossData.go @@ -16,6 +16,8 @@ type GameVikingBossData struct { Bossid int32 Name string Difficulty int32 + SweepId int32 + SweepOpenId []int32 BattleReadyID int32 Captionrecommend []int32 Firstprize []*Gameatn @@ -43,6 +45,21 @@ func (_v *GameVikingBossData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossid"].(float64); !_ok_ { err = errors.New("bossid error"); return }; _v.Bossid = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sweepId"].(float64); !_ok_ { err = errors.New("sweepId error"); return }; _v.SweepId = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["sweepOpenId"].([]interface{}); !_ok_ { err = errors.New("sweepOpenId error"); return } + + _v.SweepOpenId = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.SweepOpenId = append(_v.SweepOpenId, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index 709274764..0351f5bd4 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -12,7 +12,7 @@ import "errors" type GameWorldTaskData struct { Key int32 - Opencond string + Opencond []int32 Lock int32 Lockend int32 Ontxe int32 @@ -50,7 +50,20 @@ func (*GameWorldTaskData) GetTypeId() int32 { func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } - { var _ok_ bool; if _v.Opencond, _ok_ = _buf["opencond"].(string); !_ok_ { err = errors.New("opencond error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["opencond"].([]interface{}); !_ok_ { err = errors.New("opencond error"); return } + + _v.Opencond = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Opencond = append(_v.Opencond, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock"].(float64); !_ok_ { err = errors.New("lock error"); return }; _v.Lock = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lockend"].(float64); !_ok_ { err = errors.New("lockend error"); return }; _v.Lockend = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ontxe"].(float64); !_ok_ { err = errors.New("ontxe error"); return }; _v.Ontxe = int32(_tempNum_) } diff --git a/sys/configure/structs/TEnum.ETrackType.go b/sys/configure/structs/TEnum.ETrackType.go index cbf5a4134..7163086c3 100644 --- a/sys/configure/structs/TEnum.ETrackType.go +++ b/sys/configure/structs/TEnum.ETrackType.go @@ -11,4 +11,5 @@ package cfg const ( TEnumETrackType_Normal = 1 TEnumETrackType_Guide = 2 + TEnumETrackType_Speed = 3 ) diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index a418ea822..cd631ab3b 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -218,6 +218,7 @@ type GameGlobalData struct { BuzkashiCatchspeed int32 BuzkashiCatchqtetime int32 BuzkashiRecentPlayer int32 + BuzkashiTrackpartdis int32 TaskActivation int32 FavorabilityAttenuation []*Gamekv Mounts string @@ -921,6 +922,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_catchspeed"].(float64); !_ok_ { err = errors.New("buzkashi_catchspeed error"); return }; _v.BuzkashiCatchspeed = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_catchqtetime"].(float64); !_ok_ { err = errors.New("buzkashi_catchqtetime error"); return }; _v.BuzkashiCatchqtetime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recentPlayer"].(float64); !_ok_ { err = errors.New("buzkashi_recentPlayer error"); return }; _v.BuzkashiRecentPlayer = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_trackpartdis"].(float64); !_ok_ { err = errors.New("buzkashi_trackpartdis error"); return }; _v.BuzkashiTrackpartdis = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_activation"].(float64); !_ok_ { err = errors.New("task_activation error"); return }; _v.TaskActivation = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/game.opencondData.go b/sys/configure/structs/game.opencondData.go index 208bed942..f875ed9d2 100644 --- a/sys/configure/structs/game.opencondData.go +++ b/sys/configure/structs/game.opencondData.go @@ -14,6 +14,7 @@ type GameOpencondData struct { Id string Name string Main []*GameOpenedCond + Opencondi []int32 Wkqbx int32 Img string Prompt string @@ -48,6 +49,20 @@ func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error) } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["opencondi"].([]interface{}); !_ok_ { err = errors.New("opencondi error"); return } + + _v.Opencondi = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Opencondi = append(_v.Opencondi, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["wkqbx"].(float64); !_ok_ { err = errors.New("wkqbx error"); return }; _v.Wkqbx = int32(_tempNum_) } { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prompt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prompt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prompt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }