5315 【后端】【1.6】登录奖励活动

xdh

2019-02-13 5d0665e7f5b3bee843f58afa9a05ae9d7e1fc72f

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py

@@ -51,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,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