From 88a9eda1278acaa0b0f66b35e2319d59a3e38eca Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 29 八月 2025 16:03:35 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(修复主线战斗中重登时会自动重新开始战斗bug;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
index b54abb1..150d32d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
@@ -589,13 +589,15 @@
     
     def __init__(self):
         self.tfGUID = "" # 所属的某场回合战斗的guid
+        self.ownerID = 0 # 所属玩家ID,可能为0,0代表非玩家的战斗实体
         self.objID = 0
         self.objName = ""
         self.npcID = 0
-        self.ownerID = 0 # 所属玩家ID,可能为0,0代表非玩家的战斗实体
         self.heroID = 0
         self.skinID = 0
+        self.country = 0
         self.atkDistType = 0
+        self.sex = 0
         self.lv = 1
         self.fightPower = 0
         self.faction = 0 # 所属阵营,一般只有双方阵营, 1 或 2,发起方默认1
@@ -655,18 +657,22 @@
     def GetTFGUID(self): return self.tfGUID # 所属的某场战斗
     def SetTFGUID(self, tfGUID): self.tfGUID = tfGUID
     def GetTurnFight(self): return TurnAttack.GetTurnFightMgr().getTurnFight(self.tfGUID)
+    def GetOwnerID(self): return self.ownerID # 如果是玩家战斗单位,则该值非0,为所属玩家ID
+    def SetOwnerID(self, ownerID): self.ownerID = ownerID
     def GetID(self): return self.objID
     def GetName(self): return self.objName
     def SetName(self, name): self.objName = name
+    def GetCountry(self): return self.country
+    def SetCountry(self, country): self.country = country
     def GetAtkDistType(self): return self.atkDistType
     def SetAtkDistType(self, atkDistType): self.atkDistType = atkDistType
+    def GetSex(self): return self.sex
+    def SetSex(self, sex): self.sex = sex
     def GetNPCID(self): return self.npcID # 如果是NPC战斗单位,则该值非0
     def SetNPCID(self, npcID): self.npcID = npcID # 设置所属的NPCID
-    def GetOwnerID(self): return self.ownerID # 如果是玩家战斗单位,则该值非0,为所属玩家ID
-    def GetHeroID(self): return self.heroID # 仅玩家有值,某个武将ID
+    def GetHeroID(self): return self.heroID
     def GetSkinID(self): return self.skinID # 仅玩家有值,武将皮肤
-    def SetOwnerHero(self, ownerID, heroID, skinID): # 设置所属的玩家及武将
-        self.ownerID = ownerID
+    def SetHero(self, heroID, skinID=0): # 设置所属武将
         self.heroID = heroID
         self.skinID = skinID
     def SetLineupPos(self, posNum, lineupNum=1):

--
Gitblit v1.8.0