From 3ac863ebc8f55dd0838b4ee2f9d0c39234af25eb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 09 二月 2026 10:46:00 +0800
Subject: [PATCH] 358 【内政】红颜系统-服务端（修改游历体力为DWORD；红颜时装升级改为使用背包物品；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
index ece7992..b0e4474 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -33,13 +33,11 @@
import SkillCommon
import FBLogic
import ReadChConfig
-import PetControl
import GameMap
import PassiveBuffEffMng
import GameFuncComm
import ShareDefine
import SkillShell
-import FormulaControl
import IpyGameDataPY
import PyGameData
import GameObj
@@ -47,7 +45,6 @@
import PlayerState
import ChPyNetSendPack
import NetPackCommon
-import FBCommon
import ChNPC
import ChNetSendPack
import TurnAttack
@@ -697,7 +694,7 @@
# NPC打NPC
elif atkObjType == IPY_GameWorld.gotNPC and defObjType == IPY_GameWorld.gotNPC:
- if PetControl.IsPet(attacker) or attacker.GetGameNPCObjType()== IPY_GameWorld.gnotSummon:
+ if attacker.GetGameNPCObjType()== IPY_GameWorld.gnotSummon:
##击杀次数判断
#if not CheckKillNPCByCnt(attacker, defender, False):
# ownerPlayer = GetAttackPlayer(attacker)[0]
@@ -882,12 +879,6 @@
# 召唤兽主人为玩家
if summonOwner and summonOwner.GetGameObjType() == IPY_GameWorld.gotPlayer:
return summonOwner, npcObjType
-
- # 判断宠物主人
- elif npcObjType == IPY_GameWorld.gnotPet:
- ownerPlayer = PetControl.GetPetOwner(atkObj)
- if ownerPlayer != None:
- return ownerPlayer, npcObjType
return None, None
@@ -1603,8 +1594,7 @@
elif defObjType == IPY_GameWorld.gotNPC:
if defObj.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
- #设置宠物剩余血量
- PetControl.SetPetHP(defObj, remainHP)
+ pass
elif defObj.GetType() == ChConfig.ntHelpBattleRobot:
remainHP = min(dHP, max(GameObj.GetMaxHP(defObj)/2, remainHP)) # 助战机器人剩余血量不能少于一半
@@ -2191,7 +2181,7 @@
# @param None
# @return 攻击形式字符串
def GetAtkState(atkObj, defObj):
- isPet = PetControl.IsPet(atkObj)
+ isPet = False
if IsPVENPCObj(atkObj) or IsPVENPCObj(defObj):
return 'PVE_%s' if not isPet else 'PetVE_%s'
@@ -2279,7 +2269,7 @@
if atkObjType == IPY_GameWorld.gotNPC:
#宠物回血
if atkObj.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
- PetControl.SetPetHP(atkObj, remainHP)
+ pass
#普通NPC回血
else:
GameObj.SetHP(atkObj, remainHP)
--
Gitblit v1.8.0