From 3d7d4a003455176e07b517068608a999796fdf6e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 27 十一月 2018 22:25:02 +0800
Subject: [PATCH] 4762 【后端】修复两个非好友玩家都没有仙盟时被视为同仙盟的bug;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index b277de7..0edc709 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -3653,9 +3653,6 @@
     #  @remarks 刷新NPC属性
     def RefreshNPCAttrState(self, canSyncClient=True, isReborn=False):
         curNPC = self.__Instance
-        if curNPC.GetType() == ChConfig.ntHelpBattleRobot:
-            # 助战机器人不处理
-            return
         #curNPCMaxHP_Before = GameObj.GetMaxHP(curNPC)
         #清空NPC战斗属性
         curNPC.ClearBattleEffect()
@@ -3708,7 +3705,7 @@
         fbFightPower = ipyData.GetFightPowerMin()
         baseHurt = ipyData.GetRobotBaseHurt()
         hpCoefficient = ipyData.GetRobotHPCoefficient()
-        maxHP = int(baseHurt * fightPower / fbFightPower * hpCoefficient)
+        maxHP = int(eval(IpyGameDataPY.GetFuncCompileCfg("HelpBattleRobot", 2)))
         GameWorld.DebugLog("设置助战机器人属性: objID=%s,fightPower=%s,maxHP=%s" % (curNPC.GetID(), fightPower, maxHP))
         GameObj.SetMaxHP(curNPC, maxHP)
         GameObj.SetHP(curNPC, maxHP)
@@ -3739,9 +3736,6 @@
     #  @remarks 刷新NPC行为属性
     def RefreshNPCActionState(self):
         curNPC = self.__Instance
-        if curNPC.GetType() == ChConfig.ntHelpBattleRobot:
-            # 助战机器人不处理
-            return
         OperControlManager.ClearObjActionState(curNPC)
         
         #根据BUFF 加上状态

--
Gitblit v1.8.0