From 2e892e272f7aea0a7ffbae81e43731c6b20119e6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 04 八月 2025 10:46:12 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(竞技场支持进攻、防守阵容)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py
index 02e8d34..08f7962 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py
@@ -24,6 +24,7 @@
 import ChNPC
 import GameObj
 import GameWorld
+import TurnAttack
 #---------------------------------------------------------------------
 Def_FB_NPCAI_SideList = []
 #---------------------------------------------------------------------
@@ -52,8 +53,8 @@
     if atkLimit:
         return ChConfig.Type_Relation_Friend, ChConfig.Def_PASysMessage_None
     
-    attackerCampType = NPCCommon.GetFaction(attacker)
-    defenderCampType = NPCCommon.GetFaction(defender)
+    attackerCampType = GameObj.GetFaction(attacker)
+    defenderCampType = GameObj.GetFaction(defender)
     
     #不同阵营是敌人
     if attackerCampType != defenderCampType:
@@ -104,6 +105,8 @@
     
     #普通NPC
     if GameObj.GetHP(defender) <= 0:
+        if TurnAttack.SetTurnObjKilled(defender, attacker):
+            return
         if not ChNPC.OnCheckCanDie(attacker, defender, skill, tick):
             return
         #副本

--
Gitblit v1.8.0