860312 机器人

hch

2018-12-27 affca29e7500fc8e2e65cf15d19496a370f6329e

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py

@@ -220,7 +220,7 @@
def PlayerLoginMergeServerSkillLogic(curPlayer, tick):

    playerID = curPlayer.GetPlayerID()



    if not GameWorld.IsMergeServer():

    if not GameWorld.IsCrossServer():

        GameWorld.DebugLog("非跨服服务器上线不清除buff...", playerID)

        return