From d292f7fe02cfbb9365850c69bf2aa90708c3ccb4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 15:32:09 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(增加查看跨服玩家)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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 52a495c..93ebc5c 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
@@ -220,11 +220,12 @@
 def PlayerLoginMergeServerSkillLogic(curPlayer, tick):
     playerID = curPlayer.GetPlayerID()
 
-    if not GameWorld.IsMergeServer():
+    if not GameWorld.IsCrossServer():
         GameWorld.DebugLog("非跨服服务器上线不清除buff...", playerID)
         return
     
-    ClearBuffSkillTypeIDList = ReadChConfig.GetEvalChConfig("ClearBuffSkillTypeID")
+    #ClearBuffSkillTypeIDList = ReadChConfig.GetEvalChConfig("ClearBuffSkillTypeID")
+    ClearBuffSkillTypeIDList = []
     # 跨服服务器上线清除增益/减益buff
     GameWorld.Log("跨服服务器上线清除buff...", playerID)
     clearBuffList = [] # 先汇总再清除,不然索引会变更
@@ -281,6 +282,15 @@
                                % (curSkill.GetSkillName(), curSkill.GetSkillTypeID()), playerID)
     return
 
+def ResetAllSkillCD(curPlayer):
+    skillManager = curPlayer.GetSkillManager()
+    for i in xrange(skillManager.GetSkillCount()):
+        skill = skillManager.GetSkillByIndex(i)
+        if skill.GetRemainTime() != 0:
+            skill.SetRemainTime(0)
+            skill.Sync_Skill()
+    return
+
 ## 刷新玩家所有技能的剩余时间(上线)
 #  @param curPlayer 当前玩家
 #  @param tick 当前时间

--
Gitblit v1.8.0