SnxxServerCode.git

			@@ -65,7 +65,10 @@
			# 跨服不处理运营活动
			return

			isReload, OperationActionInfo = __GetOperationActionInfo()
			# 玩家登录的不触发重载活动，不然刚好在0点服务器处理OnDay之前登录的时候会有问题
			isReload, OperationActionInfo = __GetOperationActionInfo(needReload=False)
			if not OperationActionInfo:
			return
			operationActionDict = OperationActionInfo[OperationAction_TodayInfo]

			if isReload:
			@@ -189,7 +192,7 @@
			% (actName, cfgID, recStartDateStr, recEndDateStr, recLimitWorldLV, recWorldLV))
			return actWorldLVLimitInfo

			def __GetOperationActionInfo(isRefreshState=True):
			def __GetOperationActionInfo(isRefreshState=True, needReload=True):
			# @return: isReload, OperationActionInfo

			key = "OperationActionInfo"
			@@ -203,6 +206,9 @@
			reloadSign = [openServerDay, isMixServer, mixServerDay, reloadSignHour]
			if OperationActionInfo and OperationActionInfo[OperationAction_ReloadSign] == reloadSign:
			#GameWorld.DebugLog("已经加载过本日运营活动处理信息！openServerDay=%s" % openServerDay)
			return False, OperationActionInfo

			if not needReload:
			return False, OperationActionInfo

			# 因为后面的时间判断都是精确到分的，而处理此逻辑的时候可能不是0秒，所以这里的datetime取当前时间精确到分的
			@@ -657,88 +663,6 @@
			actNumDisableWeekIpyDataInfo[actNum][cfgID] = [startWeekDate, endWeekDate, ymdCfgID, ymdStartDate, ymdEndDate]

			return actNumDisableWeekIpyDataInfo, disableWeekCfgIDDict

			def TransferOperationActDBKeyValue():
			''' 服务器启动时调用
			支持多活动的数据转移，旧版本db活动数据转移到新版本，分两种情况
			1. 原已支持多活动的：手动根据原编号规则进行指定转移，这个维护一次后代码可删除
			2. 原不支持多活动的，自动根据原活动类型进行适配转移即可，由于合服相关的独立出来了，所以只需要处理常规的及节日类型
			这个代码可以一直放着，后续增加支持多活动类型的配置到 MultiActNumOperationActNameList 即可

			注：不支持多活动的，暂还是用旧的key记录数据
			'''
			GameWorld.Log("=== 转移运营活动旧版本数据到新版本 ===")

			# 1. 原已支持的 - 维护后过一次后可删除或注释掉，目前只有累计充值、集字，线上版本分支 gt_1.100.4
			transferDict = {
			ShareDefine.OperationActionName_TotalRecharge:[
			# 原常规每日累充转移到 10
			[PlayerDBGSEvent.Def_OperationActID % ShareDefine.OperationActionName_TotalRecharge,
			PlayerDBGSEvent.Def_OperationActID % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 10,
			],
			[PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_TotalRecharge,
			PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 10,
			],

			# 原常规多日累充2 转移到 11
			[PlayerDBGSEvent.Def_OperationActID % (ShareDefine.OperationActionName_TotalRecharge + "2"),
			PlayerDBGSEvent.Def_OperationActID % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 11,
			],
			[PlayerDBGSEvent.Def_OActWorldLV % (ShareDefine.OperationActionName_TotalRecharge + "2"),
			PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 11,
			],

			# 原节日多日累充3 转移到 31
			[PlayerDBGSEvent.Def_OperationActID % (ShareDefine.OperationActionName_TotalRecharge + "3"),
			PlayerDBGSEvent.Def_OperationActID % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 31,
			],
			[PlayerDBGSEvent.Def_OActWorldLV % (ShareDefine.OperationActionName_TotalRecharge + "3"),
			PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_TotalRecharge + "_%s" % 31,
			],
			],
			ShareDefine.OperationActionName_CollectWords:[
			# 只配置了常规日期的，可不处理
			],
			}
			for actName, transferKeyList in transferDict.items():
			for oldKey, newKey in transferKeyList:
			value = PlayerDBGSEvent.GetDBGSTrig_ByKey(oldKey)
			if not value:
			continue
			GameWorld.Log(" 转移旧运营活动dbKey值到新key: actName=%s,oldKey=%s,newKey=%s,value=%s" % (actName, oldKey, newKey, value))
			PlayerDBGSEvent.SetDBGSTrig_ByKey(newKey, value)
			PlayerDBGSEvent.DelDBGSTrig_ByKey(oldKey)

			# 2. 新增支持的 - 可当做常规代码一直留着
			for actName in ShareDefine.MultiActNumOperationActNameList:
			if actName in transferDict:
			# 特殊处理转化的活动不进行常规处理
			continue

			actIDKeyOld = PlayerDBGSEvent.Def_OperationActID % actName
			worldLVKeyOld = PlayerDBGSEvent.Def_OActWorldLV % actName

			actNum = GetOperationActNum(actName)
			actIDKeyNew = actIDKeyOld + "_%s" % actNum
			worldLVKeyNew = worldLVKeyOld + "_%s" % actNum

			dbActID = PlayerDBGSEvent.GetDBGSTrig_ByKey(actIDKeyOld)
			dbWorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(worldLVKeyOld)
			if not dbActID:
			continue

			GameWorld.Log(" 转移旧运营活动dbKey值到新key: actName=%s" % actName)
			PlayerDBGSEvent.SetDBGSTrig_ByKey(actIDKeyNew, dbActID)
			PlayerDBGSEvent.DelDBGSTrig_ByKey(actIDKeyOld)
			GameWorld.Log(" actIDKeyOld=%s,actIDKeyNew=%s,dbActID=%s" % (actIDKeyOld, actIDKeyNew, dbActID))

			if dbWorldLV:
			PlayerDBGSEvent.SetDBGSTrig_ByKey(worldLVKeyNew, dbWorldLV)
			PlayerDBGSEvent.DelDBGSTrig_ByKey(worldLVKeyOld)
			GameWorld.Log(" worldLVKeyOld=%s,worldLVKeyNew=%s,dbWorldLV=%s" % (worldLVKeyOld, worldLVKeyNew, dbWorldLV))

			GameWorld.Log("===================================")
			return

			def Dispose_OperationActionState(reloadRefresh=False):
			# 运营活动状态处理, 每天0点会强制同步当天的运营活动详情到地图服务器