From e81315f997d75f900727af1c456c32277575fb24 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 10 七月 2025 17:01:18 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(主线掉落战利品、装备;主线击杀怪物获得经验、升级;主线装备穿戴、分解;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py |   42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 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 6069518..cc94e04 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -339,6 +339,8 @@
         return False
         
     DoLogic_AttackResult(attacker, defender, useSkill, tick)
+    
+    TurnAttack.OnTurnfightAttackResult(attacker, defender, useSkill)
     return True
 
 #---------------------------------------------------------------------
@@ -664,7 +666,7 @@
     
     OnHurtTypeTriggerPassiveSkill(attacker, defender, curSkill, tick)
     DoLogic_AttackResult(attacker, defender, curSkill, tick)
-    
+    TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
     return True
 
 
@@ -875,8 +877,9 @@
             continue
 
         DoLogic_AttackResult(attacker, defObj, curSkill, tick)
-
-
+        
+    TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
+    return
 
 ## 执行群攻攻击
 #  @param attacker 攻击者实例
@@ -1820,19 +1823,19 @@
     #===========================================================================
     
     #----------扣XP点
-    if SkillCommon.isXPSkill(curSkill):
-        GameObj.SetXP(curObj, 0)
-
+    #if SkillCommon.isXPSkill(curSkill):
+    #    GameObj.SetXP(curObj, 0)
+        
     #----------扣HP点
-    lostHPValue = curSkill.GetHP()
-    curPlayerHP = GameObj.GetHP(curObj)
-    
-    if curPlayerHP < lostHPValue:
-        GameWorld.ErrLog('释放技能 = %s异常, HP点 = %s不足 = %s' % (
-                            curSkill.GetSkillTypeID(), curPlayerHP, lostHPValue))
-    
-    if lostHPValue > 0:
-        GameObj.SetHP(curObj, GameObj.GetHP(curObj) - lostHPValue)
+    #lostHPValue = curSkill.GetHP()
+    #curPlayerHP = GameObj.GetHP(curObj)
+    #
+    #if curPlayerHP < lostHPValue:
+    #    GameWorld.ErrLog('释放技能 = %s异常, HP点 = %s不足 = %s' % (
+    #                        curSkill.GetSkillTypeID(), curPlayerHP, lostHPValue))
+    #
+    #if lostHPValue > 0:
+    #    GameObj.SetHP(curObj, GameObj.GetHP(curObj) - lostHPValue)
         
     return
 
@@ -1879,6 +1882,8 @@
     #通知客户端攻击结果
     __Sync_AttackResult(curNPC, target, curSkill)
     
+    TurnAttack.OnTurnfightAttackSuccess(curNPC, target, curSkill)
+    
     #技能使用成功
     if curSkill:
         skillTypeID = curSkill.GetSkillTypeID()
@@ -1922,9 +1927,7 @@
         if curPlayer != None and GameObj.GetHP(curPlayer) > 0:
             if curSkill == None or curSkill.GetSkillType() not in ChConfig.Def_NoBattleState_List: 
                 AttackCommon.SetPlayerBattleState(curPlayer, tick)
-    
-    FBLogic.DoOverNPCAttackSuccess(curNPC, target, tick)
-    
+                
     # 灵为玩家的替身需要走此逻辑
     UseSkillOver(curNPC, target, curSkill, tick)
     return True
@@ -2667,7 +2670,8 @@
             continue
 
         DoLogic_AttackResult(attacker, defObj, curSkill, tick)
-
+        
+    TurnAttack.OnTurnfightAttackResult(attacker, None, curSkill)
     return True
     
     

--
Gitblit v1.8.0