From b4b72d0c241ffc26dbbbd7a047578f1f4fead2f4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 09 十二月 2021 16:11:53 +0800
Subject: [PATCH] 9341 【BT5】【主干】【后端】情缘系统（Couple命令增加添加喜糖宴会；修复多个喜糖宴会同时存在时吃喜糖同步错误bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py | 18 +++++++++++-------
1 files changed, 11 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 19a889f..da87f73 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
@@ -34,6 +34,7 @@
import GameFuncComm
import ChPyNetSendPack
import NetPackCommon
+import EventShell
#---------------------------------------------------------------------
#所有任务的索引
FindQuestFunc = None
@@ -74,6 +75,8 @@
Def_NewGuyNoSight = "xinshou" # 新手期隐身无视野
+Def_Mission_Grade = "grade" # 任务评级
+
#------------原DayEventData去除，替换枚举管理-----------------
(
Day_KillNPC_By_ID_List, #Type = Day_KillNPC_By_ID
@@ -99,7 +102,7 @@
#12: 隐藏主线剧情，一般用于辅助主线任务用的
Def_Mission_Type_Main = 0 # 主线剧情
-Def_Mission_Type_MainHid = 120 # 隐藏主线剧情
+Def_Mission_Type_MainHid = 998 # 隐藏主线剧情 暂时不用，配大点
Def_GM_Active_Mission_Type = 999 #暂时不用，配大点
Def_Mission_Type_RunDaily = 7
Def_Mission_Type_RunFamily = 12
@@ -204,14 +207,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
@@ -329,6 +330,7 @@
# @return 返回值,新增的任务实例
# @remarks 添加新任务
def AddNewMission(curPlayer, curMissionID):
+ GameWorld.Log("AddNewMission----%s"%curMissionID, curPlayer.GetID())
curMission = curPlayer.AddMission(curMissionID)
#等级触发OSS记录
@@ -339,6 +341,8 @@
curQuestData = QuestManager.FindQuest(curMissionID)
if curQuestData != None:
EventReport.WriteEvent_mission_log(curPlayer, curQuestData, 0)
+
+ EventShell.RunQuestEvent(curPlayer, "on_create", curMissionID, EventShell.Def_RunQuestType_Normal)
return curMission
#---------------------------------------------------------------------
--
Gitblit v1.8.0