From f44f49720af5ac79493636a1c67bbd10687dbf6c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 18:16:05 +0800
Subject: [PATCH] 860312 礼包卡账号小写

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 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 3829654..f688ae0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -24,7 +24,7 @@
 import SkillShell
 import BuffSkill
 import BaseAttack
-import PlayerTruck
+import ChNetSendPack
 import SkillCommon
 import AttackCommon
 import ItemControler
@@ -348,10 +348,10 @@
                                                                     paramDict["AtkReplyCoefficient"])) # 怪物攻击回复调整值
         MonterHurt = eval(FormulaControl.GetCompileFormula("NPCParam_MonterHurt", paramDict["MonterHurt"])) # 怪物固定伤害
         LostHPPerSecond = eval(FormulaControl.GetCompileFormula("NPCParam_LostHPPerSecond", paramDict["LostHPPerSecond"])) # 玩家每秒掉血量
-        
-        attrStrengthenList = attrStrengthenDict.get(strengthenIpyData.GetLVStrengthenMark(), [])
+        LVStrengthenMark = strengthenIpyData.GetLVStrengthenMark()
+        attrStrengthenList = attrStrengthenDict.get(LVStrengthenMark, [])
         for attrKey, strengthenFormat in attrStrengthenList:
-            strengthenValue = int(eval(FormulaControl.GetCompileFormula("NPCStrengthen_%s" % attrKey, strengthenFormat)))
+            strengthenValue = int(eval(FormulaControl.GetCompileFormula("NPCStrengthen_%s_%s" % (attrKey,LVStrengthenMark), strengthenFormat)))
             #GameWorld.DebugLog("    %s=%s" % (attrKey, strengthenValue))
             locals()[attrKey] = strengthenValue # 创建该属性局部变量作为参数提供给后面属性计算时用
             attrDict[attrKey] = strengthenValue
@@ -3789,11 +3789,13 @@
         if not speedPer:
             if curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_SpeedPer):
                 curNPC.SetDict(ChConfig.Def_NPC_Dict_SpeedPer, 0)
-            return
-        speed = int(curNPC.GetSpeed() * (ShareDefine.Def_MaxRateValue) / max(100.0, float(ShareDefine.Def_MaxRateValue + speedPer)))
-        
-        curNPC.SetSpeed(speed)
-        curNPC.SetDict(ChConfig.Def_NPC_Dict_SpeedPer, speedPer)
+        else:
+            speed = int(curNPC.GetSpeed() * (ShareDefine.Def_MaxRateValue) / max(100.0, float(ShareDefine.Def_MaxRateValue + speedPer)))
+            curNPC.SetSpeed(speed)
+            curNPC.SetDict(ChConfig.Def_NPC_Dict_SpeedPer, speedPer)
+        if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_GatherSoul:
+            #目前只在聚魂副本里通知
+            NPCSpeedChangeNotify(curNPC, curNPC.GetSpeed())
         return
     
     
@@ -6080,3 +6082,13 @@
     GameWorld.DebugLog("通知GameServer地图Boss分流信息: mapID=%s,lineID=%s,shuntPlayerDict=%s" % (mapID, lineID, shuntPlayerDict), lineID)
     return
 
+def NPCSpeedChangeNotify(curNPC, speed):
+    ##通知NPC速度
+    sendPack = ChNetSendPack.tagObjInfoRefresh()
+    sendPack.Clear()
+    sendPack.ObjID = curNPC.GetID()
+    sendPack.ObjType = curNPC.GetGameObjType()
+    sendPack.RefreshType = IPY_GameWorld.CDBPlayerRefresh_Speed
+    sendPack.Value = speed
+    curNPC.NotifyAll(sendPack.GetBuffer(), sendPack.GetLength())
+    return

--
Gitblit v1.8.0