From c126be847b637d90621afd3b36248ce014e41b21 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 22 Dec 2023 15:07:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 3172 +++++++++++++++++++++++++-- bin/json/game_combatmanster.json | 24 + bin/json/game_drawpool.json | 64 +- bin/json/game_guide.json | 88 +- bin/json/game_hero.json | 14 +- bin/json/game_herolevelgrow.json | 44 + bin/json/game_item.json | 16 +- bin/json/game_mainstage.json | 121 +- bin/json/game_mainventure.json | 4 +- bin/json/game_opencond.json | 4 +- bin/json/game_rdtasknpc.json | 82 +- bin/json/game_skillafteratk.json | 395 ++++ bin/json/game_skillatk.json | 388 ++++ bin/json/game_skillpassive.json | 100 + bin/json/game_treasuremap.json | 65 - bin/json/game_worldtask.json | 50 +- modules/pagoda/api_challengeover.go | 108 +- modules/user/module.go | 32 +- modules/viking/api_challengeover.go | 27 +- 19 files changed, 4298 insertions(+), 500 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index baa9ff413..c4bfef2da 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -305,6 +305,2814 @@ "0" ] }, + { + "id": 11187001, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_494", + "text": "击败黑暗掠夺者！" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16001001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187002, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_495", + "text": "搜集{0}/{1}个碎片，有完美通关奖励！" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16001001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187003, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_496", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16001002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187004, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_497", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16001002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187005, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_498", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16001003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187006, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_499", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16001003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187007, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_500", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16002001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187008, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_501", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16002001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187009, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_502", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16002002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187010, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_503", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16002002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187011, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_504", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16002003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187012, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_505", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16002003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187013, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_506", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16003001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187014, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_507", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16003001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187015, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_508", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16003002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187016, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_509", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16003002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187017, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_510", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16003003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187018, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_511", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16003003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187019, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_512", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16004001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187020, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_513", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16004001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187021, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_514", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16004002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187022, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_515", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16004002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187023, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_516", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16004003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187024, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_517", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16004003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187025, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_518", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16005001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187026, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_519", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16005001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187027, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_520", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16005002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187028, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_521", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16005002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187029, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_522", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16005003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187030, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_523", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16005003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187031, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_524", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16006001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187032, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_525", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16006001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187033, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_526", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16006002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187034, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_527", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16006002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187035, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_528", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16006003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187036, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_529", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16006003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187037, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_530", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16007001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187038, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_531", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16007001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187039, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_532", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16007002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187040, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_533", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16007002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187041, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_534", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16007003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187042, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_535", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16007003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187043, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_536", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16008001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187044, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_537", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16008001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187045, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_538", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16008002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187046, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_539", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16008002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187047, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_540", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16008003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187048, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_541", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16008003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187049, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_542", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16009001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187050, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_543", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16009001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187051, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_544", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16009002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187052, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_545", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16009002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187053, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_546", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16009003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187054, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_547", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16009003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187055, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_548", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16010001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187056, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_549", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16010001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187057, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_550", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16010002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187058, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_551", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16010002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187059, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_552", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16010003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187060, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_553", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16010003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187061, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_554", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16011001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187062, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_555", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16011001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187063, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_556", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16011002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187064, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_557", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16011002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187065, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_558", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16011003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187066, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_559", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16011003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187067, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_560", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16012001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187068, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_561", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16012001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187069, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_562", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16012002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187070, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_563", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16012002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187071, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_564", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16012003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187072, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_565", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16012003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187073, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_566", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16013001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187074, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_567", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16013001 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187075, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_568", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16013002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187076, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_569", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16013002 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187077, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_570", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [ + 16013003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, + { + "id": 11187078, + "rtype": 1, + "ctype": 1, + "notify": [ + "combat" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_571", + "text": "搜集{1}{0}个" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [ + 16013003 + ], + "filter2": [ + "道具ID", + "0", + "0", + "0" + ] + }, { "id": 12070010, "rtype": 1, @@ -2523,108 +5331,6 @@ ], "filter2": [] }, - { - "id": 12070311, - "rtype": 1, - "ctype": 1, - "notify": [], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_794", - "text": "恢复武馆监控" - }, - "type": 20001, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 10294, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 1, - "filter": [ - 10490 - ], - "filter2": [ - "剧情ID", - "0", - "0", - "0" - ] - }, - { - "id": 12070312, - "rtype": 1, - "ctype": 1, - "notify": [], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_795", - "text": "恢复铁匠铺监控" - }, - "type": 20001, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 10295, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 1, - "filter": [ - 10500 - ], - "filter2": [ - "通关的关卡ID", - "0", - "0", - "0" - ] - }, - { - "id": 12070313, - "rtype": 1, - "ctype": 1, - "notify": [], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_796", - "text": "调查一下俱乐部" - }, - "type": 70, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 10296, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 1, - "filter": [ - 112 - ], - "filter2": [ - "通关的关卡ID", - "0", - "0", - "0" - ] - }, { "id": 12070320, "rtype": 1, @@ -2632,44 +5338,10 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_797", - "text": "参加音乐派对" + "key": "buried_buried_condi_tasktxt_794", + "text": "回响一次" }, - "type": 70, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 10304, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 1, - "filter": [ - 180 - ], - "filter2": [ - "通关的关卡ID", - "0", - "0", - "0" - ] - }, - { - "id": 12070330, - "rtype": 2, - "ctype": 1, - "notify": [], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_798", - "text": "火焰泰坦难度1" - }, - "type": 73, + "type": 39, "valid": 0, "head": { "a": "attr", @@ -2677,22 +5349,41 @@ "n": 1 }, "Npc_event_type": 1, - "NPC": 167, + "NPC": 104, "tipstxt": { "key": "", "text": "" }, "value": 1, - "filter": [ - 1, - 1 - ], - "filter2": [ - "boss类型", - "难度", - "0", - "0" - ] + "filter": [], + "filter2": [] + }, + { + "id": 12070330, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_795", + "text": "狩猎一次" + }, + "type": 200, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 1, + "NPC": 168, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] }, { "id": 12070340, @@ -2701,10 +5392,10 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_799", - "text": "6件装备强化到6级" + "key": "buried_buried_condi_tasktxt_796", + "text": "击退恐惧灵" }, - "type": 43, + "type": 70, "valid": 0, "head": { "a": "attr", @@ -2712,21 +5403,16 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": -102, + "NPC": 110329, "tipstxt": { "key": "", "text": "" }, - "value": 6, + "value": 1, "filter": [ - 6 + 111 ], - "filter2": [ - "等级", - "0", - "0", - "0" - ] + "filter2": [] }, { "id": 12070350, @@ -2735,10 +5421,39 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_800", - "text": "通关冒险之旅【3-4】" + "key": "buried_buried_condi_tasktxt_797", + "text": "和师傅聊聊10360" }, - "type": 61, + "type": 20001, + "valid": 1, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 110339, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [ + 10360 + ], + "filter2": [] + }, + { + "id": 12070360, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_798", + "text": "完成一次木人桩" + }, + "type": 149, "valid": 0, "head": { "a": "attr", @@ -2746,56 +5461,14 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": 10334, + "NPC": 110341, "tipstxt": { "key": "", "text": "" }, "value": 1, - "filter": [ - 1100312 - ], - "filter2": [ - "关卡ID", - "0", - "0", - "0" - ] - }, - { - "id": 12070360, - "rtype": 2, - "ctype": 1, - "notify": [], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_801", - "text": "火焰泰坦难度1" - }, - "type": 73, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 1, - "NPC": 167, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 1, - "filter": [ - 1, - 1 - ], - "filter2": [ - "boss类型", - "难度", - "0", - "0" - ] + "filter": [], + "filter2": [] }, { "id": 12070370, @@ -2804,32 +5477,27 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_802", - "text": "8件装备强化到3" + "key": "buried_buried_condi_tasktxt_799", + "text": "通过一次教习塔" }, - "type": 43, + "type": 168, "valid": 0, "head": { "a": "attr", "t": "gold", "n": 1 }, - "Npc_event_type": 0, - "NPC": -102, + "Npc_event_type": 1, + "NPC": 10004, "tipstxt": { "key": "", "text": "" }, - "value": 8, + "value": 1, "filter": [ - 3 + 1 ], - "filter2": [ - "等级", - "0", - "0", - "0" - ] + "filter2": [] }, { "id": 12070371, @@ -2838,10 +5506,10 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_803", - "text": "穿戴2件马术套装" + "key": "buried_buried_condi_tasktxt_800", + "text": "完成一次派遣" }, - "type": 169, + "type": 186, "valid": 0, "head": { "a": "attr", @@ -2849,21 +5517,41 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": -102, + "NPC": 110346, "tipstxt": { "key": "", "text": "" }, "value": 1, - "filter": [ - 9 - ], - "filter2": [ - "套装效果", - "0", - "0", - "0" - ] + "filter": [], + "filter2": [] + }, + { + "id": 12070372, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_801", + "text": "辉月等级3级" + }, + "type": 242, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 1, + "NPC": 10067, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 3, + "filter": [], + "filter2": [] }, { "id": 12070380, @@ -5421,7 +8109,7 @@ ] }, { - "id": 12071100, + "id": 168, "rtype": 1, "ctype": 1, "notify": [], @@ -7048,7 +9736,7 @@ "key": "buried_buried_condi_tasktxt_935", "text": "进行3次普通招募" }, - "type": 18, + "type": 14, "valid": 0, "head": { "a": "attr", @@ -10934,7 +13622,7 @@ "filter2": [] }, { - "id": 90043002, + "id": 90043022, "rtype": 2, "ctype": 3, "notify": [ @@ -11032,7 +13720,7 @@ "key": "buried_buried_condi_tasktxt_1075", "text": "进行1次普通招募" }, - "type": 18, + "type": 14, "valid": 0, "head": { "a": "attr", @@ -11235,7 +13923,7 @@ "key": "buried_buried_condi_tasktxt_1082", "text": "进行1次普通招募" }, - "type": 18, + "type": 14, "valid": 0, "head": { "a": "attr", @@ -11438,7 +14126,7 @@ "key": "buried_buried_condi_tasktxt_1089", "text": "进行10次普通招募" }, - "type": 18, + "type": 14, "valid": 0, "head": { "a": "attr", diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json index b365f17cd..8124ef91b 100644 --- a/bin/json/game_combatmanster.json +++ b/bin/json/game_combatmanster.json @@ -399,5 +399,29 @@ "n": 1 } ] + }, + { + "id": 100101, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, + "BattleReadyID": 10103001, + "formatList": [ + 103051 + ], + "award": [] + }, + { + "id": 100102, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, + "BattleReadyID": 10103001, + "formatList": [ + 103061 + ], + "award": [] } ] \ No newline at end of file diff --git a/bin/json/game_drawpool.json b/bin/json/game_drawpool.json index 143a70c41..856d51693 100644 --- a/bin/json/game_drawpool.json +++ b/bin/json/game_drawpool.json @@ -25,7 +25,13 @@ } ], "consumeB": [], - "consumeB10": [] + "consumeB10": [], + "baodihelp": { + "key": "drawcard_drawpool_baodihelp_1", + "text": "
新手池中，可进行[color=#37d8a9]30次[/color]十连召唤，将心仪的召唤结果暂时留存（至多留存[color=#37d8a9]3组[/color]），最后选定一组结果，作为新手池的召唤成果" + }, + "weightreadonly": "SSR|2%,SR|20%,R|78%", + "upweight": 0 }, { "key": 2, @@ -80,7 +86,13 @@ "t": "diamond", "n": 1600 } - ] + ], + "baodihelp": { + "key": "drawcard_drawpool_baodihelp_2", + "text": "
1.常驻卡池，每次抽取将消耗圣桃枝
2.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
3.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
4.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
5.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
6.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
7.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌" + }, + "weightreadonly": "SSR|2%,SR|20%,R|78%", + "upweight": 0 }, { "key": 3, @@ -126,7 +138,13 @@ "t": "diamond", "n": 1600 } - ] + ], + "baodihelp": { + "key": "drawcard_drawpool_baodihelp_3", + "text": "
1.在阵营召唤中，将召唤指定阵营的英雄
2.每次召唤将消耗对应阵营的圣桃枝
3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
4.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
5.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
6.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
7.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
8.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌
9.所有阵营的召唤保底次数[color=#37d8a9]共享" + }, + "weightreadonly": "SSR|2%,SR|20%,R|78%", + "upweight": 0 }, { "key": 4, @@ -172,7 +190,13 @@ "t": "diamond", "n": 1600 } - ] + ], + "baodihelp": { + "key": "drawcard_drawpool_baodihelp_4", + "text": "
1.在阵营召唤中，将召唤指定阵营的英雄
2.每次召唤将消耗对应阵营的圣桃枝
3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
4.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
5.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
6.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
7.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
8.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌
9.所有阵营的召唤保底次数[color=#37d8a9]共享" + }, + "weightreadonly": "SSR|2%,SR|20%,R|78%", + "upweight": 0 }, { "key": 5, @@ -218,7 +242,13 @@ "t": "diamond", "n": 1600 } - ] + ], + "baodihelp": { + "key": "drawcard_drawpool_baodihelp_5", + "text": "
1.在阵营召唤中，将召唤指定阵营的英雄
2.每次召唤将消耗对应阵营的圣桃枝
3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
4.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
5.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
6.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
7.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
8.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌
9.所有阵营的召唤保底次数[color=#37d8a9]共享" + }, + "weightreadonly": "SSR|2%,SR|20%,R|78%", + "upweight": 0 }, { "key": 7, @@ -252,7 +282,13 @@ } ], "consumeB": [], - "consumeB10": [] + "consumeB10": [], + "baodihelp": { + "key": "drawcard_drawpool_baodihelp_7", + "text": "
1.召唤中，获取SSR卡时有[color=#37d8a9]50%[/color]概率可获得本次卡池概率提升的SSR卡
2.可以在列表中，选择心仪的守护者作为本期的概率提升SSR
3.每次召唤到的SSR角色不是保底SSR角色时，下次召唤到的SSR角色必为该保底SSR角色
4.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
5.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
6.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
7.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
8.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
9.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌
10.中途更换选定英雄，仍将[color=#37d8a9]保留[/color]保底次数
11.限定卡池结束后，召唤保底次数将[color=#37d8a9]保留[/color]至下个限定卡池" + }, + "weightreadonly": "SSR|2%,SR|20%,R|78%", + "upweight": 5000 }, { "key": 8, @@ -280,7 +316,13 @@ ], "consumeA10": [], "consumeB": [], - "consumeB10": [] + "consumeB10": [], + "baodihelp": { + "key": "drawcard_drawpool_baodihelp_8", + "text": "
1.召唤中，可选择指定守护者作为许愿守护者
2.每次召唤将消耗[color=#37d8a9]100圣桃[/color]，必出许愿守护者
3.召唤出许愿守护者后，[color=#37d8a9]60天[/color]内无法再对该守护者进行许愿召唤
4.随抽取次数增加，而解锁其他守护者的许愿机会" + }, + "weightreadonly": "SSR|2%,SR|20%,R|78%", + "upweight": 0 }, { "key": 9, @@ -302,6 +344,12 @@ "consumeA": [], "consumeA10": [], "consumeB": [], - "consumeB10": [] + "consumeB10": [], + "baodihelp": { + "key": "drawcard_drawpool_baodihelp_9", + "text": "待补充" + }, + "weightreadonly": "SSR|2%,SR|20%,R|78%", + "upweight": 0 } ] \ No newline at end of file diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json index 4c8d390e0..c829996b0 100644 --- a/bin/json/game_guide.json +++ b/bin/json/game_guide.json @@ -645,7 +645,7 @@ "startPar": "", "parameter": "", "interface": "", - "condition": "worldtaskexit_accept_20042", + "condition": "worldtaskexit_accept_20043", "followtj": "OpenNpcOption_熊猫_圣桃树_面对无牙仔", "followguide": 1001002, "finger": [ @@ -1150,7 +1150,7 @@ "startPar": "", "parameter": "", "interface": "", - "condition": "funcopen_treasuremap", + "condition": "", "followtj": "", "followguide": 1000602, "finger": [ @@ -3127,5 +3127,89 @@ "skip": 0, "skipgroup": 0, "reward": [] + }, + { + "id": 1001701, + "group": 17, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "guide_catchbugs", + "followtj": "", + "followguide": 1001702, + "finger": [ + "catchbugsplaysingle", + "catch insects$.insect2" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "txtoffset": { + "x": 0, + "y": 0 + }, + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1001702, + "group": 17, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 0, + "finger": [ + "catchbugsplaysingle", + "catch insects$.insect8" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "txtoffset": { + "x": 0, + "y": 0 + }, + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 111af51d4..274520859 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -1700,10 +1700,10 @@ "z": 0 }, "capskillrule": 101, - "skill": 123004011, - "skill1": 123004111, - "skill2": 123004211, - "skill3": 123004311, + "skill": 0, + "skill1": 123011111, + "skill2": 123001111, + "skill3": 123011311, "txt": { "key": "atlas_23011", "text": "" @@ -5900,7 +5900,7 @@ }, "star": 5, "color": 4, - "race": 4, + "race": 1, "job": 3, "type": 1, "ip": 8, @@ -13241,8 +13241,8 @@ "capskillrule": 101, "skill": 0, "skill1": 151057111, - "skill2": 151057211, - "skill3": 0, + "skill2": 0, + "skill3": 151057211, "txt": { "key": "atlas_51057", "text": "" diff --git a/bin/json/game_herolevelgrow.json b/bin/json/game_herolevelgrow.json index 4ae8e8488..f2db896de 100644 --- a/bin/json/game_herolevelgrow.json +++ b/bin/json/game_herolevelgrow.json @@ -3079,6 +3079,50 @@ "defgrow": 1250, "speedgrow": 0 }, + { + "id": "51056", + "hp": 0, + "atk": 0, + "def": 0, + "speed": 183, + "cri": 100, + "cridam": 1500, + "effhit": 0, + "effre": 200, + "losthold": 0, + "understand": 0, + "damre": 0, + "causedam": 0, + "treadd": 0, + "betreadd": 0, + "suckblood": 0, + "hpgrow": 1000, + "atkgrow": 1300, + "defgrow": 1250, + "speedgrow": 0 + }, + { + "id": "51057", + "hp": 0, + "atk": 0, + "def": 0, + "speed": 183, + "cri": 100, + "cridam": 1500, + "effhit": 0, + "effre": 200, + "losthold": 0, + "understand": 0, + "damre": 0, + "causedam": 0, + "treadd": 0, + "betreadd": 0, + "suckblood": 0, + "hpgrow": 1000, + "atkgrow": 1300, + "defgrow": 1250, + "speedgrow": 0 + }, { "id": "51100", "hp": 0, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 5b53df76f..69686a4fe 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -12519,7 +12519,7 @@ }, "describe": { "key": "item_item_describe_253", - "text": "细密的水滴，发出滴答之声，若抱着友好的态度靠近，它不会抗拒。猎魂头目的初级掉落物，可用于感观之林阵营守护者回响。" + "text": "古老的朽木，几乎无声无息，只是在一处静止不动。猎魂头目的初级掉落物，可用于感观之林阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_251", @@ -12580,7 +12580,7 @@ }, "describe": { "key": "item_item_describe_254", - "text": "古老的朽木，几乎无声无息，只是在一处静止不动。猎魂头目的初级掉落物，可用于包容之水阵营守护者回响。" + "text": "细密的水滴，发出滴答之声，若抱着友好的态度靠近，它不会抗拒。猎魂头目的初级掉落物，可用于包容之水阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_252", @@ -12787,7 +12787,7 @@ }, "describe": { "key": "item_item_describe_257", - "text": "澎湃的浪花，散发着冰冷的海气，只是静静团成一团。猎魂头目的中级掉落物，可用于感观之林阵营守护者回响。" + "text": "蜿蜒的荆枝，散发着温暖的木香，以肉眼轻微可察觉的状态生长着。猎魂头目的中级掉落物，可用于感观之林阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_255", @@ -12860,7 +12860,7 @@ }, "describe": { "key": "item_item_describe_258", - "text": "蜿蜒的荆枝，散发着温暖的木香，以肉眼轻微可察觉的状态生长着。猎魂头目的中级掉落物，可用于包容之水阵营守护者回响。" + "text": "澎湃的浪花，散发着冰冷的海气，只是静静团成一团。猎魂头目的中级掉落物，可用于包容之水阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_256", @@ -13055,7 +13055,7 @@ }, "describe": { "key": "item_item_describe_261", - "text": "汹涌的滔天巨浪，会将冒犯者囫囵淹没，浓烈的海腥味令人窒息。猎魂头目的高级掉落物，可用于感观之林阵营守护者回响。" + "text": "交错环绕的林木，以飞快的速度疯狂生长着。虽是木枝，却弥漫着馥郁的花香。猎魂头目的高级掉落物，可用于感观之林阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_259", @@ -13116,7 +13116,7 @@ }, "describe": { "key": "item_item_describe_262", - "text": "交错环绕的林木，以飞快的速度疯狂生长着。虽是木枝，却弥漫着馥郁的花香。猎魂头目的高级掉落物，可用于包容之水阵营守护者回响。" + "text": "汹涌的滔天巨浪，会将冒犯者囫囵淹没，浓烈的海腥味令人窒息。猎魂头目的高级掉落物，可用于包容之水阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_260", @@ -19872,7 +19872,7 @@ "gm": 1 }, { - "id": "25001001", + "id": "24011001", "name": { "key": "item_item_name_402", "text": "龙币" @@ -19896,7 +19896,7 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "item_25001001", + "img": "item_24011001", "intr": { "key": "item_item_intr_404", "text": "剧情货币，剧情探索中获得并在章节内的商店使用。" diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index cc653aeb2..a7a04e00b 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -8864,7 +8864,7 @@ ], "previoustage": 0, "buried_type": 2, - "buried": 2, + "buried": 1, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -9391,11 +9391,11 @@ "chapterid": 11001, "group_id": 100168, "previous_group_id": [ - 100160 + 100168 ], "previoustage": 0, - "buried_type": 2, - "buried": 1, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -15565,12 +15565,12 @@ "text": "" }, "title": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_title_138", + "text": "鸟蛋争夺战" }, "desc": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_desc_140", + "text": "平凡的日子依然会为生计发愁，帮巫嘎找些十五来吧！" }, "exp": 0, "hero_exp": 330, @@ -15693,12 +15693,12 @@ "text": "" }, "title": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_title_139", + "text": "鸟蛋争夺战" }, "desc": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_desc_141", + "text": "想不到原始人地区鸟蛋还是紧销货，看来得加把劲！" }, "exp": 0, "hero_exp": 330, @@ -16227,12 +16227,12 @@ "text": "" }, "title": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_title_145", + "text": "狂暴拳猴" }, "desc": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_desc_147", + "text": "拳猴们不知道为什么袭击瓜哥一家，不管怎样说，先击退它们吧！" }, "exp": 0, "hero_exp": 330, @@ -16773,12 +16773,12 @@ "text": "" }, "title": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_title_151", + "text": "危险武器" }, "desc": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_desc_153", + "text": "危险！太危险！食人鱼先生你把什么武器带来了！小伊，坦克快停下来！" }, "exp": 0, "hero_exp": 330, @@ -19068,8 +19068,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 202101, + "afterstoryid": 202102, "maingroupName": { "key": "", "text": "" @@ -19120,7 +19120,7 @@ "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, - "venturemodel": "", + "venturemodel": "Person/43002/43002_q.prefab", "bubbletalk": { "key": "", "text": "" @@ -19148,7 +19148,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 202103, "afterstoryid": 0, "maingroupName": { "key": "", @@ -19197,16 +19197,19 @@ "stage_param": 0, "inherit": 0, "battle_fail": 0, - "venturemodelspeed": 0, - "venturemodelscale": 0, + "venturemodelspeed": 12, + "venturemodelscale": 1, "move_type": 0, - "venturemodel": "", + "venturemodel": "Person/badcar/badcar.prefab", "bubbletalk": { "key": "", "text": "" }, - "venturetype": 0, - "ventureavatar": [], + "venturetype": 2, + "ventureavatar": [ + "player", + "sbkp_js_25002" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -19228,7 +19231,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 202104, "afterstoryid": 0, "maingroupName": { "key": "", @@ -20134,13 +20137,7 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 8000 - } - ], + "firstaward": [], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -22246,7 +22243,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303000, "afterstoryid": 0, "maingroupName": { "key": "mainchapter_main_stage_maingroupName_167", @@ -22326,7 +22323,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303010, "afterstoryid": 0, "maingroupName": { "key": "", @@ -22406,7 +22403,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303020, "afterstoryid": 0, "maingroupName": { "key": "", @@ -22534,7 +22531,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303030, "afterstoryid": 0, "maingroupName": { "key": "", @@ -22662,7 +22659,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303040, "afterstoryid": 0, "maingroupName": { "key": "", @@ -22742,7 +22739,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303060, "afterstoryid": 0, "maingroupName": { "key": "", @@ -22822,7 +22819,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303070, "afterstoryid": 0, "maingroupName": { "key": "", @@ -22902,7 +22899,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303090, "afterstoryid": 0, "maingroupName": { "key": "", @@ -22982,7 +22979,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303100, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23062,7 +23059,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303110, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23142,7 +23139,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303120, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23222,7 +23219,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303130, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23302,7 +23299,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303150, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23382,7 +23379,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303160, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23462,7 +23459,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303170, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23542,7 +23539,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303180, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23622,7 +23619,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303190, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23702,7 +23699,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303200, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23830,7 +23827,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303210, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23910,7 +23907,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303220, "afterstoryid": 0, "maingroupName": { "key": "", @@ -23990,7 +23987,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303230, "afterstoryid": 0, "maingroupName": { "key": "", @@ -24118,7 +24115,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303240, "afterstoryid": 0, "maingroupName": { "key": "", @@ -24198,7 +24195,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303250, "afterstoryid": 0, "maingroupName": { "key": "", @@ -24278,7 +24275,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303260, "afterstoryid": 0, "maingroupName": { "key": "", @@ -24406,7 +24403,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 303270, "afterstoryid": 0, "maingroupName": { "key": "", diff --git a/bin/json/game_mainventure.json b/bin/json/game_mainventure.json index f0a2dfe9b..6fd4440b4 100644 --- a/bin/json/game_mainventure.json +++ b/bin/json/game_mainventure.json @@ -79,7 +79,9 @@ "key": "mainchapter_main_venture_venturetext_8", "text": "捉虫子" }, - "jumpidList": [] + "jumpidList": [ + 10068 + ] }, { "chapterid": 11002, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 3fce63d82..00566c5ff 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -147,8 +147,8 @@ }, "main": [ { - "key": 2, - "param": 1102021 + "key": 3, + "param": 20261 } ], "wkqbx": 2, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index c4c11c0a6..2a4b9c2d7 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -2857,6 +2857,7 @@ "heroid": 25001, "Levelid": 0, "datas": [ + "GameMain", "GameMain", "901" ], @@ -2930,9 +2931,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "总教习", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -2940,18 +2941,48 @@ ], "goto": 0 }, + { + "id": 110329, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "第三章恐惧灵", + "901" + ], + "event": [ + 1, + 111 + ], + "goto": 0 + }, { "id": 110330, "heroid": 25001, "Levelid": 0, "datas": [ - "CommandScene", - "功能入口_主线", - "905" + "GameMain", + "总教习", + "901" ], "event": [ 2, - 10352 + 10353 + ], + "goto": 0 + }, + { + "id": 110339, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "总教习", + "901" + ], + "event": [ + 2, + 10360 ], "goto": 0 }, @@ -2963,9 +2994,23 @@ "event": [], "goto": 0 }, + { + "id": 110341, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "木桩1", + "901" + ], + "event": [ + 14 + ], + "goto": 0 + }, { "id": 110345, - "heroid": 0, + "heroid": 25001, "Levelid": 0, "datas": [ "GameMain", @@ -2978,9 +3023,24 @@ ], "goto": 0 }, + { + "id": 110346, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口_派遣", + "901" + ], + "event": [ + 10, + 10006 + ], + "goto": 0 + }, { "id": 110349, - "heroid": 0, + "heroid": 25001, "Levelid": 0, "datas": [ "GameMain", @@ -2999,7 +3059,7 @@ "Levelid": 0, "datas": [ "GameMain", - "悍娇虎", + "告示栏-悍娇虎", "901" ], "event": [ @@ -3014,7 +3074,7 @@ "Levelid": 0, "datas": [ "GameMain", - "悍娇虎", + "告示栏-悍娇虎", "901" ], "event": [ diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index d2c99f9f0..4bc8ac16e 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -70691,5 +70691,400 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [] + }, + { + "Id": 835012211, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000079, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 835012212, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000044, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 835012111, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 483501211, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 835012112, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000106, + 600, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 935012311, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000000, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 935012312, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000074, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 935012313, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 493501231, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 935012314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + 2, + 2, + 60 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 825003211, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 482500321, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 825003212, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 8, + "Argu": [ + 1, + -1, + 1000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 825003213, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000054, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 825003214, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 482500322, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 825003215, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 14, + "Argu": [ + 100 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 925003311, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000000, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 925003312, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000043, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 925003313, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492500331, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 925003314, + "EmitPR": 1000, + "From": 1, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 12, + "Argu": [ + 100 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 364e9a434..e1933bd2f 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -58770,5 +58770,393 @@ }, "buffid": [], "map": "" + }, + { + "id": 835012421, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_835012421", + "text": "回响一阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 835012211 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_835012421_1", + "text": "血量100%时造成伤害提升10%" + }, + "buffid": [], + "map": "" + }, + { + "id": 835012422, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_835012422", + "text": "回响二阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 835012212 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_835012422_1", + "text": "场上每存活1名友方自身攻击增加3%" + }, + "buffid": [], + "map": "" + }, + { + "id": 835012413, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_835012413", + "text": "回响三阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 835012111 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_835012413_1", + "text": "1技能60%附加1回合【重伤】" + }, + "buffid": [], + "map": "" + }, + { + "id": 935012431, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_935012431", + "text": "觉醒一阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 935012311 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_935012431_1", + "text": "3技能最终伤害增加10%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 935012432, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_935012432", + "text": "觉醒二阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 935012312 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_935012432_1", + "text": "增加10%攻击力。" + }, + "buffid": [], + "map": "" + }, + { + "id": 935012433, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_935012433", + "text": "觉醒三阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 935012313 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_935012433_1", + "text": "3技能额外造成目标最大生命值6%的附加伤害。" + }, + "buffid": [], + "map": "" + }, + { + "id": 825003421, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_825003421", + "text": "回响一阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 825003211 + ] + }, + "passSkill": [ + 825003211 + ], + "Desc": { + "key": "skill_skill_atk_Desc_825003421_1", + "text": "血量首次低于60%时净化自己身上全部减益效果" + }, + "buffid": [], + "map": "" + }, + { + "id": 825003422, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_825003422", + "text": "回响二阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 825003213 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_825003422_1", + "text": "场上每存活1名友方自身防御增加5%" + }, + "buffid": [], + "map": "" + }, + { + "id": 825003423, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_825003423", + "text": "回响三阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 825003214 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_825003423_1", + "text": "2技能额外增加吸收10%行动值" + }, + "buffid": [], + "map": "" + }, + { + "id": 925003431, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_925003431", + "text": "觉醒一阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 925003311 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_925003431_1", + "text": "3技能最终伤害增加10%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 925003432, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_925003432", + "text": "觉醒二阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 925003312 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_925003432_1", + "text": "增加10%生命值。" + }, + "buffid": [], + "map": "" + }, + { + "id": 925003433, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Name": { + "key": "skill_skill_atk_Name_925003433", + "text": "觉醒三阶段" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 925003313 + ] + }, + "passSkill": [ + 925003313 + ], + "Desc": { + "key": "skill_skill_atk_Desc_925003433_1", + "text": "吸收行动值成功时，提升友方10%行动值" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 3994b399c..cba6b84aa 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -10203,5 +10203,105 @@ "Callback": [ 945013314 ] + }, + { + "Id": 483501211, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=1", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 835012112 + ] + }, + { + "Id": 493501231, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "CriCal=1", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 935012314 + ] + }, + { + "Id": 482500321, + "When": 16, + "FromCheck": "", + "TargetCheck": "Target=3,Hpproless=600", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 1, + "MaxEmitTimesInRound": 0, + "Callback": [ + 825003212 + ] + }, + { + "Id": 482500322, + "When": 20, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=2", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 825003215 + ] + }, + { + "Id": 492500331, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "CriCal=1", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 925003314 + ] } ] \ No newline at end of file diff --git a/bin/json/game_treasuremap.json b/bin/json/game_treasuremap.json index a52350158..fd660dc9d 100644 --- a/bin/json/game_treasuremap.json +++ b/bin/json/game_treasuremap.json @@ -1,71 +1,6 @@ [ { "id": 1, - "pic": "cbt_sp01_00", - "chapter": 1, - "type": 0, - "unlock": [ - { - "a": "item", - "t": "24012012", - "n": 1 - }, - { - "a": "item", - "t": "24012013", - "n": 1 - }, - { - "a": "item", - "t": "24012014", - "n": 1 - }, - { - "a": "item", - "t": "24012012", - "n": 1 - }, - { - "a": "item", - "t": "24012013", - "n": 1 - }, - { - "a": "item", - "t": "24012014", - "n": 1 - }, - { - "a": "item", - "t": "24012012", - "n": 1 - }, - { - "a": "item", - "t": "24012013", - "n": 1 - }, - { - "a": "item", - "t": "24012014", - "n": 1 - } - ], - "name": { - "key": "treasuremap_map_name_1", - "text": "博克岛的藏宝图" - }, - "explain": { - "key": "treasuremap_map_explain_1", - "text": "扭扭曲曲的字大概描写着：一只？两只?三只！" - }, - "describe": { - "key": "treasuremap_map_desribe_1", - "text": "在博克岛到处搜索找到的藏宝图，已经分裂成了碎片，极其碎片才能促使宝藏出现。上面标记着只在博客岛的宝藏，集齐后跟随着藏宝图好好寻找吧！" - } - }, - { - "id": 2, "pic": "cbt_sp03_00", "chapter": 1, "type": 2, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 28d893d63..b1fc2b2de 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -565,7 +565,7 @@ "lock": 1, "lockend": 999, "ontxe": 20035, - "id_after": 20050, + "id_after": 20043, "group": 10, "exgroup": 210, "des": 2, @@ -662,7 +662,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20042, + "ontxe": 20043, "id_after": 20100, "group": 10, "exgroup": 210, @@ -2703,7 +2703,9 @@ "get_item": [], "trigger": 0, "npc": 110300, - "completetask": [], + "completetask": [ + 12070320 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 1, @@ -2743,10 +2745,12 @@ "get_item": [], "trigger": 0, "npc": 110310, - "completetask": [], + "completetask": [ + 12070330 + ], "deliver_npc": 0, "taskend_removeitem": [], - "auto_accept": 1, + "auto_accept": 0, "tasktips": 0, "deliver_task": 0, "deliver_task_npc": 0, @@ -2778,12 +2782,14 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_48", - "text": "找骇客蛛聊一聊" + "text": "打恐惧灵" }, "get_item": [], "trigger": 0, "npc": 110320, - "completetask": [], + "completetask": [ + 12070340 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 1, @@ -2818,12 +2824,14 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_49", - "text": "打恐惧灵" + "text": "和师傅聊聊" }, "get_item": [], "trigger": 0, "npc": 110330, - "completetask": [], + "completetask": [ + 12070350 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 1, @@ -2858,12 +2866,14 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_50", - "text": "向大师打听" + "text": "木桩" }, "get_item": [], "trigger": 0, "npc": 110340, - "completetask": [], + "completetask": [ + 12070360 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 2, @@ -2898,13 +2908,15 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_51", - "text": "向大师打听" + "text": "教习" }, "get_item": [], "trigger": 0, "npc": 110345, - "completetask": [], - "deliver_npc": 0, + "completetask": [ + 12070370 + ], + "deliver_npc": 110349, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 0, @@ -2943,8 +2955,10 @@ "get_item": [], "trigger": 0, "npc": 110350, - "completetask": [], - "deliver_npc": 0, + "completetask": [ + 12070371 + ], + "deliver_npc": 110351, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 0, @@ -2983,7 +2997,9 @@ "get_item": [], "trigger": 0, "npc": 110352, - "completetask": [], + "completetask": [ + 12070372 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 2, diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 8584cd0a3..d1273eba2 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -26,6 +26,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal var ( mapData map[string]interface{} pagoda *pb.DBPagoda + user *pb.DBUser isWin bool err error ) @@ -125,71 +126,64 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal mapData["complete"] = pagoda.Complete } } - - errdata = this.module.ModifyPagodaData(session.GetUserId(), mapData) - session.SendMsg(string(this.module.GetType()), PagodaChallengeOverResp, &pb.PagodaChallengeOverResp{Data: pagoda}) - - // 记录爬塔明细数据 - if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { - leadpos := req.Report.Info.Redflist[0].Leadpos - szLine := make([]*pb.LineUp, 0) - for _, v := range req.Report.Info.Redflist[0].Team { - if v.Oid != "" { - szLine = append(szLine, &pb.LineUp{ - Cid: v.HeroID, - Star: v.Star, - Lv: v.Lv, - }) - } + // 数据直接插入跨服数据库中 + if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), } - // 数据直接插入跨服数据库中 - uid := session.GetUserId() - userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId()) - if err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DBError, - Title: pb.ErrorCode_DBError.ToString(), - Message: err.Error(), - } - return - } - newData := &pb.DBPagodaRecord{ - Id: primitive.NewObjectID().Hex(), - Uid: session.GetUserId(), - PagodaId: pagoda.PagodaId, - Type: pagoda.Type, - Nickname: userinfo.Name, - Icon: userinfo.CurSkin, - Lv: userinfo.Lv, - Leadpos: leadpos, - Line: szLine, - CostTime: req.Report.Costtime, - Tab: conf.Tab, - } - - // 数据写到跨服中 - if conn_, err := db.Cross(); err == nil { - dbModel := db.NewDBModel(comm.TablePagodaRecord, conn_) - dbModel.AddList(uid, newData.Id, newData) - } else { - this.module.Errorf("db crosserr :%v", err) - } - - this.module.SetPagodaRankList("pagodaList"+strconv.Itoa(int(newData.PagodaId)), pagoda.PagodaId, newData.Id) + return } - + session.SetMate(comm.Session_User, user) // 通关奖励 - errdata = this.module.DispenseRes(session, conf.Reward, true) - if errdata != nil { + if errdata = this.module.DispenseRes(session, conf.Reward, true); errdata != nil { return } + if errdata = this.module.ModifyPagodaData(session.GetUserId(), mapData); errdata != nil { + return + } + session.SendMsg(string(this.module.GetType()), PagodaChallengeOverResp, &pb.PagodaChallengeOverResp{Data: pagoda}) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { // 发系统公告 - this.chat.SendSysChatToWorld(session, comm.ChatSystem4, nil, pagoda.PagodaId, 0, user.Name) - } else { - this.module.Errorf("no found userdata uid:%s", session.GetUserId()) + // 记录爬塔明细数据 + if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { + leadpos := req.Report.Info.Redflist[0].Leadpos + szLine := make([]*pb.LineUp, 0) + for _, v := range req.Report.Info.Redflist[0].Team { + if v.Oid != "" { + szLine = append(szLine, &pb.LineUp{ + Cid: v.HeroID, + Star: v.Star, + Lv: v.Lv, + }) + } + } + newData := &pb.DBPagodaRecord{ + Id: primitive.NewObjectID().Hex(), + Uid: session.GetUserId(), + PagodaId: pagoda.PagodaId, + Type: pagoda.Type, + Nickname: user.Name, + Icon: user.CurSkin, + Lv: user.Lv, + Leadpos: leadpos, + Line: szLine, + CostTime: req.Report.Costtime, + Tab: conf.Tab, + } + + // 数据写到跨服中 + if conn_, err := db.Cross(); err == nil { + dbModel := db.NewDBModel(comm.TablePagodaRecord, conn_) + dbModel.AddList(session.GetUserId(), newData.Id, newData) + } else { + this.module.Errorf("db crosserr :%v", err) + } + this.module.SetPagodaRankList("pagodaList"+strconv.Itoa(int(newData.PagodaId)), pagoda.PagodaId, newData.Id) } + this.chat.SendSysChatToWorld(session, comm.ChatSystem4, nil, pagoda.PagodaId, 0, user.Name) this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypePagoda, conf.Key) this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype168, pagoda.Data[conf.Tab], conf.Tab)) this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PagodaChallengeOverReq", conf.Reward) diff --git a/modules/user/module.go b/modules/user/module.go index 7dabc323b..817333984 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -479,6 +479,7 @@ func (this *User) change(session comm.IUserSession, attrs map[string]int32) (atn ) 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{ @@ -492,6 +493,7 @@ func (this *User) change(session comm.IUserSession, attrs map[string]int32) (atn 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{ @@ -524,8 +526,7 @@ func (this *User) change(session comm.IUserSession, attrs map[string]int32) (atn Integral: user.Integral, Profit: user.Profit, Deposit: user.Deposit, - - Consumemoney: user.Consumemoney, + Consumemoney: user.Consumemoney, } atno = make([]*pb.UserAtno, 0, len(attrs)) for attr, add := range attrs { @@ -840,8 +841,29 @@ func (this *User) change(session comm.IUserSession, attrs map[string]int32) (atn Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } + return } + user.Gold = change.Gold + user.Diamond = change.Diamond + user.Exp = change.Exp + user.Lv = change.Lv + user.Vipexp = change.Vipexp + user.Vip = change.Vip + user.Starcoin = change.Starcoin + user.Ps = change.Ps + user.Moongold = change.Moongold + user.Talent1 = change.Talent1 + user.Talent2 = change.Talent2 + user.Talent3 = change.Talent3 + user.Talent4 = change.Talent4 + user.Merchantmoney = change.Merchantmoney + user.Integral = change.Integral + user.Profit = change.Profit + user.Deposit = change.Deposit + user.Consumeexp = change.Consumeexp + user.Consumemoney = change.Consumemoney + if err := this.modelExpand.ChangeUserExpand(uid, updateEx); err != nil { this.Errorf("AddAttributeValue ex err:%v", err) errdata = &pb.ErrorData{ @@ -849,8 +871,11 @@ func (this *User) change(session comm.IUserSession, attrs map[string]int32) (atn Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } + return } - + userEx.FriendPoint = change.Friend + userEx.Guildcoin = change.Guildcoin + userEx.Arenacoin = change.Arenacoin return } @@ -1229,6 +1254,7 @@ func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush ) 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{ diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index c07c4a6f4..2806406b6 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -24,6 +24,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal var ( mapData map[string]interface{} reward []*cfg.Gameatn + user *pb.DBUser bWin bool // 战斗是否胜利 atno []*pb.UserAtno // atno 类型 del []string // 自动出售的装备 @@ -33,6 +34,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal oldDifficulty int32 // 记录通关之前的难度 consumPs int32 szAtno []*pb.UserAtno // atno 类型 + err error ) changExp = make(map[string]int32, 0) mapData = make(map[string]interface{}, 0) @@ -77,7 +79,15 @@ 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 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + session.SetMate(comm.Session_User, user) pskey := req.BossId<<8 + req.Difficulty errdata, bWin = this.module.battle.CheckBattleReport(session, req.Report) consumPs = viking.Ps[pskey] @@ -144,15 +154,6 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal this.module.CheckSeasonRank(session.GetUserId(), req.BossId, req.Difficulty, Leadpos, szLine, total) } - user, err := this.module.ModuleUser.GetUser(session.GetUserId()) - if err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DBError, - Title: pb.ErrorCode_DBError.ToString(), - Message: err.Error(), - } - return - } reward = this.module.ModuleTools.GetGroupDataByLottery(vikingCfg.Drop, user.Vip, user.Lv) b := this.module.ModuleActivity.HDCelebration(session, 2, req.BossId) @@ -248,12 +249,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal tasks = append(tasks, comm.GetBuriedParam(comm.Rtype180, req.BossId, 1)) } if len(tasks) > 0 { - if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { - this.chat.SendSysChatToWorld(session, comm.ChatSystem14, nil, req.BossId, req.Difficulty, user.Name) - } else { - this.module.Errorf("no found userdata uid:%s", session.GetUserId()) - } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.chat.SendSysChatToWorld(session, comm.ChatSystem14, nil, req.BossId, req.Difficulty, user.Name) this.module.ModuleBuried.TriggerBuried(session, tasks...) this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "VikingChallengeOverReq", szAtno) })