From 30dd8ff93a00ada8262a35da0ede9c2088a7fd37 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 23 九月 2025 16:52:52 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(诸葛亮技能; 目标细分增加攻击力最高5; buff状态增加军令19;增加效果6006增加本次技能万分比验证职业;增加效果5015集火攻击军令目标;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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..da07209 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
 
 ## 执行群攻攻击
@@ -1676,7 +1676,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 +1823,7 @@
     #===========================================================================
     
     #----------扣XP点
-    #if SkillCommon.isXPSkill(curSkill):
+    #if SkillCommon.isAngerSkill(curSkill):
     #    GameObj.SetXP(curObj, 0)
         
     #----------扣HP点
@@ -1882,7 +1882,7 @@
     #通知客户端攻击结果
     __Sync_AttackResult(curNPC, target, curSkill)
     
-    TurnAttack.OnTurnfightAttackSuccess(curNPC, target, curSkill)
+    #TurnAttack.OnTurnfightAttackSuccess(curNPC, target, curSkill)
     
     #技能使用成功
     if curSkill:
@@ -2671,7 +2671,7 @@
 
         DoLogic_AttackResult(attacker, defObj, curSkill, tick)
         
-    TurnAttack.OnTurnfightAttackResult(attacker, None, curSkill)
+    #TurnAttack.OnTurnfightAttackResult(attacker, None, curSkill)
     return True
     
     
@@ -2781,7 +2781,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 +2797,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