From ad26af07b15757b4a85ec056a2c8d2a0f8e7e133 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 22 九月 2018 01:40:15 +0800
Subject: [PATCH] 3798 【后端】运营活动时间优化，开服日常限时活动定制时间优化（修复活动日期相连时活动时间异常bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 23 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
index 69e12cf..ba4c805 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
@@ -599,25 +599,29 @@
Event_OnKillByID(curPlayer, npcTypeID)
#触发按等级杀怪
- #EventRespons_OnKillByLv(curPlayer, curNPC)
+ EventRespons_OnKillByLv(curPlayer, curNPC)
return
#---------------------------------------------------------------------
-###任务触发器_OnKillByLv 击杀指定等级的怪物
-##@param curPlayer 玩家实例
-##@param curNPC NPC实例
-##@return 返回值无意义
-##@remarks 任务触发器_OnKillByLv 击杀指定等级的怪物
-#def EventRespons_OnKillByLv(curPlayer, curNPC):
-# #得到NPC的TypeID
-# npcLV = curNPC.GetLV()
-# #运行on_kill_by_lv目录下的[NPCTypeID].xml文件
-# QuestRunner.SetKillNPC(curNPC)
-#
-# RunQuestEvent(curPlayer, "on_kill_by_lv", npcLV, Def_RunQuestType_Normal)
-#
-# #触发每日任务杀怪
-# RunDayEvent(curPlayer, "on_kill_by_lv", npcLV, QuestCommon.Def_Kill_Npc_LV)
-# return
+##任务触发器_OnKillByLv 击杀指定等级的怪物
+#@param curPlayer 玩家实例
+#@param curNPC NPC实例
+#@return 返回值无意义
+#@remarks 任务触发器_OnKillByLv 击杀指定等级的怪物
+def EventRespons_OnKillByLv(curPlayer, curNPC):
+ if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:
+ return
+
+ #得到NPC的TypeID
+ npcLV = curNPC.GetLV()
+
+ #运行on_kill_by_lv目录下的[NPCTypeID].xml文件
+ #QuestRunner.SetKillNPC(curNPC)
+
+ RunQuestEvent(curPlayer, "on_kill_by_lv", npcLV, Def_RunQuestType_Normal)
+
+ #触发每日任务杀怪
+ RunDayEvent(curPlayer, "on_kill_by_lv", npcLV, QuestCommon.Def_Kill_Npc_LV)
+ return
#---------------------------------------------------------------------
##任务触发器_完成某手机任务
@@ -1521,7 +1525,7 @@
#触发每日任务杀怪
RunDayEvent(curPlayer, "on_kill_by_feel", npcTypeID, QuestCommon.Def_Kill_Npc_ID)
-
+ EventRespons_OnKillByLv(curPlayer, curNPC)
return
## 完成任务
@@ -1809,14 +1813,14 @@
RunQuestEvent(curPlayer, "mwsoulactive", soulid, Def_RunQuestType_RunAll)
return
-def EventRespons_PassQueenRelecs(curPlayer, lineID):
- #S级通关X层娲皇遗迹
- RunQuestEvent(curPlayer, "passqueenrelecs", lineID, Def_RunQuestType_Normal)
+def EventRespons_PassQueenRelecs(curPlayer, lineID, grade):
+ #X级通关X层娲皇遗迹
+ RunQuestEvent(curPlayer, "passqueenrelecs", '%s_%s'%(lineID, grade), Def_RunQuestType_Normal)
return
-def EventRespons_HorseUp(curPlayer, alllv):
+def EventRespons_HorseUp(curPlayer):
#坐骑升级
- RunQuestEvent(curPlayer, "horseup", alllv, Def_RunQuestType_Normal)
+ RunQuestEvent(curPlayer, "horseup", "horseup", Def_RunQuestType_Normal)
return
def EventRespons_SuitPlus(curPlayer, cnt):
@@ -1824,6 +1828,35 @@
RunQuestEvent(curPlayer, "suitplus", cnt, Def_RunQuestType_Normal)
return
+def EventRespons_TrialExchange(curPlayer, costItemID):
+ #宗门试炼兑换装备
+ RunQuestEvent(curPlayer, "trialexange", costItemID, Def_RunQuestType_Normal)
+ return
+
+def EventRespons_EquipByPlace(curPlayer, equipplace):
+ #穿戴某部位装备(非时效)
+ RunQuestEvent(curPlayer, "equipbyplace", equipplace, Def_RunQuestType_Normal)
+ return
+
+def EventRespons_CompoundEquip(curPlayer, itemColor, itemQuality):
+ #装备合成某品质某星级
+ RunQuestEvent(curPlayer, "compoundequip", '%s_%s'%(itemColor, itemQuality), Def_RunQuestType_Normal)
+ return
+
+def EventRespons_EquipWash(curPlayer, washType, washLV):
+ #装备洗练至X级
+ RunQuestEvent(curPlayer, "equipwash", '%s_%s'%(washType, washLV), Def_RunQuestType_Normal)
+ return
+
+def EventRespons_AddBourseItem(curPlayer):
+ #上架集市物品
+ RunQuestEvent(curPlayer, "addbourseitem", "addbourseitem", Def_RunQuestType_Normal)
+ return
+
+def EventRespons_StoreDonate(curPlayer):
+ #捐献仙盟装备
+ RunQuestEvent(curPlayer, "storedonate", "storedonate", Def_RunQuestType_Normal)
+ return
#---------------------------------------------------------------------
#================================================================================
--
Gitblit v1.8.0