From ecec2bde4584f578e822e614548e3ceec830cfef Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 23 十二月 2025 16:04:59 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（修复吕玲绮队友死亡触发怒技回合受限无效bug；7009效果支持纯被动效果技能；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py | 95 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 23 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 8bcaf33..7b0a141 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -138,6 +138,11 @@
deadCnt += 1
return deadCnt
+ def getHeroObj(self, heroID):
+ if heroID not in self.heroObjIDDict:
+ return
+ return BattleObj.GetBatObjMgr().getBatObj(self.heroObjIDDict[heroID])
+
class BatFaction():
## 战斗阵营
@@ -1186,15 +1191,18 @@
isMultiMap = True
if isMultiMap:
- CrossServerPackLogic.SendToBattleServer(ShareDefine.SSMsg_BattleRequest, reqInfo, reqPlayerID)
+ CrossServerPackLogic.SendBattleRequest(reqInfo, guid, mapID, funcLineID, reqPlayerID)
else:
SSMsg_BattleRequest(reqInfo, fromServerID)
return
-def SSMsg_BattleRequest(reqInfo, fromServerID):
+def SSMsg_BattleRequest(reqInfo, fromServerID, msgType=""):
## 请求执行战斗，由本地图或其他服务器地图分配过来的战斗请求
guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, npcLineupIDList, strongerLV, difficulty, reqData = reqInfo
-
+ if msgType:
+ GameWorld.Log("OnServerReceiveMsg => %s, fromServerID=%s,funcMapID=%s,funcLineID=%s,%s,%s"
+ % (msgType, fromServerID, mapID, funcLineID, guid, time.time()), reqPlayerID)
+
if npcLineupIDList:
turnFight = DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, playerServerID, lineupDictA, npcLineupIDList, strongerLV, difficulty)
else:
@@ -1216,14 +1224,17 @@
# 其他服务器地图请求的，发送战斗结果回去
else:
- CrossServerPackLogic.SendToServer(ShareDefine.SSMsg_BattleResult, retInfo, [fromServerID], playerID=reqPlayerID)
+ CrossServerPackLogic.SendBattleResult(retInfo, fromServerID, guid, mapID, funcLineID, reqPlayerID)
return
-def SSMsg_BattleResult(retInfo, fromServerID):
+def SSMsg_BattleResult(retInfo, fromServerID, msgType=""):
## 收到战斗结果信息
guid, mapID, funcLineID, reqPlayerID, winFaction, statMsg, dateStr, reqData = retInfo
-
+ if msgType:
+ GameWorld.Log("OnServerReceiveMsg => %s, fromServerID=%s,funcMapID=%s,funcLineID=%s,%s,%s"
+ % (msgType, fromServerID, mapID, funcLineID, guid, time.time()), reqPlayerID)
+
curPlayer = None
if reqPlayerID:
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(reqPlayerID)
@@ -1705,7 +1716,7 @@
batObj.SetTiming(ChConfig.TurnTiming_Before) # 重置时机到回合前
if turnNum > 1: # 第1回合不用刷新技能
RefreshObjSkillByBigTurn(batObj)
- RefreshObjByBigTurn(turnFight, batObj)
+ RefreshObjByBigTurn(turnFight, batObj, turnNum)
batObj.ResetBigTurn() # 每大回合重置
if not batObj.IsAlive():
@@ -1807,7 +1818,7 @@
GameWorld.DebugLogEx(" 更新技能CD: curID=%s,skillID=%s,remainTime=%s", curID, skillID, remainTime)
return
-def RefreshObjByBigTurn(turnFight, batObj):
+def RefreshObjByBigTurn(turnFight, batObj, turnNum):
## 根据大回合开始刷新buff持续时间，每个大回合-1，第1回合不处理
curID = batObj.GetID()
buffMgr = batObj.GetBuffManager()
@@ -1816,20 +1827,41 @@
buffID = buff.GetBuffID()
skillID = buff.GetSkillID()
skillData = buff.GetSkillData()
- if skillData.GetLastTimeType() != ChConfig.BuffLastTimeType_BigTurn:
+ lastType = skillData.GetLastTimeType()
+
+ if lastType not in [ChConfig.BuffLastTimeType_BigTurn, ChConfig.BuffLastTimeType_BigTurnLayer, ChConfig.BuffLastTimeType_BigTurnLimit]:
continue
+
if skillData.GetSkillType() in ChConfig.Def_LstBuff_List:
#GameWorld.DebugLogEx(" 持续类buff由触发时机决定剩余时间! curID=%s,index=%s,skillID=%s,buffID=%s", curID, index, skillID, buffID)
continue
if skillData.GetSkillType() == ChConfig.Def_SkillType_Halo and buff.GetOwnerID() != curID:
GameWorld.DebugLogEx(" 光环buff非光源不处理! curID=%s,index=%s,skillID=%s,buffID=%s", curID, index, skillID, buffID)
continue
- remainTime = buff.GetRemainTime()
- if remainTime <= 0:
- continue
- remainTime -= 1
- GameWorld.DebugLogEx(" 更新buff回合: curID=%s,buffID=%s,skillID=%s,remainTime=%s", curID, buffID, skillID, remainTime)
- TurnBuff.SetBuffRemainTime(turnFight, batObj, buff, remainTime)
+
+ # 每大回合固定减1回合
+ if lastType in [ChConfig.BuffLastTimeType_BigTurn, ChConfig.BuffLastTimeType_BigTurnLimit]:
+ remainTime = buff.GetRemainTime()
+ if remainTime <= 0:
+ continue
+ remainTime -= 1
+ GameWorld.DebugLogEx(" 更新buff回合: curID=%s,buffID=%s,skillID=%s,remainTime=%s", curID, buffID, skillID, remainTime)
+ if lastType == ChConfig.BuffLastTimeType_BigTurnLimit and remainTime > 0:
+ lastTurnMax = skillData.GetLastTime()
+ if lastTurnMax and turnNum > lastTurnMax:
+ remainTime = 0
+ GameWorld.DebugLogEx(" 超过最大限制回合数，强制清除!: curID=%s,buffID=%s,skillID=%s,remainTime=%s", curID, buffID, skillID, remainTime)
+ TurnBuff.SetBuffRemainTime(turnFight, batObj, buff, remainTime)
+
+ # 每大回合固定减1层
+ elif skillData.GetLastTimeType() == ChConfig.BuffLastTimeType_BigTurnLayer:
+ curLayer = buff.GetLayer()
+ if curLayer <= 0:
+ continue
+ updLayer = curLayer - 1
+ GameWorld.DebugLogEx(" 更新buff层级: curID=%s,buffID=%s,skillID=%s,updLayer=%s", curID, buffID, skillID, updLayer)
+ TurnBuff.DoBuffLayerChange(turnFight, batObj, buff, updLayer)
+
return
def RefreshObjBuffTime(turnFight, batObj):
@@ -1841,6 +1873,8 @@
buffMgr = batObj.GetBuffManager()
for index in range(buffMgr.GetBuffCount())[::-1]:
buff = buffMgr.GetBuffByIndex(index)
+ if not buff: # 有出现过报错，先做下防范，理论上不太可能
+ continue
buffID = buff.GetBuffID()
skillID = buff.GetSkillID()
skillData = buff.GetSkillData()
@@ -1978,6 +2012,19 @@
break
TurnPassive.OnTriggerPassiveEffect(turnFight, curBatObj, ChConfig.TriggerWay_HeroActionEnd)
+ batObjMgr = BattleObj.GetBatObjMgr()
+ for faction in [ChConfig.Def_FactionA, ChConfig.Def_FactionB]:
+ batFaction = turnFight.getBatFaction(faction)
+ for lineupNum in batFaction.lineupDict.keys():
+ batLineup = batFaction.getBatlineup(lineupNum)
+ for lineupObjID in batLineup.posObjIDDict.values():
+ lineupObj = batObjMgr.getBatObj(lineupObjID)
+ if not lineupObj.IsAlive():
+ continue
+ if lineupObj.GetFaction() != curBatObj.GetFaction():
+ TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_EnemyAction, curBatObj)
+ else:
+ TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_FriendAction, curBatObj)
return True
def SetObjKilled(turnFight, gameObj, killer=None, useSkill=None):
@@ -1993,7 +2040,7 @@
killerObjID = killer.GetID() if killer else 0
skillID = useSkill.GetSkillID() if useSkill else 0
GameWorld.DebugLogEx(" %s 回合战斗主体被击杀: curID=%s,killerObjID=%s,skillID=%s", GetObjName(gameObj), objID, killerObjID, skillID)
- gameObj.SetDead()
+ gameObj.SetDead(killer)
TurnBuff.DoBuffByDead(turnFight, gameObj)
clientPack = ChPyNetSendPack.tagMCTurnFightObjDead()
@@ -2146,13 +2193,15 @@
if not os.path.exists(ReportDir):
os.makedirs(ReportDir)
else:
- items = os.listdir(ReportDir)
- for item in items:
- fullPath = os.path.join(ReportDir, item)
- try:
- os.remove(fullPath)
- except:
- pass
+ isSaveOne = IpyGameDataPY.GetFuncCfg("TurnFightProcess", 2) # 个人战报是否只保留1份
+ if isSaveOne:
+ items = os.listdir(ReportDir)
+ for item in items:
+ fullPath = os.path.join(ReportDir, item)
+ try:
+ os.remove(fullPath)
+ except:
+ pass
saveFilePath = os.path.join(ReportDir, "%s.tfr" % guid)
GameWorld.DebugLogEx("战报路径=%s", saveFilePath)
--
Gitblit v1.8.0