From 867c5145e4e860ed85c8eb24b272f30729e77e34 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 15 一月 2024 21:12:47 +0800
Subject: [PATCH] 10019 【砍树】回合战斗（战斗实例全部统一使用NPC，包含玩家自己及其他玩家镜像数据；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py
index 08b1acd..c9a1e62 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py
@@ -124,16 +124,15 @@
return
#---------------------------------------------------------------------
-def CalloutFightPet(curObj, petCacheInfo=None):
- ## 出战上阵的灵宠
- # @param petCacheInfo: 玩家灵宠功能缓存信息
+def CalloutFightPet(curObj, petCacheInfo):
+ ## 召唤出战上阵的灵宠
+ # @param curObj: 灵宠所属战斗实例
+ # @param petCacheInfo: 出战灵宠信息列表，兼容灵宠功能缓存信息
# @return: [第1位置实例, 第2, ...] 按位置顺序，实例可能为None
fightPlaceCount = len(IpyGameDataPY.GetFuncEvalCfg("PetGoOutFight", 1)) # 战斗位置数
fightPetObjList = [None] * fightPlaceCount
- if petCacheInfo == None and curObj.GetGameObjType() == IPY_GameWorld.gotPlayer:
- petCacheInfo = PlayerPet.GetPetCacheInfo(curObj)
- if not petCacheInfo: # 没有灵宠
+ if not petCacheInfo:
return fightPetObjList
fightPetDict = {} # 上阵的灵宠
--
Gitblit v1.8.0