From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
index ba4f61b..39ea12e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
@@ -57,8 +57,6 @@
#家族更新
PlayerFamily.FamilyOnDay(tick)
- #合服活动
- #GameWorldMixServerCampaign.MixServerOnDay()
playerManager = GameWorld.GetPlayerManager()
for i in xrange(playerManager.GetPlayerCount()):
curPlayer = playerManager.GetPlayerByIndex(i)
@@ -175,6 +173,9 @@
# @remarks 函数详细说明.
def PlayerOnDay(curPlayer):
+ if GameWorld.IsCrossServer():
+ return
+
#通知开服天数
Sync_OpenServerDay(curPlayer)
--
Gitblit v1.8.0