From 5dfc9bf567fdf69a0ee8899c4966ce64b4cfe5ad Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 12 三月 2026 12:07:54 +0800
Subject: [PATCH] 547 【红颜系统】新增红颜-服务端（新增激活方式8-定军阁层；新增红颜特殊效果5-遣散/吞噬额外返还；统一A801、0320物品获得标记；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
index 1ba03a5..2891192 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
@@ -452,36 +452,31 @@
}
return robotDict
-def LoadRobot():
- ## 加载机器人缓存，在服务器启动、重读配置时加载
- robotFPSortList = []
- viewCacheMgr = DBDataMgr.GetPlayerViewCacheMgr()
- ipyDataMgr = IpyGameDataPY.IPY_Data()
- for index in range(ipyDataMgr.GetRobotCount()):
- ipyData = ipyDataMgr.GetRobotByIndex(index)
- robotPlayerID = ipyData.GetID()
- curCache = viewCacheMgr.GetPlayerViewCache(robotPlayerID)
- if not curCache:
- curCache = viewCacheMgr.AddPlayerViewCache(robotPlayerID)
- if not curCache:
- continue
- UpdRobotViewCache(curCache, robotPlayerID, ipyData)
- robotFPSortList.append([curCache.GetFightPowerTotal(), robotPlayerID])
- robotFPSortList.sort(reverse=True) # 战力倒序排序
- IpyGameDataPY.SetConfigEx("robotFPSortList", robotFPSortList)
- GameWorld.Log("加载机器人战力排序: %s, %s" % (len(robotFPSortList), robotFPSortList))
- return robotFPSortList
-
-def GetRobotFightPowerSortList():
+def GetRobotFightPowerSortList(tempNum=0):
## 机器人战力倒序排序列表
# @return: 倒序排序列表 [[战力, 机器人ID], ...]，外部使用可随机修改，不会打乱原始排序
- sortList = []
- robotFPSortList = IpyGameDataPY.GetConfigEx("robotFPSortList")
+ robotFPSortList = IpyGameDataPY.GetConfigEx("robotFPSortList%s" % tempNum)
if not robotFPSortList:
- robotFPSortList = LoadRobot()
- if robotFPSortList:
- sortList += robotFPSortList
- return sortList
+ robotFPSortList = []
+ viewCacheMgr = DBDataMgr.GetPlayerViewCacheMgr()
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for index in range(ipyDataMgr.GetRobotCount()):
+ ipyData = ipyDataMgr.GetRobotByIndex(index)
+ if ipyData.GetTempNum() != tempNum:
+ continue
+ robotPlayerID = ipyData.GetID()
+ curCache = viewCacheMgr.GetPlayerViewCache(robotPlayerID)
+ if not curCache:
+ curCache = viewCacheMgr.AddPlayerViewCache(robotPlayerID)
+ if not curCache:
+ continue
+ UpdRobotViewCache(curCache, robotPlayerID, ipyData)
+ robotFPSortList.append([curCache.GetFightPowerTotal(), robotPlayerID])
+ robotFPSortList.sort(reverse=True) # 战力倒序排序
+ IpyGameDataPY.SetConfigEx("robotFPSortList%s" % tempNum, robotFPSortList)
+ GameWorld.Log("加载机器人战力排序: tempNum=%s,%s, %s" % (tempNum, len(robotFPSortList), robotFPSortList))
+
+ return robotFPSortList
def UpdRobotViewCache(curCache, robotID, robotIpyData=None):
## 更新机器人查看缓存
@@ -495,11 +490,11 @@
return
#curCache.SetAccID(dbPlayer.AccID)
-
+ realmLV = robotIpyData.GetRealmLV()
curCache.SetPlayerName(GameWorld.GbkToCode(robotIpyData.GetRobotName()))
curCache.SetLV(robotInfo.get("LV", 1))
curCache.SetJob(robotInfo.get("Job", 1))
- curCache.SetRealmLV(robotInfo.get("RealmLV", 0))
+ curCache.SetRealmLV(realmLV if realmLV else robotInfo.get("RealmLV", 0))
curCache.SetFace(robotInfo.get("Face", 0))
curCache.SetFacePic(robotInfo.get("FacePic", 0))
curCache.SetTitleID(robotInfo.get("TitleID", 0))
@@ -532,7 +527,7 @@
tagServerID = clientPack.ServerID
# 本服或主服是本服
- if not tagServerID or tagServerID == GameWorld.GetGameWorld().GetServerID():
+ if not tagServerID or tagServerID == GameWorld.GetGameWorld().GetServerID() or playerID < ShareDefine.RealPlayerIDStart:
NetPackCommon.SendFakePack(curPlayer, GetPack_ViewCache(tagPlayerID))
return
@@ -565,10 +560,15 @@
clientPack.ServerID = curCache.GetServerID()
clientPack.FightPower = curCache.GetFightPower()
clientPack.FightPowerEx = curCache.GetFightPowerEx()
- clientPack.FamilyID = curCache.GetFamilyID()
+ familyID = curCache.GetFamilyID()
+ familyDataServerID = DBDataMgr.GetFamilyMgr().GetCurCrossServerID()
+ if familyDataServerID <= 0:
+ familyDataServerID = GameWorld.GetGameWorld().GetServerID() # 公会未跨服时默认就是玩家所在服
+ clientPack.FamilyID = familyID
clientPack.FamilyName = curCache.GetFamilyName()
clientPack.FamilyEmblemID = curCache.GetFamilyEmblemID()
clientPack.FamilyEmblemWord = curCache.GetFamilyEmblemWord()
+ clientPack.FamilyDataServerID = familyDataServerID
clientPack.PlusData = curCache.GetPlusData()
clientPack.PlusDataSize = len(clientPack.PlusData)
return clientPack
--
Gitblit v1.8.0