From 2cf5365a5e409b38bba122f9bd1b0a6bd217c1c0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 03 七月 2025 17:57:30 +0800
Subject: [PATCH] 16 卡牌服务端(删除无用的GY_Query_Offline_xxx命令)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py
index 403c638..8479669 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py
@@ -33,6 +33,7 @@
 import SkillShell
 import ChNPC
 import GameObj
+import TurnAttack
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -58,7 +59,7 @@
 def GetTagRelation(curSummonNPC, curTagNormalNPC, skill, tick):
     
     #防守方阵营
-    defenderCampType = NPCCommon.GetFaction(curTagNormalNPC)
+    defenderCampType = GameObj.GetFaction(curTagNormalNPC)
     
     #玩家的召唤兽才能攻击普通NPC
     npcOwner_Player = NPCCommon.GetSummonNPCOwner(IPY_GameWorld.gotPlayer, curSummonNPC)
@@ -72,7 +73,7 @@
         return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
     
     #攻击方阵营
-    attackerCampType = curSummonNPC.GetDictByKey(ChConfig.Def_NpcDictKey_CampType)
+    attackerCampType = GameObj.GetFaction(curSummonNPC)
     if attackerCampType != defenderCampType:
         return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
     return ChConfig.Type_Relation_Friend, ChConfig.Def_PASysMessage_None
@@ -140,6 +141,9 @@
         return
 
     #---NPC被击杀---
+    if TurnAttack.SetKilled(curTagNPC):
+        return
+    
     #玩家击杀NPC副本触发器
     curPlayer = NPCCommon.GetSummonNPCOwner(IPY_GameWorld.gotPlayer, curSummonNPC)
     

--
Gitblit v1.8.0