From 5fbb5f807ca75fa69fba14ad2563892f08b4588d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 18:28:22 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端（修复改名没有同步更新名字映射关系bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py | 46 +++++++++++++++++++++-------------------------
1 files changed, 21 insertions(+), 25 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 c5ef889..1db9771 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -29,7 +29,6 @@
import BuffSkill
import FBLogic
import SkillShell
-import PetControl
import random
import OperControlManager
import DataRecordPack
@@ -340,7 +339,7 @@
DoLogic_AttackResult(attacker, defender, useSkill, tick)
- TurnAttack.OnTurnfightAttackResult(attacker, defender, useSkill)
+ #TurnAttack.OnTurnfightAttackResult(attacker, defender, useSkill)
return True
#---------------------------------------------------------------------
@@ -666,7 +665,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 +877,7 @@
DoLogic_AttackResult(attacker, defObj, curSkill, tick)
- TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
+ #TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
return
## 执行群攻攻击
@@ -984,22 +983,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)
@@ -1247,7 +1244,6 @@
atkObjType = attacker.GetGameObjType()
atkObjID = attacker.GetID() # 攻击方ID
mapID = GameWorld.GetMap().GetMapID()
- DataRecordPack.DR_PlayerDead(atkObjType, atkObjID, defender, mapID)
return
@@ -1882,7 +1878,7 @@
#通知客户端攻击结果
__Sync_AttackResult(curNPC, target, curSkill)
- TurnAttack.OnTurnfightAttackSuccess(curNPC, target, curSkill)
+ #TurnAttack.OnTurnfightAttackSuccess(curNPC, target, curSkill)
#技能使用成功
if curSkill:
@@ -1922,7 +1918,7 @@
#宠物找到主人进入战斗状态，光环技能不进入
if curNPC.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
- curPlayer = PetControl.GetPetOwner(curNPC)
+ curPlayer = None
if curPlayer != None and GameObj.GetHP(curPlayer) > 0:
if curSkill == None or curSkill.GetSkillType() not in ChConfig.Def_NoBattleState_List:
@@ -2671,7 +2667,7 @@
DoLogic_AttackResult(attacker, defObj, curSkill, tick)
- TurnAttack.OnTurnfightAttackResult(attacker, None, curSkill)
+ #TurnAttack.OnTurnfightAttackResult(attacker, None, curSkill)
return True
@@ -2781,7 +2777,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 +2793,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