From e3abcda123dce539f821ab2520cbb7bb8e70daad Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 20 四月 2019 10:16:28 +0800
Subject: [PATCH] 6457 缥缈宝藏障碍通知修改
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py | 117 +++++-----------------------------------------------------
1 files changed, 10 insertions(+), 107 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 2e4a833..907d56e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
@@ -28,8 +28,6 @@
# @change: "2013-09-18 17:00" Alee 退出锁定退出交易
# @change: "2013-09-23 19:30" Alee 红名提示修改
# @change: "2013-11-15 20:20" hxp 关闭07 3A购买背包封包功能，增加背包成功系统提示
-# @change: "2013-11-27 20:30" hxp 修改结束摆摊状态事件单独处理，不在结束事件中处理
-# @change: "2013-12-10 14:00" hxp 修改查看摆摊状态事件单独处理，不在结束事件中处理
# @change: "2013-12-12 14:30" hxp 增加钻石购买背包计费点事件同步
# @change: "2013-12-13 12:20" hxp 修改首登物品绑定设置
# @change: "2013-12-27 16:00" Alee 删除多余代码
@@ -80,7 +78,6 @@
import PlayerControl
import FunctionNPCCommon
import FBLogic
-import PlayerShopItem
import ItemControler
import ItemCommon
import QuestCommon
@@ -1335,15 +1332,6 @@
RunQuestEvent(curPlayer, 'on_deactive', missionID, Def_RunQuestType_RunAll)
return
-#---------------------------------------------------------------------
-##任务触发器_OnCoin 换取金钱事件
-#@param curPlayer 玩家实例
-#@return 返回值无意义
-#@remarks 任务触发器_OnCoin 换取金钱事件
-def EventResponse_OnCoin(curPlayer):
- RunQuestEvent(curPlayer, 'on_coin', 'on_coin', Def_RunQuestType_RunAll)
- curPlayer.DataServer_CheckPrizeItem()
- return
#---------------------------------------------------------------------
##任务触发器_OnDig 挖宝进度条结束后触发
@@ -1720,25 +1708,11 @@
RunQuestEvent(curPlayer, "on_goldinvest", "on_goldinvest", Def_RunQuestType_Normal)
RunQuestEvent(curPlayer, "on_goldinvest", investType, Def_RunQuestType_Normal)
return
-
-def EventRespons_OnBuyTeHuiItem(curPlayer, shopID, itemShopIndex):
- # 购买特惠商店物品
- RunQuestEvent(curPlayer, "on_buy_tehuiitem", "on_buy_tehuiitem", Def_RunQuestType_Normal)
- RunQuestEvent(curPlayer, "on_buy_tehuiitem", shopID, Def_RunQuestType_Normal)
- RunQuestEvent(curPlayer, "on_buy_tehuiitem", "%s_%s" % (shopID, itemShopIndex), Def_RunQuestType_Normal)
- return
def EventRespons_OnActivatePet(curPlayer, petID):
# 激活宠物
RunQuestEvent(curPlayer, "on_activatepet", "on_activatepet", Def_RunQuestType_Normal)
RunQuestEvent(curPlayer, "on_activatepet", petID, Def_RunQuestType_Normal)
- return
-
-def EventRespons_OnActiveMagicWeapon(curPlayer, mwID):
- # 激活法宝
- RunQuestEvent(curPlayer, "on_activemagicweapon", mwID, Def_RunQuestType_Normal)
- RunQuestEvent(curPlayer, "on_activemagicweaponex", mwID, Def_RunQuestType_RunAll)
- RunQuestEvent(curPlayer, "on_activemagicweaponex", 0, Def_RunQuestType_RunAll)
return
def EventRespons_MagicWeaponLV(curPlayer, mwID, lv):
@@ -1907,6 +1881,16 @@
def EventRespons_EquipStar(curPlayer):
#装备总星级变化
RunQuestEvent(curPlayer, "equipstar", "equipstar", Def_RunQuestType_Normal)
+ return
+
+def EventRespons_Talk(curPlayer, eventName):
+ #频道发言
+ RunQuestEvent(curPlayer, "talk", eventName, Def_RunQuestType_Normal)
+ return
+
+def EventRespons_FairyDomain(curPlayer):
+ #完成缥缈仙域事件
+ RunQuestEvent(curPlayer, "fairydomain", 'fairydomain', Def_RunQuestType_Normal)
return
#---------------------------------------------------------------------
@@ -3743,8 +3727,6 @@
ExitCreateFamily(curPlayer)
ExitBillboard(curPlayer)
#ExitEventLock(curPlayer)
- #ExitShopItem(curPlayer) # 奇迹只在切地图及下线时关闭摆摊
- #ExitWatchShopItem(curPlayer)
#npc商店退出
ExitNPCShop(curPlayer)
@@ -3784,85 +3766,6 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_PyPlayerAction, 0)
return
-
-##结束摆摊事件
-#@param curPlayer 玩家实例
-#@return 返回值无意义
-#@remarks 自定义函数:结束摆摊事件
-def ExitShopItem(curPlayer):
- GameWorld.DebugLog("ExitShopItem", curPlayer.GetPlayerID())
- playerShop = curPlayer.GetPlayerShop()
- #在摆摊状态
- if playerShop.GetIsStartShop():
- PlayerShopItem.DoExitShop(curPlayer , curPlayer.GetPlayerShop())
-
- return
-#---------------------------------------------------------------------
-##结束查看摆摊事件
-#@param curPlayer 玩家实例
-#@return 返回值无意义
-#@remarks 自定义函数:结束查看摆摊事件
-def ExitWatchShopItem(curPlayer):
- curPlayerShop = curPlayer.GetPlayerShop()
-
- if not curPlayerShop.GetIsWatchingShop():
- return
-
- openShopPlayer = curPlayer.GetActionPlayer()
- __DoExitWatchShopItem(curPlayer , openShopPlayer)
-
- curPlayerShop.SetIsWatchingShop(0)
- return
-#---------------------------------------------------------------------
-##结束查看摆摊事件
-#@param curPlayer 玩家实例
-#@return 返回值无意义
-#@remarks 自定义函数:结束查看摆摊事件
-def __DoExitWatchShopItem(curPlayer , openShopPlayer):
-
- if openShopPlayer == None:
- return
-
- shop = openShopPlayer.GetPlayerShop()
- #没有开店
- if not shop.GetIsStartShop():
- return
-
- #商店删除这个玩家
- shop.DeleteWatchPlayer(curPlayer.GetPlayerID())
- return
-
-#---------------------------------------------------------------------
-##结束事件锁
-#@param curPlayer 玩家实例
-#@return 返回值无意义
-#@remarks 自定义函数:结束事件锁
-#===============================================================================
-# def ExitEventLock(curPlayer):
-# if not curPlayer.GetHaveSetEventLock() :
-# return
-#
-# #在摆摊状态不解锁，奇迹摆摊物品解锁只在切地图/下线/玩家主动结束摆摊情况下解锁
-# playerShop = curPlayer.GetPlayerShop()
-# if playerShop.GetIsStartShop():
-# return
-#
-# #获得玩家物品管理器
-# ItemManager = curPlayer.GetItemManager()
-# #获得背包
-# curPack = ItemManager.GetPack(IPY_GameWorld.rptItem)
-# for i in range(curPack.GetCount()):
-# item = curPack.GetAt(i)
-# if item == None or item.IsEmpty():
-# continue
-#
-# if not item.GetIsEventLocked():
-# continue
-#
-# #离开事件锁
-# item.SetIsEventLocked(False)
-#===============================================================================
-
#---------------------------------------------------------------------
##结束查看排行榜
#@param curPlayer 玩家实例
--
Gitblit v1.8.0