xdh
2018-11-19 76aaa2bc9a47e1896638740312affe1ec61f2334
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
@@ -235,15 +235,16 @@
    
    # 当前状态处理
    if curState == ShareDefine.Def_PetState_Fight:
        curPet = curPlayer.GetPetMgr().GetFightPet()
        if curPet:
            #已是出战状态, C++召唤坐标和人重叠
            resultPos = GameMap.GetEmptyPlaceInArea(curPlayer.GetPosX(), curPlayer.GetPosY(), ChConfig.Def_SummonAppearDist)
            curPet.ResetPos(resultPos.GetPosX(), resultPos.GetPosY())
            PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPet)
            PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveBuff(curPet)
        return
        #PetControl.ReCallFightPet(curPlayer)
#        curPet = curPlayer.GetPetMgr().GetFightPet()
#        if curPet:
#            #已是出战状态, C++召唤坐标和人重叠
#            resultPos = GameMap.GetEmptyPlaceInArea(curPlayer.GetPosX(), curPlayer.GetPosY(), ChConfig.Def_SummonAppearDist)
#            curPet.ResetPos(resultPos.GetPosX(), resultPos.GetPosY())
#            PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPet)
#            PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveBuff(curPet)
#        return
        #18/10/15 因为某种未知原因宠物物品的状态是出战(实际场景中未出战),导致该宠物无法出战,故再次发包出战时,此处不拦!
        PetControl.ReCallFightPet(curPlayer)
   
    else:
        pass
@@ -303,20 +304,20 @@
    PetControl.DoLogic_PlayerPetLearnSkillList(rolePet, learnSkillList)
    
    #---刷新属性(不通知)---
    #GameWorld.DebugLog("ˢǰ: petID=%s,playerID=%s,npcID=%s,BindType=%s,AIMode=%s,PetIndex=%s,petFinalHurtPer=%s,grade=%s,qualLV=%s,"
    #GameWorld.DebugLog("ˢǰ: petID=%s,playerID=%s,npcID=%s,BindType=%s,AIMode=%s,PetIndex=%s,grade=%s,qualLV=%s,"
    #                   % (petStruct.PetID, petStruct.PlayerID, petStruct.NPCID, petStruct.BindType, petStruct.AIMode, petStruct.PetIndex,
    #                      rolePet.GetBattleValEx5(), rolePet.GetGrade(), rolePet.GetQualityLV()))
    #                      rolePet.GetGrade(), rolePet.GetQualityLV()))
    petControl = NPCCommon.NPCControl(rolePet)
    petControl.RefreshNPCState(canSyncClient=False)
    #GameWorld.DebugLog("刷后: petID=%s,playerID=%s,npcID=%s,BindType=%s,AIMode=%s,PetIndex=%s,petFinalHurtPer=%s,grade=%s,qualLV=%s,"
    #GameWorld.DebugLog("刷后: petID=%s,playerID=%s,npcID=%s,BindType=%s,AIMode=%s,PetIndex=%s,grade=%s,qualLV=%s,"
    #                   % (petStruct.PetID, petStruct.PlayerID, petStruct.NPCID, petStruct.BindType, petStruct.AIMode, petStruct.PetIndex,
    #                      rolePet.GetBattleValEx5(), rolePet.GetGrade(), rolePet.GetQualityLV()))
    #                      rolePet.GetGrade(), rolePet.GetQualityLV()))
    
    #当前血量(不通知)
    PetControl.SetPetHP(rolePet, rolePet.GetMaxHP(), False)
    
    #---通知客户端---
    rolePet.Sync_PetInfo()
    #rolePet.Sync_PetInfo()
    #刷新技能栏
    rolePet.Sync_SkillList()