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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 f82909c..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
@@ -627,7 +628,7 @@
     if not result:
         return
     
-    FBLogic.OnCollectOK(curPlayer, tick)
+    FBLogic.OnCollectOK(curPlayer, curNPC.GetNPCID(), tick)
     return
 
 #---------------------------------------------------------------------
@@ -1227,6 +1228,8 @@
     PlayerSuccess.FinishDelayAddSuccessProgress(curPlayer, tick, False)
     #开服红包处理
     PlayerFamilyRedPacket.ProcessOSRedPacket(curPlayer, tick)
+    #限时抢购
+    PlayerFlashSale.ProcessFlashSaleMail(curPlayer, tick)
     return
 
 

--
Gitblit v1.8.0