From 8a5cd920235eefda418bba0e949ba522cab72a4c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 11 八月 2022 16:18:29 +0800
Subject: [PATCH] 9685 【后台】开服时间整合（清档完毕后入库存档）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_HPMP.py | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_HPMP.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_HPMP.py
index 09c8f67..ebdf705 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_HPMP.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_HPMP.py
@@ -51,7 +51,7 @@
# @return True or False 返回值为是否使用成功(外层通知特效)
# @remarks 函数详细说明.
def UseItem(curPlayer, curRoleItem, tick):
- if curPlayer.GetHP() <= 0 or curPlayer.GetPlayerAction() == IPY_GameWorld.paDie:
+ if GameObj.GetHP(curPlayer) <= 0 or curPlayer.GetPlayerAction() == IPY_GameWorld.paDie:
#死亡不回血
return
@@ -122,9 +122,9 @@
# @return 布尔值
# @remarks 一次性回血物品逻辑处理
def __DoLogic_AddHP_Once(curPlayer, curItem, effValueA, effValueB):
- curValue = curPlayer.GetHP()
- curMaxValue = curPlayer.GetMaxHP()
- setFunc = curPlayer.SetHP
+ curValue = GameObj.GetHP(curPlayer)
+ curMaxValue = GameObj.GetMaxHP(curPlayer)
+ setFunc = "SetHP"
sysMsgStr = 'GeRen_chenxin_21675'
return __Add_HPorMP_Once(curPlayer, curItem, curValue, curMaxValue, setFunc, effValueA, effValueB, sysMsgStr)
@@ -163,7 +163,10 @@
#回复效果 = 玩家当前生命(魔法) + 玩家最大生命(魔法)上限 * 效果A值 + 效果B值
addTotalValue = int(curMaxValue * addPer / ChConfig.Def_MaxRateValue + addValue)
#回复数值
- setFunc(min(curMaxValue, curValue + addTotalValue))
+ if setFunc == "SetHP":
+ GameObj.SetHP(curPlayer, min(curMaxValue, curValue + addTotalValue))
+ else:
+ setFunc(min(curMaxValue, curValue + addTotalValue))
#扣除物品
ItemCommon.DelItem(curPlayer, curItem, 1, True)
return True
@@ -179,8 +182,8 @@
# @return 布尔值
# @remarks 多次回血物品逻辑处理
def __DoLogic_AddHP_More(curPlayer, curItem, effValueA):
- curValue = curPlayer.GetHP()
- curMaxValue = curPlayer.GetMaxHP()
+ curValue = GameObj.GetHP(curPlayer)
+ curMaxValue = GameObj.GetMaxHP(curPlayer)
setFunc = curPlayer.SetHP
sysMsgStr = 'GeRen_chenxin_21675'
@@ -245,8 +248,8 @@
# PlayerControl.NotifyCode(curPlayer, "Pet_liubo_381601", [curRoleItem.GetItemTypeID()])
# return False
#
-# curValue = fightPetObj.GetHP()
-# curMaxValue = fightPetObj.GetMaxHP()
+# curValue = GameObj.GetHP(fightPetObj)
+# curMaxValue = GameObj.GetMaxHP(fightPetObj)
# #已经满值
# if curValue == curMaxValue:
# PlayerControl.NotifyCode(curPlayer, "Pet_liubo_493922")
@@ -277,6 +280,9 @@
if curPlayer.GetLV() < curRoleItem.GetUseLV():
return False
+ if curRoleItem.GetAddSkillCount() <= 0:
+ return False
+
addSkillID = curRoleItem.GetAddSkill(0)
if not addSkillID:
--
Gitblit v1.8.0