From abe94831e0fe835f9cc83611695a35f46ebcae7b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十一月 2025 20:34:07 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（蔡文姬所有技能；增加复活释放方式支持；增加触发方式40-在场时，41-复活时；增加效果5501、6021、7011；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 a6ac5ed..fb773af 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -1551,6 +1551,7 @@
batObj = batObjMgr.getBatObj(objID)
turnFight.ResetOneActionUseSkillCnt()
TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_FightStart)
+ TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_InBattlefield)
turnFight.enterLogic = True
return True
@@ -1915,8 +1916,12 @@
turnFight.costTime = time.time() - turnFight.startTime
winFaction = turnFight.winFaction
turnFight.isWin = (winFaction == ChConfig.Def_FactionA)
+ mapID = turnFight.mapID
+ funcLineID = turnFight.funcLineID
GameWorld.DebugLog("--- 战斗结束处理 ---, winFaction=%s, costTime=%ss, %s" % (winFaction, turnFight.costTime, guid))
-
+ if mapID != ChConfig.Def_FBMapID_Main:
+ GameWorld.Log("战斗耗时: %ss, mapID=%s,funcLineID=%s" % (turnFight.costTime, mapID, funcLineID))
+
# 统计明细
batObjMgr = BattleObj.GetBatObjMgr()
statInfo = {}
@@ -1951,8 +1956,6 @@
overMsg = {"winFaction":winFaction, "statInfo":statInfo}
curPlayer = turnFight.curPlayer
- mapID = turnFight.mapID
- funcLineID = turnFight.funcLineID
FBLogic.OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg)
--
Gitblit v1.8.0