From 1ea73e1885835466265ce788d93556b7030ee0e8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 30 十二月 2018 18:42:00 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(GM工具增加子服服务器维护,文字翻译版)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
index 004abbd..74463eb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
@@ -40,6 +40,13 @@
     if curObj == None:
         # 避免配表错误导致报错
         return False
+
+    if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_GatherSoul and curObj.GetGameObjType() == IPY_GameWorld.gotNPC:
+        if curSkill.GetSkillTypeID() != 23052:
+            #GameWorld.DebugLog('聚魂副本玩家不能对怪物上buff curSkill=%s,buffOwner=%s'%(curSkill.GetSkillTypeID(),buffOwner.GetID()))
+            return True
+        #GameWorld.DebugLog('聚魂副本对怪物上buff curSkill=%s,buffOwner=%s'%(curSkill.GetSkillTypeID(),buffOwner.GetID()))
+        
     if curObj.GetGameObjType() == IPY_GameWorld.gotNPC and curObj.GetIsBoss() not in ChConfig.Def_SkillAttack_NPCIsBoss \
     and SkillCommon.GetSkillBattleType(curSkill) == ChConfig.Def_BattleRelationType_CommNoBoss:
         # 释放后 对指定BOSS无效的技能
@@ -310,7 +317,8 @@
 
     #是否需要通知客户端
     isNotify = True if curSkill.GetClientEffectType() != 0 else False
-    addBuff = buffState.AddBuffEx(skillID, tick, isNotify)
+    # 增加第四个参数是否立即广播
+    addBuff = buffState.AddBuff(skillID, tick, isNotify, False)
     buffIndex = buffState.GetBuffCount()    # buff在管理器中的索引
     if updProcessInterval > 0:
         # 继承上一个buff的循环记录
@@ -370,7 +378,9 @@
     DoAddBuffOver(curObj, curSkill, addBuff, buffOwner, tick)
         
     # 通知客户端
-    buffState.Sync_AddBuffEx()
+    #buffState.Sync_AddBuffEx()
+    if isNotify:
+        PYSync_RefreshBuff(curObj, addBuff, SkillCommon.GetBuffType(curSkill), notifyAll=False, owner = buffOwner)
 
     #检查是否属于刷新BUFF
     #===========================================================================
@@ -907,9 +917,8 @@
     
     return DelBuffBySkillID(curObj, skillID, tick)
 
-def PYSync_RefreshBuff(gameObj, curBuff, buffType):
+def PYSync_RefreshBuff(gameObj, curBuff, buffType, notifyAll=True, owner = None):
     sendPack = ChNetSendPack.tagObjAddBuff()
-    sendPack
 
     sendPack.ObjType = gameObj.GetGameObjType()
     sendPack.ObjID = gameObj.GetID();
@@ -920,7 +929,12 @@
     sendPack.Value1 = curBuff.GetValue1();
     sendPack.Value2 = curBuff.GetValue2();
     sendPack.Layer = curBuff.GetLayer();
-    gameObj.NotifyAll(sendPack.GetBuffer(), sendPack.GetLength());
-    
+    if owner:
+        sendPack.OwnerID = owner.GetID()
+        sendPack.OwnerType = owner.GetGameObjType()
+    if notifyAll or gameObj.GetGameObjType() != IPY_GameWorld.gotPlayer:
+        gameObj.NotifyAll(sendPack.GetBuffer(), sendPack.GetLength());
+    else:
+        PlayerControl.PyNotifyAll(gameObj, sendPack, notifySelf=True, notifyCnt=-1)
     
     
\ No newline at end of file

--
Gitblit v1.8.0