From 0b52fea0c2dec053c44678d94bd66c10db1b0b91 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 06 四月 2021 17:27:57 +0800
Subject: [PATCH] 8870 【BT2】【后端】战力、伤害、玩家生命的数值调整为大数值(超21亿)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 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 7444d9f..1002ab8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -1233,7 +1233,7 @@
         #防守方不是玩家
         return
 
-    if defender.GetHP() > 0:
+    if GameObj.GetHP(defender) > 0:
         #还活着
         return
     
@@ -1373,7 +1373,7 @@
             curHurt = g_skillHurtList.GetHurtAt(0)
             attacker.BaseAttack(curHurt.GetObjID(), curHurt.GetObjType(),
                                 AttackCommon.GetBattleType(attacker, curSkill),
-                                curHurt.GetAttackType(), curHurt.GetHurtHP(), curHurt.GetCurHP(), curHurt.GetCurHPEx())
+                                curHurt.GetAttackType(), curHurt.GetHurtHP(), curHurt.GetHurtHPEx(), curHurt.GetCurHP(), curHurt.GetCurHPEx())
         
         #//返回值无意义
         return
@@ -1811,14 +1811,14 @@
 
     #----------扣HP点
     lostHPValue = curSkill.GetHP()
-    curPlayerHP = curPlayer.GetHP()
+    curPlayerHP = GameObj.GetHP(curPlayer)
     
     if curPlayerHP < lostHPValue:
         GameWorld.ErrLog('释放技能 = %s异常, HP点 = %s不足 = %s' % (
                             curSkill.GetSkillTypeID(), curPlayerHP, lostHPValue))
     
     if lostHPValue > 0:
-        curPlayer.SetHP(curPlayer.GetHP() - lostHPValue)
+        GameObj.SetHP(curPlayer, GameObj.GetHP(curPlayer) - lostHPValue)
         
     return
 
@@ -1860,7 +1860,7 @@
     #设置攻击间隔
     curNPC.SetAttackTick(tick)
     #通知伤血反弹
-    #hurtHPValueSelf = curNPCBeHP - curNPC.GetHP()
+    #hurtHPValueSelf = curNPCBeHP - GameObj.GetHP(curNPC)
     
     #通知客户端攻击结果
     __Sync_AttackResult(curNPC, target, curSkill)
@@ -1892,7 +1892,7 @@
 #        #获取的主人
 #        curPlayer = NPCCommon.GetSummonNPCOwner(IPY_GameWorld.gotPlayer,curNPC)
 #        #如果主人是玩家
-#        if curPlayer != None and curPlayer.GetHP() > 0:
+#        if curPlayer != None and GameObj.GetHP(curPlayer) > 0:
 #            if curSkill == None or curSkill.GetSkillType() != ChConfig.Def_SkillType_Aura: 
 #                #进入战斗状态
 #                AttackCommon.SetPlayerBattleState(curPlayer,tick)
@@ -1902,7 +1902,7 @@
     if curNPC.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
         curPlayer = PetControl.GetPetOwner(curNPC)
         
-        if curPlayer != None and curPlayer.GetHP() > 0:
+        if curPlayer != None and GameObj.GetHP(curPlayer) > 0:
             if curSkill == None or curSkill.GetSkillType() not in ChConfig.Def_NoBattleState_List: 
                 AttackCommon.SetPlayerBattleState(curPlayer, tick)
     
@@ -1930,7 +1930,7 @@
 #  @remarks 函数详细说明.
 def __DoPlayerBeAttacked(attacker, curPlayer, curSkill, tick):
     #玩家已经死亡
-    if curPlayer.GetHP() <= 0:
+    if GameObj.GetHP(curPlayer) <= 0:
         return
      
     #骑乘状态被攻击,则自动下马
@@ -1997,7 +1997,7 @@
     g_skillHurtList.Clear()
     
     #攻击方原有血量,用来通知反弹
-    attackerHP = attacker.GetHP()
+    attackerHP = GameObj.GetHP(attacker)
     
     attackObjName = GetObjAttackName(attacker)
     
@@ -2083,7 +2083,7 @@
     attackTimeSum = len(skillPerList)
 
     #攻击方原有血量,用来通知反弹
-    attackerHP = attacker.GetHP()
+    attackerHP = GameObj.GetHP(attacker)
     
     attackObjName = GetObjAttackName(attacker)
     
@@ -2420,7 +2420,7 @@
     #    if curObj == None:
     #        continue
     #    
-    #    curObj.ChangeHPView(curSkill.GetSkillTypeID(), hurtObj.GetHurtHP(), hurtObj.GetAttackType())
+    #    curObj.ChangeHPView(curSkill.GetSkillTypeID(), hurtObj.GetHurtHP(), hurtObj.GetHurtHPEx(), hurtObj.GetAttackType())
     #    
     #    SkillCommon.NotifyNPCHP(curObj)
     #===========================================================================
@@ -2517,7 +2517,7 @@
     g_skillHurtList.Clear()
     
     #攻击方原有血量,用来通知反弹
-    attackerHP = attacker.GetHP()
+    attackerHP = GameObj.GetHP(attacker)
     
     resultList = __GetAreaAtackObj(attacker, curSkill, srcPosX, srcPosY, tick, __CheckCanAttack, skillMatrix)
             
@@ -2744,6 +2744,7 @@
         hurtList.ObjID = hurtObj.GetObjID()
         hurtList.AttackType = hurtObj.GetAttackType()
         hurtList.HurtHP = hurtObj.GetHurtHP()
+        hurtList.HurtHPEx = hurtObj.GetHurtHPEx()
         hurtList.CurHP = hurtObj.GetCurHP()
         hurtList.CurHPEx = hurtObj.GetCurHPEx()
         
@@ -2780,6 +2781,7 @@
         hurtList.ObjID = hurtObj.GetObjID()
         hurtList.AttackType = hurtObj.GetAttackType()
         hurtList.HurtHP = hurtObj.GetHurtHP()
+        hurtList.HurtHPEx = hurtObj.GetHurtHPEx()
         hurtList.CurHP = hurtObj.GetCurHP()
         hurtList.CurHPEx = hurtObj.GetCurHPEx()
         
@@ -2823,6 +2825,7 @@
         hurtList.ObjID = hurtObj.GetObjID()
         hurtList.AttackType = hurtObj.GetAttackType()
         hurtList.HurtHP = hurtObj.GetHurtHP()
+        hurtList.HurtHPEx = hurtObj.GetHurtHPEx()
         hurtList.CurHP = hurtObj.GetCurHP()
         hurtList.CurHPEx = hurtObj.GetCurHPEx()
         

--
Gitblit v1.8.0