From 516f33feb5fe68e90f4d9497b74d67ed52c1cfde Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 22 二月 2019 10:12:51 +0800
Subject: [PATCH] 6273 【后端】【1.6】七日巡礼和节日巡礼增加祈愿条件
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
index 42d432a..6bfea6e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
@@ -20,7 +20,6 @@
# @change: "2015-01-14 00:30" hxp 增加服务器平台区服ID获取
# @change: "2015-01-14 20:30" hxp 增加CanHappen函数
# @change: "2015-06-08 20:30" hxp 增加获取channelCode
-# @change: "2015-09-24 16:00" hxp 增加IsMergeOpen
# @change: "2015-10-22 23:00" hxp 增加获取子服serverID
# @change: "2016-03-28 17:00" hxp 增加创角改名GetPlayerFullName
# @change: "2016-07-18 19:00" hxp 增加获取平台账号
@@ -837,23 +836,6 @@
def GetDatetimeBySubDays(diffDays):
return datetime.datetime.today() - datetime.timedelta(days = diffDays)
-
-## 是否跨服服务器
-# @param None None
-# @return
-def IsMergeServer():
- config = GameConfig.GetConfig()
-
- return config.get('IsMergeWarServe', 0)
-
-## 是否开启跨服活动
-# @param None None
-# @return
-def IsMergeOpen():
- config = GameConfig.GetConfig()
- # 如果跨服服务器IP有配置, 或本身就是跨服服务器, 则代表开启
- return True if (config.get('MergeServerIP') or config.get('IsMergeWarServe')) else False
-
def IsCrossServer():
## 是否跨服服务器
return ToIntDef(ReadChConfig.GetPyMongoConfig("Merge", "IsMergeServer"), 0)
@@ -862,6 +844,12 @@
## 是否开启跨服活动
return ReadChConfig.GetPyMongoConfig("Merge", "MergeServerIP") or IsCrossServer()
+def GetCrossZoneName():
+ ## 跨服服务器分区名，标记一起跨服分区的名字，配置在跨服服务器，子服不用配置，由跨服服务器同步
+ if IsCrossServer():
+ return ReadChConfig.GetPyMongoConfig("Merge", "CrossZoneName")
+ return PyGameData.g_crossZoneName
+
## 获取玩家的区服名，仅在跨服有效
# @param curPlayer 玩家实例
# @return: 区服名
--
Gitblit v1.8.0