From 985bdf70fd0022733f75bf2106e69c6de77c26b1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十一月 2025 17:29:51 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(卑弥呼所有技能;技能表增加字段Buff保留-BuffRetain,支持死亡保留、复活保留;增加触发方式42-大回合开始时(死亡后有效);增加属性ID 73复活生命加成、74复活怒气加成;优化效果6014-支持失败次数额外概率;优化死亡、复活时的buff处理;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 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 da07209..7abef51 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -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)
             

--
Gitblit v1.8.0