From ab3c1e29995e5bae442a06bbd8c4ae821efe88d0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 十一月 2025 11:11:46 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（优化被动buff触发有效效果逻辑；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py | 77 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
index d140f9c..72f47e8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
@@ -24,7 +24,9 @@
import IpyGameDataPY
import FormulaControl
import PlayerPrestigeSys
+import PlayerBeauty
import PlayerFamily
+import PlayerHorse
import PlayerGubao
import PlayerHero
import PlayerHJG
@@ -65,7 +67,7 @@
self.__refreshState = 0 # 刷属性标记， 0-不需要刷新了，1-需要刷新
self.__freeLineupHeroObjs = [] # 释放的空闲对象[LineupHero, ...]
- self.lineupHeroDict = {} # 阵容武将 {posNum:LineupHero, ...}
+ self.__lineupHeroDict = {} # 刷新阵容后的武将信息 {posNum:LineupHero, ...}
self.fightPower = 0 # 阵容总战力
return
@@ -85,42 +87,41 @@
PlayerHero.Sync_Lineup(self.olPlayer.curPlayer, self.lineupID)
return
+ def IsEmpty(self): return (not self.__lineupHeroDict or not self.heroItemDict)
+
+ def GetPosNumList(self): return self.__lineupHeroDict.keys()
+
def FreeLineupHero(self):
## 释放阵容武将对象，重新计算
- for freeObj in self.lineupHeroDict.values():
+ for freeObj in self.__lineupHeroDict.values():
if freeObj not in self.__freeLineupHeroObjs:
self.__freeLineupHeroObjs.append(freeObj)
- self.lineupHeroDict = {}
+ self.__lineupHeroDict = {}
self.fightPower = 0
return
def GetLineupHero(self, posNum):
lineupHero = None
- if posNum in self.lineupHeroDict:
- lineupHero = self.lineupHeroDict[posNum]
+ if posNum in self.__lineupHeroDict:
+ lineupHero = self.__lineupHeroDict[posNum]
elif self.__freeLineupHeroObjs:
lineupHero = self.__freeLineupHeroObjs.pop(0)
lineupHero.Clear()
- self.lineupHeroDict[posNum] = lineupHero
+ self.__lineupHeroDict[posNum] = lineupHero
else:
lineupHero = LineupHero()
- self.lineupHeroDict[posNum] = lineupHero
+ self.__lineupHeroDict[posNum] = lineupHero
return lineupHero
def GetLineupHeroByID(self, heroID):
lineupHero = None
- for posNum in self.lineupHeroDict.keys():
+ for posNum in self.__lineupHeroDict.keys():
lineupHero = self.GetLineupHero(posNum)
if lineupHero.heroID == heroID:
return lineupHero
if False:
lineupHero = LineupHero()
return lineupHero
-
- def GetLineupInfo(self):
- ## 获取阵容信息，即要用到该阵容了，如战斗或者保存缓存信息等
- self.DoRefreshLineupAttr() # 取阵容时先检查
- return
def SetNeedRefreshState(self):
## 设置需要刷属性
@@ -130,15 +131,16 @@
def RefreshLineupAttr(self, refreshForce=False):
self.__refreshState = 1 # 标记要刷新
if refreshForce:
- self.DoRefreshLineupAttr()
+ self.CheckRefreshLineupAttr()
return
- def DoRefreshLineupAttr(self):
+ def CheckRefreshLineupAttr(self):
+ ## 检查刷新阵容属性
if not self.__refreshState:
return False
+ self.__refreshState = 0
doRefreshLineupAttr(self.olPlayer.curPlayer, self.olPlayer, self)
self.lineupChange = False
- self.__refreshState = 0
return True
def CheckHeroItemUpdate(self, itemIndex):
@@ -177,7 +179,8 @@
## 是否真的在线
return self.curPlayer != None
- def GetLineup(self, lineupID):
+ def GetLineup(self, lineupID, checkAttr=True):
+ # @param checkAttr: 检查刷新到最新阵容属性
lineup = None
if lineupID in self.lineupDict:
lineup = self.lineupDict[lineupID]
@@ -185,6 +188,8 @@
lineup = Lineup(self.playerID, lineupID)
self.lineupDict[lineupID] = lineup
lineup.olPlayer = self
+ if checkAttr:
+ lineup.CheckRefreshLineupAttr()
return lineup
def GetCalcAttr(self, calcIndex): return self.calcAttrDict.get(calcIndex, {})
@@ -232,7 +237,7 @@
for lineupID, lineup in self.lineupDict.items():
if not isAllLineup and lineupID != ShareDefine.Lineup_Main:
continue
- if lineup.DoRefreshLineupAttr():
+ if lineup.CheckRefreshLineupAttr():
isRefresh = True
return isRefresh
@@ -398,7 +403,7 @@
GameWorld.DebugLog("重载阵容: %s" % lineupDict, curPlayer.GetPlayerID())
for lineupID, heroItemDict in lineupDict.items():
- lineup = olPlayer.GetLineup(lineupID)
+ lineup = olPlayer.GetLineup(lineupID, False)
# 获取其他绑定该阵容的功能，如红颜、灵兽等
@@ -417,6 +422,8 @@
PlayerPrestigeSys.CalcOfficialRankAttr(curPlayer)
PlayerGubao.CalcGubaoAttr(curPlayer)
PlayerHJG.CalcHJGAttr(curPlayer)
+ PlayerHorse.CalcHorseAttr(curPlayer)
+ PlayerBeauty.CalcBeautyAttr(curPlayer)
return
def doRefreshLineupAttr(curPlayer, olPlayer, lineup):
@@ -446,6 +453,7 @@
countryHeroInfo = {} # 国家武将统计 {country:[heroID, ...], ...}
fetterHeroInfo = {} # 阵容羁绊武将统计信息 {fetterID:[heroID, ...], ...}
heroSelfAttrInfo = {} # 武将自身属性 {heroID:{attrID:value, ...}, ...}
+ heroLVAttrInfo = {} # 武将等级属性 {heroID:{attrID:value, ...}, ...}
heroStarTalentInfo = {} # 武将星级天赋属性 {heroID:{attrID:value, ...}, ...}
heroBreakAttrInfo = {} # 武将突破潜能属性 {heroID:{attrID:value, ...}, ...}
heroAwakeTalentInfo = {} # 武将觉醒天赋属性 {heroID:{attrID:value, ...}, ...}
@@ -512,6 +520,18 @@
for k, v in heroIpyData.GetBatAttrDict().items():
selfAttrDict[int(k)] = v
heroSelfAttrInfo[heroID] = selfAttrDict
+
+ # 等级属性
+ heroLVAttrDict = {}
+ heroLVIpyData = IpyGameDataPY.GetIpyGameData("HeroQualityLV", quality, heroLV)
+ if heroLVIpyData:
+ attrIDList = heroLVIpyData.GetAttrIDList()
+ attrValueList = heroLVIpyData.GetAttrValueList()
+ for aIndex in range(min(len(attrIDList), len(attrValueList))):
+ attrID = attrIDList[aIndex]
+ attrValue = attrValueList[aIndex]
+ heroLVAttrDict[attrID] = heroLVAttrDict.get(attrID, 0) + attrValue
+ heroLVAttrInfo[heroID] = heroLVAttrDict
# 突破潜能
breakAttrDict = {}
@@ -641,10 +661,13 @@
realmAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Realm)
gubaoAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Gubao)
hjgAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_HJG)
+ horseAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Horse)
+ beautyAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Beauty)
GameWorld.DebugLog(" 国家武将统计=%s" % countryHeroInfo, playerID)
GameWorld.DebugLog(" 羁绊武将统计=%s" % fetterHeroInfo, playerID)
GameWorld.DebugLog(" 武将自身属性=%s" % heroSelfAttrInfo, playerID)
+ GameWorld.DebugLog(" 武将等级属性=%s" % heroLVAttrInfo, playerID)
GameWorld.DebugLog(" 武将吞噬属性=%s" % heroStarTalentInfo, playerID)
GameWorld.DebugLog(" 武将突破潜能=%s" % heroBreakAttrInfo, playerID)
GameWorld.DebugLog(" 武将觉醒天赋=%s" % heroAwakeTalentInfo, playerID)
@@ -658,6 +681,8 @@
GameWorld.DebugLog(" 主公官职属性=%s" % realmAttrDict, playerID)
GameWorld.DebugLog(" 主公古宝属性=%s" % gubaoAttrDict, playerID)
GameWorld.DebugLog(" 主幻境阁属性=%s" % hjgAttrDict, playerID)
+ GameWorld.DebugLog(" 主公坐骑属性=%s" % horseAttrDict, playerID)
+ GameWorld.DebugLog(" 主公红颜属性=%s" % beautyAttrDict, playerID)
PlayerLV = curPlayer.GetLV()
OfficialLV = curPlayer.GetOfficialRank()
@@ -674,6 +699,7 @@
lineupHero.heroBatAttrDict = {}
lineupHero.fightPower = 0
+ heroLVAttrDict = heroLVAttrInfo.get(heroID, {})
starTalentAttrDict = heroStarTalentInfo.get(heroID, {})
breakAttrDict = heroBreakAttrInfo.get(heroID, {})
awakeTalentAttrDict = heroAwakeTalentInfo.get(heroID, {})
@@ -698,6 +724,12 @@
hjgValue = hjgAttrDict.get(attrID, 0)
hjgPer = hjgAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0
+ horseValue = horseAttrDict.get(attrID, 0)
+ horsePer = horseAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0
+
+ beautyValue = beautyAttrDict.get(attrID, 0)
+ beautyPer = beautyAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0
+
lineupInitAddPer, lineupLVAddPer, lineupBreakLVAddPer, lineupStarAddPer = 0, 0, 0, 0
if attrID in ChConfig.BaseAttrIDList:
lineupInitAddPer, lineupLVAddPer, lineupBreakLVAddPer, lineupStarAddPer = InitAddPer, LVAddPer, BreakLVAddPer, StarAddPer
@@ -711,6 +743,7 @@
lineupHaloValue, lineupHaloPer = lineupHaloAttrInfo.get(attrID, 0), 0
fetterValue, fetterPer = fetterAttrDict.get(attrID, 0), 0
+ heroLVValue, heroLVPer = heroLVAttrDict.get(attrID, 0), 0
starTalentValue, starTalentPer = starTalentAttrDict.get(attrID, 0), 0
breakLVValue, breakLVPer = breakAttrDict.get(attrID, 0), 0
awakeTalentValue, awakeTalentPer = awakeTalentAttrDict.get(attrID, 0), 0
@@ -718,15 +751,17 @@
heroSelfPer = selfAttrDict.get(attrPerID, 0) / 10000.0
lineupHaloPer = lineupHaloAttrInfo.get(attrPerID, 0) / 10000.0
fetterPer = fetterAttrDict.get(attrPerID, 0) / 10000.0
+ heroLVPer = heroLVAttrDict.get(attrPerID, 0) / 10000.0
starTalentPer = starTalentAttrDict.get(attrPerID, 0) / 10000.0
breakLVPer = breakAttrDict.get(attrPerID, 0) / 10000.0
awakeTalentPer = awakeTalentAttrDict.get(attrPerID, 0) / 10000.0
# 计算
attrParamDict = {"lvValue":lvValue, "equipValue":equipValue, "bookValue":bookValue, "bookPer":bookPer, "realmValue":realmValue, "realmPer":realmPer,
- "gubaoValue":gubaoValue, "gubaoPer":gubaoPer, "hjgValue":hjgValue, "hjgPer":hjgPer,
+ "gubaoValue":gubaoValue, "gubaoPer":gubaoPer, "hjgValue":hjgValue, "hjgPer":hjgPer, "horseValue":horseValue, "horsePer":horsePer,
+ "beautyValue":beautyValue, "beautyPer":beautyPer,
"lineupInitAddPer":lineupInitAddPer, "lineupLVAddPer":lineupLVAddPer, "lineupBreakLVAddPer":lineupBreakLVAddPer, "lineupStarAddPer":lineupStarAddPer,
- "heroSelfValue":heroSelfValue, "heroSelfPer":heroSelfPer, "inheritPer":inheritPer,
+ "heroSelfValue":heroSelfValue, "heroSelfPer":heroSelfPer, "inheritPer":inheritPer, "heroLVValue":heroLVValue, "heroLVPer":heroLVPer,
"lineupHaloValue":lineupHaloValue, "lineupHaloPer":lineupHaloPer, "fetterValue":fetterValue, "fetterPer":fetterPer,
"starTalentValue":starTalentValue, "starTalentPer":starTalentPer, "breakLVValue":breakLVValue, "breakLVPer":breakLVPer,
"awakeTalentValue":awakeTalentValue, "awakeTalentPer":awakeTalentPer,
--
Gitblit v1.8.0