From 22c0a62a2b77f5e9fff6faa1164216d310e73404 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 22 五月 2019 11:04:03 +0800
Subject: [PATCH] 6501 任务状态通知后再触发功能开启
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py | 4 +++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py | 10 ++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py
index 87c70f6..36793e2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py
@@ -204,14 +204,12 @@
# 剧情任务完成处理
OnStoryMissionFinish(curPlayer, missionID)
- # 完成任务事件
- GameFuncComm.DoFuncOpenLogic(curPlayer, [missionID])
EventReport.WriteEvent_mission_log(curPlayer, curQuestData, 1, isFinish, failReason)
- # 镖车完成特殊处理
- elif missionID == ChConfig.Def_ConvoyTruckMissionID and state == ChConfig.Def_Mission_State_NoAccept:
- GameFuncComm.DoFuncOpenLogic(curPlayer, [missionID])
- EventReport.WriteEvent_mission_log(curPlayer, curQuestData, 1, isFinish, failReason)
+# # 镖车完成特殊处理
+# elif missionID == ChConfig.Def_ConvoyTruckMissionID and state == ChConfig.Def_Mission_State_NoAccept:
+# GameFuncComm.DoFuncOpenLogic(curPlayer, [missionID])
+# EventReport.WriteEvent_mission_log(curPlayer, curQuestData, 1, isFinish, failReason)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
index 388d7cb..585f3d9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
@@ -58,6 +58,7 @@
import Operate_EquipStone
import PlayerWeekParty
import PlayerFairyDomain
+import GameFuncComm
import PlayerActLogin
import PlayerHorse
import FBCommon
@@ -5011,7 +5012,8 @@
QuestCommon.SetPlayerMissionState(curPlayer, curMission, -1)
curMission.SetDescriptionIndex(len(curMissionData.QuestDescriptionList) - 1)
EventShell.NotifyOneMission(curPlayer, curMission, isNotifyAll=False)
-
+ # 完成任务事件 (配合前端,在通知任务状态后再触发)
+ GameFuncComm.DoFuncOpenLogic(curPlayer, [missionID])
#删除这个任务
#第一个任务决定是否要触发OnEnter事件, 所以不能删除
if missionID != 1 and diff_event == 0:
--
Gitblit v1.8.0