From fe8c81862cdb384d196ea075395e90f1b990a342 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 13 五月 2024 17:34:49 +0800
Subject: [PATCH] 10019 【砍树】回合战斗(回合战斗Msg补发玩家ModelMark信息)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
index e9115b2..b837393 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -200,7 +200,7 @@
 
 def GetPlayerFactionInfoByCache(playerID):
     ## 根据玩家缓存数据获取对阵玩家阵营信息字典
-    _, PlusDict = PlayerViewCacheTube.GetPlayerPropPlusDictByID(playerID, True) # 从缓存中获取,强刷一次最新属性
+    PropDict, PlusDict = PlayerViewCacheTube.GetPlayerPropPlusDictByID(playerID, True) # 从缓存中获取,强刷一次最新属性
     skillIDList = []
     SkillInfo = PlusDict.get("SkillInfo", {})
     for _, skillLVDict in SkillInfo.items():
@@ -210,7 +210,7 @@
             if not skillData:
                 continue
             skillIDList.append(skillID)
-    return {"playerID":playerID, "pet":PlusDict.get("Pet"), "skillIDList":skillIDList}
+    return {"playerID":playerID, "pet":PlusDict.get("Pet"), "skillIDList":skillIDList, "ModelMark":PropDict.get("ModelMark", 0)}
 
 def ProcessAutoTurnFight(mapID, funcLineID, tagType, tagID, factionInfoA, factionInfoB, tick, syncPlayer=None, isSavePlayback=False):
     ''' 处理自动回合战斗过程,仅做战斗流程处理,不做及其他功能逻辑
@@ -393,6 +393,7 @@
         npcID = ChConfig.Def_NPCID_PVP
         mainObj = NPCCommon.SummonMapNpc(npcID, posX, posY, sightLevel=sightLevel, mirrorPlayerID=playerID, skillIDList=skillIDList, skillIDExList=skillIDExList)
         factionSyncInfo["playerID"] = playerID
+        factionSyncInfo["ModelMark"] = objInfo.get("ModelMark", 0)
     elif npcID:
         mainObj = NPCCommon.SummonMapNpc(npcID, posX, posY, sightLevel=sightLevel, skillIDList=skillIDList, skillIDExList=skillIDExList)
         factionSyncInfo["npcID"] = npcID

--
Gitblit v1.8.0