SnxxServerCode.git

			@@ -235,7 +235,7 @@
			GameWorld.Log("加载运营活动: actName=%s,platform=%s,serverGroupID=%s" % (actName, platform, serverGroupID))
			curServerActIpyDataList = __GetOperationActionServerIpyDataList(ipyDataMgr, platform, serverGroupID, actName)
			GameWorld.Log(" 可处理条数=%s" % (len(curServerActIpyDataList)))
			actNumDisableWeekIpyDataInfo = __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList)
			actNumDisableWeekIpyDataInfo, disableWeekCfgIDList = __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList)

			for ipyData in curServerActIpyDataList:

			@@ -269,7 +269,7 @@
			# 开服常规：开服天 > 日期 > 周x （不受合服天影响，合服活动新增一套独立的活动，还是走运营活动配置）
			if actType == ShareDefine.ActType_OpenComm:
			actByWeek = (startDateStr.startswith("W") and endDateStr.startswith("W")) # 按周x开
			actByDate = (startDateStr.count("-") == 2 and endDateStr.count("-") == 2) # 按日期开
			actByDate = (not actByWeek and startDateStr.count("-") == 2 and endDateStr.count("-") == 2) # 按日期开

			# 开服天的
			if startDateStr.isdigit() and endDateStr.isdigit():
			@@ -297,13 +297,13 @@
			% (cfgID, startWeekDate, startDateStr, endWeekDate, endDateStr, ymdCfgID, ymdStartDate, ymdEndDate))
			continue

			if cfgID in disableWeekCfgIDList:
			GameWorld.Log(" 常规活动，按星期开启的未到开启循环日期或已结束循环日期，不处理! cfgID=%s,startDateStr=%s,endDateStr=%s"
			% (cfgID, startDateStr, endDateStr))
			continue

			if actByWeek:
			startWeekday = int(startDateStr[1:])
			endWeekday = int(endDateStr[1:])
			startWeekDate = curDateTime + datetime.timedelta(days=(startWeekday - curWeekday))
			endWeekDate = curDateTime + datetime.timedelta(days=(endWeekday - curWeekday))
			startDateStr = "%d-%d-%d" % (startWeekDate.year, startWeekDate.month, startWeekDate.day)
			endDateStr = "%d-%d-%d" % (endWeekDate.year, endWeekDate.month, endWeekDate.day)
			startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
			GameWorld.Log(" 星期X转化为日期: %s ~ %s" % (startDateStr, endDateStr))

			curServerOpenDateTime = curDateTime + datetime.timedelta(days=(1 - openServerDay)) # 开服第一天的日期
			@@ -595,10 +595,12 @@

			def __GetOperationActionDisableWeekIpyDataInfo(actName, curDateTime, curServerActIpyDataList):
			## 获取不可用的按星期X开启的配置数据信息，按星期X开启的活动优先级小于按日期的，当有重叠时以日期的为准
			curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1
			#curWeekday = curDateTime.weekday() + 1 # 今天星期几, 1代表星期1
			actNumWeekYMDIpyDataInfo = {} # {actNum:[weekIpyDataList, ymdIpyDatList], ...}
			disableWeekCfgIDList = [] # [cfgID, ...]

			for ipyData in curServerActIpyDataList:
			cfgID = ipyData.GetCfgID()
			startDateStr = ipyData.GetStartDate()
			endDateStr = ipyData.GetEndDate()
			actNum = GetOperationActNum(actName, ipyData)
			@@ -614,11 +616,14 @@

			# 按星期X的
			if startDateStr.startswith("W"):
			startWeekday = int(startDateStr[1:])
			endWeekday = int(endDateStr[1:])
			startWeekDate = curDateTime + datetime.timedelta(days=(startWeekday - curWeekday))
			endWeekDate = curDateTime + datetime.timedelta(days=(endWeekday - curWeekday))
			startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
			startWeekDate = GameWorld.ChangeStrToDatetime(startDateStr, ChConfig.TYPE_Time_YmdFormat)
			endWeekDate = GameWorld.ChangeStrToDatetime(endDateStr, ChConfig.TYPE_Time_YmdFormat)
			if startWeekDate > curDateTime or curDateTime >= endWeekDate: # 还未开始的循环 or 已经强制结束的循环
			disableWeekCfgIDList.append(cfgID)
			else:
			weekIpyDataList.append([ipyData, startWeekDate, endWeekDate])

			# 按日期的
			elif startDateStr.count("-") == 2:
			ymdIpyData = ipyData
			@@ -642,7 +647,7 @@
			ymdCfgID = ymdIpyData.GetCfgID()
			actNumDisableWeekIpyDataInfo[actNum][cfgID] = [startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate]

			return actNumDisableWeekIpyDataInfo
			return actNumDisableWeekIpyDataInfo, disableWeekCfgIDList

			def TransferOperationActDBKeyValue():
			''' 服务器启动时调用
			@@ -904,11 +909,11 @@
			return
			if len(ipyData.GetStartTimeList()) != len(ipyData.GetEndTimeList()):
			return
			openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
			startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
			multiExpRateInfo = ChPyNetSendPack.tagGCMultiExpRateInfo()
			multiExpRateInfo.Clear()
			multiExpRateInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)
			multiExpRateInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
			multiExpRateInfo.StartDate = startDateStr
			multiExpRateInfo.EndtDate = endDateStr
			multiExpRateInfo.ActivityTime = []
			for i, startTime in enumerate(ipyData.GetStartTimeList()):
			endTime = ipyData.GetEndTimeList()[i]
			@@ -937,11 +942,11 @@
			##多倍修行点活动信息通知
			if not ipyData:
			return
			openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
			startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
			multiRealmPointInfo = ChPyNetSendPack.tagGCMultiRealmPointInfo()
			multiRealmPointInfo.Clear()
			multiRealmPointInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)
			multiRealmPointInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
			multiRealmPointInfo.StartDate = startDateStr
			multiRealmPointInfo.EndtDate = endDateStr
			multiRealmPointInfo.Multiple = ipyData.GetMultiple()
			multiRealmPointInfo.LimitLV = ipyData.GetLVLimit()
			multiRealmPointInfo.LimitPoint = ipyData.GetPointLimit()