From b7bb8308d9b16d2802ccc3c259c871c2b6e58002 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 15 十一月 2022 19:16:05 +0800
Subject: [PATCH] 9748 【BT7】跨服BOSS定时活动(跨服妖魔boss;增加跨服日常活动时间控制;Boss刷新增加支持关联跨服日常活动;优化跨服boss复活剩余时间计算使用跨服时间;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
index 8c1e2dc..e96733f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -2777,7 +2777,11 @@
     
     if GetIsNewGuy(tagPlayer):
         return ChConfig.Type_Relation_None, ChConfig.Def_PASysMessage_NotAttackNewGuy
-        
+    
+    #和平光环
+    if GetPeaceBuff(curPlayer) or GetPeaceBuff(tagPlayer):
+        return ChConfig.Type_Relation_None, ChConfig.Def_PASysMessage_None
+    
     #恶意攻击的玩家默认都是敌人, 无论什么模式
     if IsMaliciousAttackPlayer(curPlayer, tagPlayer):
         return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
@@ -2837,6 +2841,9 @@
     #敌人关系,可PK,可加减益buff
     return ChConfig.Type_Relation_Enemy , ChConfig.Def_PASysMessage_None
 
+def GetPeaceBuff(curPlayer):
+    return SkillCommon.FindBuffByID(curPlayer, ChConfig.Def_SkillID_Peace)[0]
+
 ## 获取玩家和镖车的关系
 #  @param curPlayer: 攻击方实例
 #  @param curTagTruck: 镖车实例

--
Gitblit v1.8.0