From 2ab10b7ba31f961cb09099755007500541f7c9a4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 04 七月 2025 12:18:32 +0800
Subject: [PATCH] 16 卡牌服务端(修复排行榜数据重复bug;暂去除排行榜功能开启上榜限制;)

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_SummonNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_SummonNPC.py
index c8c1aee..a2f9d9c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_SummonNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_SummonNPC.py
@@ -24,6 +24,7 @@
 import IPY_GameWorld
 import GameWorld
 import SkillShell
+import TurnAttack
 import GameObj
 #---------------------------------------------------------------------
 
@@ -55,8 +56,11 @@
         return ChConfig.Type_Relation_None , ChConfig.Def_PASysMessage_None
     
     #判断阵营
-    attackerCampType = NPCCommon.GetFaction(curNormalNPC)
-    defenderCampType = NPCCommon.GetFaction(curTagSummon)
+    attackerCampType = GameObj.GetFaction(curNormalNPC)
+    defenderCampType = GameObj.GetFaction(curTagSummon)
+    
+    if attackerCampType != defenderCampType:
+        return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
     
     #2.不攻击阵营相同(不包括二者都为中立)
     if not (attackerCampType == ChConfig.CampType_Neutral and defenderCampType == ChConfig.CampType_Neutral): 
@@ -132,6 +136,8 @@
     
     #召唤兽死亡
     if GameObj.GetHP(curTagSummonNPC) <= 0:
+        if TurnAttack.SetKilled(curTagSummonNPC):
+            return
         curTagSummonNPCControl = NPCCommon.NPCControl(curTagSummonNPC)
         #召唤兽死亡
         curTagSummonNPCControl.SetKilled()

--
Gitblit v1.8.0