From da703bbc7bc857362753504d9b82ce8d2250a9b6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 15 三月 2019 16:32:02 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(外观设置修改)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 c005eb0..92ba2ba 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py
@@ -18,7 +18,7 @@
# @change: "2010-11-22 12:15" Alee 采集限制
# @change: "2014-04-14 12:00" hxp 增加自定义采集NPC
#---------------------------------------------------------------------
-"""Version = 2014-04-14 12:00"""
+#"""Version = 2014-04-14 12:00"""
#---------------------------------------------------------------------
#导入
import GameWorld
@@ -31,6 +31,8 @@
import NPCCommon
import FBLogic
import AttackCommon
+import ReadChConfig
+import PlayerState
import GameObj
#---------------------------------------------------------------------
'''Version = 2010-09-16 09:55'''
@@ -49,18 +51,18 @@
tagObj = curPlayer.GetActionObj()
if tagObj == None:
#没有目标
- GameWorld.Log("FuncCall -> 没有目标" , curPlayer.GetPlayerID())
+ GameWorld.Log("GetActionNPCbyType -> 没有目标" , curPlayer.GetPlayerID())
return
if tagObj.GetGameObjType() != IPY_GameWorld.gotNPC:
#谈话对象不对
- GameWorld.Log("FuncCall -> 谈话对象不对" , curPlayer.GetPlayerID())
+ GameWorld.Log("GetActionNPCbyType -> 谈话对象不对" , curPlayer.GetPlayerID())
return
curNPC = GameWorld.GetNPCManager().GetNPCByIndex(tagObj.GetIndex())
if curNPC == None:
#没有这个NPC
- GameWorld.Log("FuncCall ->没有这个NPC" , curPlayer.GetPlayerID())
+ GameWorld.Log("GetActionNPCbyType ->没有这个NPC" , curPlayer.GetPlayerID())
return
if curNPC.GetType() != npcType:
@@ -96,7 +98,7 @@
curPlayer.SetActionObj(curNPC)
# 自定义的采集NPC
- if NPCCommon.DoCollectNPCBegin(curPlayer, curNPC):
+ if NPCCommon.OnCollectNPCBegin(curPlayer, curNPC, tick):
return
EventShell.EventRespons_MisCollectTime(curPlayer, curNPC)
@@ -130,7 +132,7 @@
# @param curPlayer
# @return None
# @remarks 函数详细说明.
-def EndMissionCollect(curPlayer):
+def EndMissionCollect(curPlayer, tick):
#任务采集类NPC
curNPC = GetActionNPCbyType(curPlayer, IPY_GameWorld.ntMissionCollect)
if not curNPC:
@@ -143,10 +145,9 @@
return
# 自定义的采集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