From 1cbdeae386bdfab0b9e996ffb4df0301ce19ff9e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 01 九月 2025 10:48:01 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（修复主线战斗击杀无法结算经验、掉落bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py | 75 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 12 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 9552131..bbb2c04 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
@@ -16,6 +16,7 @@
#"""Version = 2025-07-02 17:30"""
#-------------------------------------------------------------------------------
+import BattleObj
import TurnAttack
import PyGameData
import ShareDefine
@@ -56,6 +57,7 @@
self.olPlayer = None
self.shapeType = 0
self.heroItemDict = {} # 阵容武将背包索引信息 {itemIndex:posNum, ...}
+ self.lineupChange = False # 是否已变更阵容标记，在刷新属性后重置标记
self.__refreshState = 0 # 刷属性标记， 0-不需要刷新了，1-需要刷新
self.__freeLineupHeroObjs = [] # 释放的空闲对象[LineupHero, ...]
@@ -63,17 +65,19 @@
self.fightPower = 0 # 阵容总战力
return
- def UpdLineup(self, heroItemDict, shapeType=0, refreshForce=False, syncLineup=True):
+ def UpdLineup(self, heroItemDict, shapeType=0, refreshForce=False, isReload=False):
'''变更阵容时更新
@param heroItemDict: 武将背包索引信息 {itemIndex:posNum, ...}
@param shapeType: 阵型
@param refreshForce: 是否强制刷属性
'''
+ if not isReload: # 非重读阵容的视为变更
+ self.lineupChange = True
self.shapeType = shapeType
self.heroItemDict = heroItemDict
GameWorld.DebugLog("更新阵容: lineupID=%s,%s" % (self.lineupID, heroItemDict), self.playerID)
self.RefreshLineupAttr(refreshForce)
- if syncLineup and self.olPlayer.curPlayer:
+ if not isReload and self.olPlayer.curPlayer:
PlayerHero.Sync_Lineup(self.olPlayer.curPlayer, self.lineupID)
return
@@ -129,6 +133,7 @@
if not self.__refreshState:
return False
doRefreshLineupAttr(self.olPlayer.curPlayer, self.olPlayer, self)
+ self.lineupChange = False
self.__refreshState = 0
return True
@@ -154,7 +159,7 @@
return
def OnClear(self):
- self.mainFight.turnFight.clearFight()
+ self.mainFight.turnFight.exitFight()
return
def SetPlayer(self, curPlayer):
@@ -387,7 +392,7 @@
# 获取其他绑定该阵容的功能，如红颜、灵兽等
shapeType = lineShapeTypeDict.get(lineupID, 0)
- lineup.UpdLineup(heroItemDict, shapeType, syncLineup=False)
+ lineup.UpdLineup(heroItemDict, shapeType, isReload=True)
PlayerHero.Sync_Lineup(curPlayer)
return
@@ -510,9 +515,9 @@
# 突破潜能
breakAttrDict = {}
- awakeIpyDataList = IpyGameDataPY.GetIpyGameDataList("HeroBreak", heroID)
- if awakeIpyDataList:
- for breakIpyData in awakeIpyDataList:
+ breakIpyDataList = IpyGameDataPY.GetIpyGameDataList("HeroBreak", heroID)
+ if breakIpyDataList:
+ for breakIpyData in breakIpyDataList:
if breakIpyData.GetBreakLV() > breakLV:
break
attrIDList = breakIpyData.GetAttrIDList()
@@ -610,6 +615,7 @@
baseAttrFormula = IpyGameDataPY.GetFuncCfg("HeroAttrFormula", 1)
otherAttrFormula = IpyGameDataPY.GetFuncCfg("HeroAttrFormula", 2)
fightPowerFormula = IpyGameDataPY.GetFuncCfg("HeroAttrFormula", 3)
+ skillFPFormula = IpyGameDataPY.GetFuncCfg("HeroAttrFormula", 4)
lvAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_LV)
equipAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_MainEquip)
@@ -628,6 +634,12 @@
GameWorld.DebugLog(" 主公等级属性=%s" % lvAttrDict, playerID)
GameWorld.DebugLog(" 主公装备属性=%s" % equipAttrDict, playerID)
GameWorld.DebugLog(" 主公图鉴属性=%s" % bookAttrDict, playerID)
+
+ PlayerLV = curPlayer.GetLV()
+ OfficialLV = curPlayer.GetOfficialRank()
+ GameWorld.DebugLog(" PlayerLV=%s,OfficialLV=%s" % (PlayerLV, OfficialLV), playerID)
+
+ fpRatioIpyData = IpyGameDataPY.GetIpyGameData("FightPowerRatio", OfficialLV)
lineupFightPower = 0 # 阵容总战力
InitAddPer, LVAddPer, BreakLVAddPer, StarAddPer = InitAddPer / 10000.0, LVAddPer / 10000.0, BreakLVAddPer / 10000.0, StarAddPer / 10000.0
@@ -694,15 +706,20 @@
attrIpyData = IpyGameDataPY.GetIpyGameData("PlayerAttr", attrID)
attrName = attrIpyData.GetParameter() if attrIpyData else "%s" % attrID
+ attrRatioName = "%sRatio" % attrName
+ ratioValue = 0
+ if attrValue and hasattr(fpRatioIpyData, "Get%s" % attrRatioName):
+ ratioValue = getattr(fpRatioIpyData, "Get%s" % attrRatioName)()
fightPowerParamDict[attrName] = attrValue
+ fightPowerParamDict[attrRatioName] = ratioValue
if attrValue:
lineupHero.heroBatAttrDict[attrID] = attrValue
logAttrDict["%s-%s" % (attrID, attrName)] = attrValue
-
+
# 计算战力
fightPower = FormulaControl.Eval("fightPowerFormula", fightPowerFormula, fightPowerParamDict)
- GameWorld.DebugLog(" fightPower=%s,heroSkillIDList=%s" % (fightPower, lineupHero.heroSkillIDList))
+ GameWorld.DebugLog(" heroID=%s,fightPower=%s,heroSkillIDList=%s" % (heroID, fightPower, lineupHero.heroSkillIDList), playerID)
skillTypeIDDict = {}
for skillID in lineupHero.heroSkillIDList:
skillData = IpyGameDataPY.GetIpyGameData("Skill", skillID)
@@ -723,8 +740,10 @@
for skillData in skillTypeIDDict.values():
skillID = skillData.GetSkillID()
lineupHero.heroSkillIDList.append(skillID)
- skillFightPower += skillData.GetFightPower()
- GameWorld.DebugLog(" skillFightPower=%s,heroSkillIDList=%s" % (skillFightPower, lineupHero.heroSkillIDList))
+ paramDict = {"SkillPower":skillData.GetFightPower(), "PlayerLV":PlayerLV, "OfficialLV":OfficialLV}
+ sFightPower = FormulaControl.Eval("skillFPFormula", skillFPFormula, paramDict)
+ skillFightPower += sFightPower
+ GameWorld.DebugLog(" skillFightPower=%s,heroSkillIDList=%s" % (skillFightPower, lineupHero.heroSkillIDList), playerID)
# 最终战力
fightPowerTotal = fightPower + skillFightPower
@@ -738,10 +757,42 @@
lineup.fightPower = lineupFightPower
GameWorld.DebugLog(" 阵容最终战力: lineupID=%s,lineupFightPower=%s" % (lineupID, lineupFightPower), playerID)
- # 更新排行榜
+ # 非主线阵容不处理以下内容
if lineupID != ShareDefine.Lineup_Main:
return
PlayerControl.SetFightPower(curPlayer, lineupFightPower)
+ mainFightMgr = TurnAttack.GetMainFightMgr(curPlayer)
+ mainTurnFight = mainFightMgr.turnFight
+ # 主线战斗如果有在战斗中，实时更新
+ if mainTurnFight and mainTurnFight.isInFight():
+ # 如果是阵容变化的，重新开始战斗
+ if lineup.lineupChange:
+ GameWorld.DebugLog("主阵容变化，重新开始战斗", playerID)
+ if mainTurnFight.mapID == ChConfig.Def_FBMapID_Main:
+ TurnAttack.__doMainLevelWave(curPlayer, True)
+ elif mainTurnFight.mapID == ChConfig.Def_FBMapID_MainBoss:
+ TurnAttack.__doMainBossStart(curPlayer)
+
+ # 否则只重新设置战斗属性
+ else:
+ GameWorld.DebugLog("主阵容卡牌属性变更，更新战斗武将属性", playerID)
+ # lineup 为卡牌的阵容，仅有阵容属性相关，没有战斗对象
+ # batLineup 为卡牌阵容体现到具体战斗的战斗阵容，有具体的战斗对象
+ faction, num = ChConfig.Def_FactionA, 1 # 主线战斗玩家自己默认阵营A的第1个战斗阵容
+ batLineup = mainTurnFight.getBatFaction(faction).getBatlineup(num)
+ batObjMgr = BattleObj.GetBatObjMgr()
+ for posNum, objID in batLineup.posObjIDDict.items():
+ batObj = batObjMgr.getBatObj(objID)
+ if not batObj:
+ continue
+ lineupHero = lineup.GetLineupHero(posNum)
+ if lineupHero.heroBatAttrDict:
+ batObj.UpdInitBatAttr(lineupHero.heroBatAttrDict, lineupHero.heroSkillIDList)
+ else:
+ GameWorld.DebugLog("主阵容没有在战斗中，不需要处理", playerID)
+
+ # 更新排行榜
+
return
--
Gitblit v1.8.0