From ba4dd9775177975f46867fa979c06e92089511d6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 01 三月 2019 09:48:09 +0800
Subject: [PATCH] 3036 【主干】【1.6】集市上架物品可以复制物品
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
index d8bc871..fde64b6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
@@ -32,6 +32,7 @@
import IpyGameDataPY
import PyGameData
import ReadChConfig
+import PlayerDBGSEvent
import ConfigParser
import GameConfig
import ShareDefine
@@ -436,15 +437,19 @@
def GetPlatform():
return ReadChConfig.GetPyMongoConfig("platform", "PlatformName")
-##获得当前服务器ID
-# @param 无
-# @return
-def GetServerID():
- return ToIntDef(GetServerSID()[1:], 0)
+#===============================================================================
+# ##获得当前服务器ID
+# # @param 无
+# # @return
+# def GetServerID():
+# return ToIntDef(GetServerSID()[1:], 0)
+#===============================================================================
-def GetServerSID():
- ##获得当前服务器ID, 带s的
- return ReadChConfig.GetPyMongoConfig("platform", "ServerID")
+#===============================================================================
+# def GetServerSID():
+# ##获得当前服务器ID, 带s的
+# return ReadChConfig.GetPyMongoConfig("platform", "ServerID")
+#===============================================================================
Def_AccID_Split_Sign = "@"
@@ -469,7 +474,7 @@
mainServerID = ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "%sMainServerID" % accIDPlatform), None)
if mainServerID != None:
return mainServerID
- return GetServerID()
+ return 0
#===============================================================================
@@ -546,11 +551,16 @@
@param dateInfo: 运营活动表配置的日期信息, 如果是纯数字代表开服天
@param openServerDay: 当前开服天
'''
- if not dateInfo.isdigit():
+ if dateInfo.startswith("Mix"):
+ diffDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay) + 1
+ actionServerDay = int(dateInfo[3:])
+ elif not dateInfo.isdigit():
return dateInfo
- actionServerDay = int(dateInfo)
+ else:
+ diffDay = openServerDay
+ actionServerDay = int(dateInfo)
curDateTime = datetime.datetime.today()
- actionDateTime = curDateTime + datetime.timedelta(days=(actionServerDay-openServerDay))
+ actionDateTime = curDateTime + datetime.timedelta(days=(actionServerDay-diffDay))
return "%d-%d-%d" % (actionDateTime.year, actionDateTime.month, actionDateTime.day)
##获得系统时间
@@ -844,6 +854,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