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/Skill/GameSkills/SkillCommon.py |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
index 3bdb2ae..b3ae73d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
@@ -901,7 +901,7 @@
         if not angryValue_ID:
             continue
         
-        summonNPCAngry.AddAngry(angryValue_ID, angryValue.GetObjType(), angryValue.GetAngryValue())
+        summonNPCAngry.AddAngry(angryValue_ID, angryValue.GetObjType(), angryValue.GetAngryValue(), angryValue.GetAngryValueEx())
     
     summonNPC.NotifyAppear() # 最终统一通知NPC出现
     #返回值,技能释放成功
@@ -939,7 +939,7 @@
 #    
 #    for i in range(0, curNPC.GetSummonCount()):
 #        summonNPC = curNPC.GetSummonNPCAt(i)
-#        if summonNPC.GetHP() > 0:
+#        if GameObj.GetHP(summonNPC) > 0:
 #            continue
 #        
 #        summonIsFull = False
@@ -1037,7 +1037,7 @@
     #summonNPC.SetBaseAtkInterval(int(curPlayer.GetAtkInterval() * skillPer))
     summonNPC.SetBaseMissRate(int(curPlayer.GetMiss() * skillPer))
     summonNPC.SetBaseSuperHiteRate(int(curPlayer.GetSuperHitRate() * skillPer))
-    summonNPC.SetBaseMaxHP(int(curPlayer.GetMaxHP() * skillPer))
+    GameObj.SetBaseMaxHP(summonNPC, int(GameObj.GetMaxHP(curPlayer) * skillPer))
     #summonNPC.SetBaseHPRestore(int(curPlayer.GetHPRestoreSetting() * skillPer))
     #summonNPC.SetOrgSpeed(int(curPlayer.GetOrgSpeed() * skillPer))
     return
@@ -1068,7 +1068,7 @@
     summonNPC.SetBaseAtkInterval(summonNPC.GetAtkInterval())
     summonNPC.SetBaseMissRate(summonNPC.GetMiss())
     summonNPC.SetBaseSuperHiteRate(summonNPC.GetSuperHitRate())
-    summonNPC.SetBaseMaxHP(summonNPC.GetMaxHP())
+    GameObj.SetBaseMaxHP(summonNPC, GameObj.GetMaxHP(summonNPC))
     summonNPC.SetBaseHPRestore(summonNPC.GetHPRestore())
     #summonNPC.SetOrgSpeed( summonNPC.GetOrgSpeed( ))
     return
@@ -1280,7 +1280,7 @@
             GameObj.SetHP(curObj, remainHP)
             if not isNotify:
                 #已广播的不重复
-                curObj.Notify_HPEx()
+                curObj.Notify_HP()
            
     #广播加血类型
     if isNotify:
@@ -1347,7 +1347,7 @@
                 GameObj.SetHP(curObj, remainHP)
                 
             if not view :   # 已广播的不重复
-                curObj.Notify_HPEx()
+                curObj.Notify_HP()
 
     #其他对象逻辑处理
     else:
@@ -1443,9 +1443,9 @@
     #宠物特殊处理
     if curObj.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
         pass
-        #curObj.Sync_RefreshProp(IPY_GameWorld.PetInfoRefresh_HP, curObj.GetHP(), True)
+        #curObj.Sync_RefreshProp(IPY_GameWorld.PetInfoRefresh_HP, GameObj.GetHP(curObj), True)
     else:
-        curObj.Notify_HPEx()
+        curObj.Notify_HP()
 
 
 ## 获得技能buff的拥有者
@@ -2216,7 +2216,7 @@
     elif cureType == ChConfig.Def_Cure_PHY:
         cureBaseValue = GameObj.GetMaxHP(userObj)
     elif cureType == ChConfig.Def_Cure_HurtValue:
-        cureBaseValue = userObj.GetDictByKey(ChConfig.Def_PlayerKey_LastHurtValue)
+        cureBaseValue = GameObj.GetLastHurtValue(userObj)
     elif cureType == ChConfig.Def_Cure_TagMaxHP:
         cureBaseValue = 0 if not tagObj else GameObj.GetMaxHP(tagObj)
         
@@ -2235,6 +2235,7 @@
     skillPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(userObj, None, curSkill, ChConfig.TriggerType_AddHP)/float(ChConfig.Def_MaxRateValue)
     #公式计算治疗值 
     cureHP = int((cureBaseValue * skillPer + skillValue + addExValue) * curePercent)
+    cureHP = min(cureHP, ChConfig.Def_UpperLimit_DWord)
     
     #GameWorld.DebugLog("获取治疗值(%s):cureType=%s,cureBaseValue=%s,skillPer=%s,skillValue=%s" 
     #                   % (cureHP, cureType, cureBaseValue, skillPer, skillValue))

--
Gitblit v1.8.0