From e84f8a63b4d3bd8ee4722f6bb8f40865f09d967c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 22 一月 2019 20:29:31 +0800
Subject: [PATCH] 5931 【后端】【1.5.100】诛仙装备开发(套装属性、诛仙背包整理、装备总评分、穿戴绑定)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py
index c7ef269..92ba2ba 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py
@@ -96,11 +96,9 @@
     
     #先设置对象,任务可采集得到对象NPC
     curPlayer.SetActionObj(curNPC)
-    if curNPC.GetNPCID() in ReadChConfig.GetEvalChConfig("CollectNPCLostHP"):
-        curPlayer.SetDict(ChConfig.Def_PlayerKey_CollectLostHPTick, tick)
     
     # 自定义的采集NPC
-    if NPCCommon.DoCollectNPCBegin(curPlayer, curNPC):
+    if NPCCommon.OnCollectNPCBegin(curPlayer, curNPC, tick):
         return
     
     EventShell.EventRespons_MisCollectTime(curPlayer, curNPC)
@@ -146,13 +144,10 @@
     if not ChNPC.OnCollectEnd(curPlayer, curNPC):
         return
     
-    PlayerState.DoCollectingLostHP(curPlayer, npcID, tick, True)
-    
     # 自定义的采集NPC
-    if NPCCommon.DoCollectNPCOK(curPlayer, npcID):
-        EventShell.EventRespons_MisCollectSuccess(curPlayer, curNPC) # 先直接写这边触发一下,自定义采集的不再处理后面的代码
-        FBLogic.OnCollectOK(curPlayer, npcID, GameWorld.GetGameWorld().GetTick())
-        return
+    NPCCommon.DoCollectNPCOK(curPlayer, npcID, tick)
     
     EventShell.EventRespons_MisCollectSuccess(curPlayer, curNPC)
+    return
+
     
\ No newline at end of file

--
Gitblit v1.8.0