From 89cd5c46258340014d31e4b8c6ee7df0e3b00c2d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 三月 2026 19:51:54 +0800
Subject: [PATCH] 16 卡牌服务端（自动开服相关；A103增加同步开服时间；增加是否允许加入跨服标记，默认否；跨服公会仅在允许跨服时才会加入跨服；优化ServersConfig.json配置，支持后台导出，优化战斗服务器配置；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py | 3 +--
1 files changed, 1 insertions(+), 2 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 bab8a5e..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
@@ -1919,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:
--
Gitblit v1.8.0