From fd6fd0602d6dffa638bdd9bdcb46445a9430520e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 23 十月 2018 19:10:36 +0800
Subject: [PATCH] 4283 增加法宝经验物品删除处理
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
index 339cda7..3860726 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -55,6 +55,7 @@
import PassiveBuffEffMng
import PlayerFamilyRedPacket
import PlayerGoldGift
+import PlayerFlashSale
import PlayerWing
import ChEquip
@@ -461,7 +462,7 @@
relation = BaseAttack.GetTagRelation(curPlayer, curTag, None, tick)
#判断是否敌对关系
if relation[0] != ChConfig.Type_Relation_Enemy :
- AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1])
+ #AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1])
return
return curTag
@@ -532,7 +533,7 @@
if tick - curPlayer.GetPlayerActionTick() < curPlayer.GetPrepareTime():
#时间间隔没有到
- if prepareState == IPY_GameWorld.pstCollecting:
+ if prepareState in [IPY_GameWorld.pstCollecting, IPY_GameWorld.pstMissionCollecting]:
FBLogic.OnCollecting(curPlayer, tick)
return
@@ -571,16 +572,6 @@
mapID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TransMapId)
posX = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TransPosX)
posY = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TransPosY)
-
- #执行逻辑，应该在入口设置好消耗，这边只是扣除
- #=======================================================================
- # isFreedomTransBuff = SkillCommon.GetPlayerBuffBySkillTypeID(curPlayer, ShareDefine.Def_FreedomTransBuffID)
- # if transportType == ChConfig.Def_Transport_Type_BigMap or not isFreedomTransBuff:
- # isAutoBuy = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TransAutoBuyItem)
- # #传送支付处理
- # if not ChPlayer.PayForTransport(curPlayer, transportType, isAutoBuy):
- # return
- #=======================================================================
if not TransCostAfterPrepare(curPlayer):
return
@@ -637,7 +628,7 @@
if not result:
return
- FBLogic.OnCollectOK(curPlayer, tick)
+ FBLogic.OnCollectOK(curPlayer, curNPC.GetNPCID(), tick)
return
#---------------------------------------------------------------------
@@ -1237,6 +1228,8 @@
PlayerSuccess.FinishDelayAddSuccessProgress(curPlayer, tick, False)
#开服红包处理
PlayerFamilyRedPacket.ProcessOSRedPacket(curPlayer, tick)
+ #限时抢购
+ PlayerFlashSale.ProcessFlashSaleMail(curPlayer, tick)
return
--
Gitblit v1.8.0