From 2bb7c0c9764b3aa2a2ed1e860ceee4e515508926 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 19 五月 2021 11:02:30 +0800
Subject: [PATCH] 5015 【主干】【bt】【bt2】【工具】GM工具支持修改玩家数据(支持运行自定义脚本命令GMT_Execfile)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.py
index 634ba50..13d8df5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.py
@@ -29,6 +29,7 @@
import SkillCommon
import PetControl
import SkillShell
+import GameObj
#---------------------------------------------------------------------
#---------------------------------------------------------------------
@@ -92,10 +93,9 @@
# @return hurtType : HurtType 伤害结构体类
# @remarks 攻击
def DoAttack(curPlayer, curTagPet, skill, skillValue, skillPercent, skillHurtList, tick):
- #finalHurtPer = SkillCommon.GetSkillFinalHurtPer(curPlayer, curTagPet, skill, tick)
#攻击前血量
- curTagPetHP = curTagPet.GetHP()
+ curTagPetHP = GameObj.GetHP(curTagPet)
#攻击成功
hurtType = AttackCommon.GetHurtHP(curPlayer, curTagPet, skill, skillValue, skillPercent, tick)
hurtHP = hurtType.HurtHP
@@ -130,14 +130,14 @@
if curTagPlayer != None:
- if curTagPlayer.GetHP() > 0:
+ if GameObj.GetHP(curTagPlayer) > 0:
#进入战斗状态
AttackCommon.SetPlayerBattleState(curTagPlayer, tick)
AttackCommon.OnPlayerHitPlayer(curPlayer, curTagPlayer, tick)
#宠物死亡
- if curTagPet.GetHP() <= 0:
+ if GameObj.GetHP(curTagPet) <= 0:
curTagPetNPCControl = NPCCommon.NPCControl(curTagPet)
curTagPetNPCControl.SetKilled()
--
Gitblit v1.8.0