From 09b880f5f1728c443b77a1fe83a6b9c34b8e7ede Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 02 二月 2021 16:51:13 +0800
Subject: [PATCH] 4925 【主干】【BT】【BT2】【BTZF】红包雨65535报错
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
index 4968286..44f3767 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函数
@@ -44,6 +43,7 @@
import time
import random
import copy
+import urllib
#import psyco
#---------------------------------------------------------------------
GameWorldData = IPY_GameServer.IPY_GameWorld()
@@ -543,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:])
@@ -838,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)
@@ -898,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)
## 增长列表（类似饼图）从中获得指定的信息
@@ -915,6 +933,19 @@
return smallList[1]
return defValue
+
+## 从列表中产生物品，[[权重, object], ....]
+# @param weightList 待选列表
+def GetResultByWeightList(weightList):
+ randList = []
+ weight = 0
+ for info in weightList:
+ weight += info[0]
+ randList.append([weight, info[1] if len(info) == 2 else info[1:]])
+ if not randList:
+ return
+ rate = random.randint(1, randList[-1][0])
+ return GetResultByRiseList(randList, rate)
## 根据字典key获取value值
# @return
@@ -1026,7 +1057,7 @@
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, msgInfo)
+ getUrl = getUrl + "?Type=GameWarning&groupID=%s&userDBName=%s&MsgInfo=%s"%(groupID, userDBName, urllib.quote_plus(msgInfo))
GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
\ No newline at end of file
--
Gitblit v1.8.0