From 828ac10fd533a60f7f2da90a526e42490cd8537f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 22 十月 2025 11:37:52 +0800
Subject: [PATCH] 16 卡牌服务端(删除反外挂验证)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py |   46 ++++++++++++++++++++++------------------------
 1 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
index cc94e04..7abef51 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -340,7 +340,7 @@
         
     DoLogic_AttackResult(attacker, defender, useSkill, tick)
     
-    TurnAttack.OnTurnfightAttackResult(attacker, defender, useSkill)
+    #TurnAttack.OnTurnfightAttackResult(attacker, defender, useSkill)
     return True
 
 #---------------------------------------------------------------------
@@ -666,7 +666,7 @@
     
     OnHurtTypeTriggerPassiveSkill(attacker, defender, curSkill, tick)
     DoLogic_AttackResult(attacker, defender, curSkill, tick)
-    TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
+    #TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
     return True
 
 
@@ -878,7 +878,7 @@
 
         DoLogic_AttackResult(attacker, defObj, curSkill, tick)
         
-    TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
+    #TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
     return
 
 ## 执行群攻攻击
@@ -984,22 +984,20 @@
         if not curTag:
             continue
         
-        #非自定义场景才需要判断
-        if not attacker.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
-            if curSkillUseTag == ChConfig.Def_UseSkillTag_CanAttackNPC:
-                if NPCCommon.GetNpcObjOwnerIsPlayer(curTag):
-                    #npc主人是玩家不能攻击
-                    continue
-            
-            if GameWorld.GetDist(curTag.GetPosX(), curTag.GetPosY(), attacker.GetPosX(), attacker.GetPosY()) > attacker.GetSight():
-                # 最远距离防范
-                GameWorld.DebugLog("#--- 最远距离防范[%s-%s]"%(attacker.GetID(), curTag.GetID()))
+        if curSkillUseTag == ChConfig.Def_UseSkillTag_CanAttackNPC:
+            if NPCCommon.GetNpcObjOwnerIsPlayer(curTag):
+                #npc主人是玩家不能攻击
                 continue
-            
-            if CheckFunc != None:
-                #检查是否受影响
-                if not CheckFunc(attacker, curTag, curSkill, tick):
-                    continue
+        
+        if GameWorld.GetDist(curTag.GetPosX(), curTag.GetPosY(), attacker.GetPosX(), attacker.GetPosY()) > attacker.GetSight():
+            # 最远距离防范
+            GameWorld.DebugLog("#--- 最远距离防范[%s-%s]"%(attacker.GetID(), curTag.GetID()))
+            continue
+        
+        if CheckFunc != None:
+            #检查是否受影响
+            if not CheckFunc(attacker, curTag, curSkill, tick):
+                continue
         
         resultList.append(curTag)
             
@@ -1676,7 +1674,7 @@
                          curSkill.GetFuncType() in [ChConfig.Def_SkillFuncType_FbSkill,
                                                     ChConfig.Def_SkillFuncType_PetSkill,
                                                     ChConfig.Def_SkillFuncType_NormalAttack,
-                                                    ChConfig.Def_SkillFuncType_TurnNormaAttack]):
+                                                    ChConfig.Def_SkillFuncType_TurnNormaSkill]):
         # 攻击减层级 优先处理,因为同个技能触发buff后,会再处理层级,导致立即减层级
         PassiveBuffEffMng.OnPassiveBuffTrigger(attacker, defender, curSkill, ChConfig.TriggerType_Buff_AttackSubLayer, tick)
     
@@ -1823,7 +1821,7 @@
     #===========================================================================
     
     #----------扣XP点
-    #if SkillCommon.isXPSkill(curSkill):
+    #if SkillCommon.isAngerSkill(curSkill):
     #    GameObj.SetXP(curObj, 0)
         
     #----------扣HP点
@@ -1882,7 +1880,7 @@
     #通知客户端攻击结果
     __Sync_AttackResult(curNPC, target, curSkill)
     
-    TurnAttack.OnTurnfightAttackSuccess(curNPC, target, curSkill)
+    #TurnAttack.OnTurnfightAttackSuccess(curNPC, target, curSkill)
     
     #技能使用成功
     if curSkill:
@@ -2671,7 +2669,7 @@
 
         DoLogic_AttackResult(attacker, defObj, curSkill, tick)
         
-    TurnAttack.OnTurnfightAttackResult(attacker, None, curSkill)
+    #TurnAttack.OnTurnfightAttackResult(attacker, None, curSkill)
     return True
     
     
@@ -2781,7 +2779,7 @@
     sendPack.ValueEx = curHurt.GetHurtHPEx()
     sendPack.RemainHP = curHurt.GetCurHP()
     sendPack.RemainHPEx = curHurt.GetCurHPEx()
-    turnFight = TurnAttack.GetTurnFightMgr().getNPCTurnFight(attacker.GetID())
+    turnFight = TurnAttack.GetTurnFightMgr().getTurnFight(attacker.GetTFGUID())
     if turnFight:
         turnFight.addBatPack(sendPack)
         return
@@ -2797,7 +2795,7 @@
     # m_LastBattleTick = GetGameWorldManager()->GetTick();
     #===========================================================================
     
-    turnFight = TurnAttack.GetTurnFightMgr().getNPCTurnFight(attacker.GetID())
+    turnFight = TurnAttack.GetTurnFightMgr().getTurnFight(attacker.GetTFGUID())
     if turnFight:
         sendPack = ChNetSendPack.tagUseSkillAttack()
         sendPack.ObjID = attacker.GetID()

--
Gitblit v1.8.0