From 3cccf71d1f55e891a03b957bb12f633f951688e7 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 08 三月 2021 18:14:41 +0800
Subject: [PATCH] 8650 【主干】【BT2】活动规则优化（限时礼包支持多活动编号同时开启 同步主干冲突）；
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
index d9006e9..363a530 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
@@ -15,7 +15,6 @@
# @change: "2013-03-20 18:00" Alee 添加DEBUG输出函数DebugLog
# @change: "2013-09-10 20:10" Alee 函数DebugLog改用GetDebugLevel才有效
# @change: "2014-05-16 10:30" xmnathan 增加交易所管理器接口
-# @change: "2014-08-01 15:30" xmnathan 增加天梯竞技场管理器接口
# @change: "2014-09-22 10:00" xmnathan 增加GM工具补偿管理器接口
# @change: "2015-01-14 00:30" hxp 增加服务器平台区服ID获取
# @change: "2015-01-14 20:30" hxp 增加CanHappen函数
@@ -544,6 +543,15 @@
@param dateInfo: 运营活动表配置的日期信息, 如果是纯数字代表开服天
@param openServerDay: 当前开服天
'''
+ if not dateInfo:
+ curDateTime = datetime.datetime.today()
+ return "%d-%d-%d" % (curDateTime.year, curDateTime.month, curDateTime.day)
+ if dateInfo.startswith("W"):
+ curDateTime = datetime.datetime.today()
+ curWeekday = curDateTime.weekday() + 1
+ actionWeekday = int(dateInfo[1:])
+ actionDateTime = curDateTime + datetime.timedelta(days=(actionWeekday-curWeekday))
+ return "%d-%d-%d" % (actionDateTime.year, actionDateTime.month, actionDateTime.day)
if dateInfo.startswith("Mix"):
diffDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay) + 1
actionServerDay = int(dateInfo[3:])
@@ -839,6 +847,14 @@
def GetDatetimeBySubDays(diffDays):
return datetime.datetime.today() - datetime.timedelta(days = diffDays)
+def GetDailyDateStr():
+ ## 获取日常日期 yyyy-MM-dd
+ curDate = GetServerTime()
+ if curDate.hour >= ShareDefine.Def_OnEventHour:
+ return "%d-%s-%s" % (curDate.year, curDate.month, curDate.day)
+ preDate = curDate - datetime.timedelta(days = -1) # 属于前一天
+ return "%s-%s-%s" % (preDate.year, preDate.month, preDate.day)
+
def IsCrossServer():
## 是否跨服服务器
return ToIntDef(ReadChConfig.GetPyMongoConfig("Merge", "IsMergeServer"), 0)
@@ -899,8 +915,9 @@
# @param itemList 待选列表
# @return object
def GetResultByRandomList(randList, defValue=None, maxRateValue=ChConfig.Def_MaxRateValue):
- rate = random.randint(0, maxRateValue)
-
+ if not randList:
+ return defValue
+ rate = random.randint(0, randList[-1][0])
return GetResultByRiseList(randList, rate, defValue)
## 增长列表（类似饼图）从中获得指定的信息
@@ -1032,15 +1049,25 @@
return inputText
+def RaiseException(errorMsg, playerID=0):
+ ## 处理抛出异常信息，debug下直接抛出异常报错信息，否则发送运维邮件提醒
+ ErrLog(errorMsg, playerID)
+ if GetGameWorld().GetDebugLevel():
+ raise Exception(errorMsg)
+ else:
+ SendGameError("GameServerRaiseException", errorMsg)
+ return
-# 向运维发送邮件，用于需要紧急处理的信息
-# 此处不包含服务器报错的汇报
-def SendGameStateMail(msgInfo):
- # 使用方式 向OpenStateUrl 发送Type为GameWarning，那么就会收到一封游戏内容警告邮件，信息为MsgInfo
+def SendGameError(errType, msgInfo=""):
+ ''' 向运维发送邮件，用于需要紧急处理的信息
+ @param errType: 错误类型，自定义即可
+ @param msgInfo: 错误信息，可选
+ '''
getUrl = ReadChConfig.GetPyMongoConfig("EventReport", "OpenStateUrl")
groupID = ReadChConfig.GetPyMongoConfig("platform", "GroupID")
userDBName = ReadChConfig.GetPyMongoConfig("connect", "USER_DB_NAME")
- getUrl = getUrl + "?Type=GameWarning&groupID=%s&userDBName=%s&MsgInfo=%s"%(groupID, userDBName, urllib.quote_plus(msgInfo))
-
+ getUrl = getUrl + "?Type=%s&groupID=%s&userDBName=%s"%(errType, groupID, userDBName)
+ if msgInfo:
+ getUrl = getUrl + "&MsgInfo=%s" % urllib.quote_plus(msgInfo)
GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
-
\ No newline at end of file
+ return
--
Gitblit v1.8.0