From b42da850f0f8e8748b429acc3139be53b75a9589 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 09 九月 2025 16:28:56 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(上阵武将等级加成改为(等级 - 1)*LVAddPer )

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
index a5e2276..a763895 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -692,13 +692,13 @@
             TurnBuff.SyncBuffRefresh(turnFight, buffObj, buff, relatedSkillID)
             
     # 统计击杀
-    killObjIDList = [] # 击杀的目标ID列表
+    killObjList = [] # 击杀其他阵营目标列表
     for tagObj in useSkill.GetTagObjList():
         tagID = tagObj.GetID()
-        if tagObj.IsAlive() and tagObj.GetHP() <= 0:
-            killObjIDList.append(tagID)
+        if tagObj.IsAlive() and tagObj.GetHP() <= 0 and tagObj.GetFaction() != curObj.GetFaction():
+            killObjList.append(tagObj)
             TurnAttack.SetObjKilled(turnFight, tagObj, curObj, useSkill)
-    if curObj and curObj.IsAlive() and curObj.GetHP() <= 0:
+    if curObj.IsAlive() and curObj.GetHP() <= 0:
         TurnAttack.SetObjKilled(turnFight, curObj)
         
     # 统计伤血,可能单个技能对同一目标造成多次伤害
@@ -716,7 +716,7 @@
     # 结算副本相关的攻击结果,仅主动发起玩家阵容武将触发
     curPlayer = turnFight.curPlayer
     if curPlayer and curObj and curObj.GetOwnerID() == curPlayer.GetPlayerID():
-        FBLogic.OnPlayerLineupAttackResult(curPlayer, curObj, killObjIDList, useSkill, turnFight.mapID, turnFight.funcLineID)
+        FBLogic.OnPlayerLineupAttackResult(curPlayer, curObj, killObjList, useSkill, turnFight.mapID, turnFight.funcLineID)
         
     # 优先触发本技能额外效果,注:仅该技能释放后该技能的额外效果视为主技能的效果,优先级最高
     if isUseSkill:
@@ -1309,6 +1309,8 @@
     buffID = curBuff.GetBuffID()
     ownerID = curBuff.GetOwnerID()
     buffOwner = BattleObj.GetBatObjMgr().getBatObj(ownerID) # 攻击方
+    if not buffOwner:
+        return
     
     atkObj = buffOwner
     defObj = batObj

--
Gitblit v1.8.0