SnxxServerCode.git

			@@ -34,6 +34,7 @@
			import PlayerFairyCeremony
			import PlayerNewFairyCeremony
			import PlayerActGarbageSorting
			import PlayerActBossTrial
			import PlayerUniversalGameRec
			import GameWorldAverageLv
			import PlayerFamilyBoss
			@@ -141,7 +142,7 @@

			活动分组编号 = 活动类型 * 10 + 不同界面编号
			'''
			if ipyData and hasattr(ipyData, "ActNum"):
			if ipyData and hasattr(ipyData, "GetActNum"):
			return ipyData.GetActNum()

			# 原节日活动的还是默认节日活动
			@@ -245,9 +246,9 @@

			for ipyData in curServerActIpyDataList:

			platformList = [] if not hasattr(ipyData, "PlatformList") else ipyData.GetPlatformList()
			serverGroupIDList = [] if not hasattr(ipyData, "ServerGroupIDList") else ipyData.GetServerGroupIDList()
			serverGroupIDListExcept = [] if not hasattr(ipyData, "ServerGroupIDListExcept") else ipyData.GetServerGroupIDListExcept()
			platformList = [] if not hasattr(ipyData, "GetPlatformList") else ipyData.GetPlatformList()
			serverGroupIDList = [] if not hasattr(ipyData, "GetServerGroupIDList") else ipyData.GetServerGroupIDList()
			serverGroupIDListExcept = [] if not hasattr(ipyData, "GetServerGroupIDListExcept") else ipyData.GetServerGroupIDListExcept()
			cfgID = ipyData.GetCfgID()
			startDateStr = ipyData.GetStartDate()
			endDateStr = ipyData.GetEndDate()
			@@ -257,6 +258,7 @@
			% (cfgID, actNum, startDateStr, endDateStr, openServerDay, isMixServer, mixServerDay, curDateTime, platformList, serverGroupIDList, serverGroupIDListExcept))

			actIDDateTimeSpec = None # 特殊指定的活动ID日期
			startDateSync = None # 特殊同步前端显示用的开始日期，一般用于与开服前X天交叉的活动
			if actName in ShareDefine.MultiActNumOperationActNameList:
			# 多活动分组编号的需要把所有配置的 actNum 都登记进来，以确保地图能正确进行逻辑
			if actNum not in mapServerOperationActionDict[actName]:
			@@ -331,6 +333,14 @@
			% (customMaxServerDateTime.year, customMaxServerDateTime.month, customMaxServerDateTime.day),
			ChConfig.TYPE_Time_Format) + datetime.timedelta(days=1)
			GameWorld.Log(" 开服天后可开启的非每日重置活动! 活动ID日期特殊设置为开服定制天结束后一天! cfgID=%s,actIDDateTimeSpec=%s" % (cfgID, actIDDateTimeSpec))

			# 特殊同步的开始日期，无视是否每日重置
			if actName in startDateInCustomCanOpenList:
			startDateSync = datetime.datetime.strptime("%d-%d-%d 00:00:00"
			% (customMaxServerDateTime.year, customMaxServerDateTime.month, customMaxServerDateTime.day),
			ChConfig.TYPE_Time_Format) + datetime.timedelta(days=1)
			startDateSync = "%d-%d-%d" % (startDateSync.year, startDateSync.month, startDateSync.day)

			else:
			GameWorld.Log(" 开服常规活动，配置时间格式不支持，不处理! cfgID=%s,startDateStr=%s,endDateStr=%s" % (cfgID, startDateStr, endDateStr))
			continue
			@@ -542,6 +552,10 @@
			#活动每天的世界等级
			activityInfoDict[ShareDefine.ActKey_WorldLVList] = GameWorldAverageLv.GetWorldLVListByTime(startDayDate, (endDayDate - startDayDate).days)

			if startDateSync:
			activityInfoDict[ShareDefine.ActKey_StartDateSync] = startDateSync
			GameWorld.Log(" startDateSync=%s" % (startDateSync))

			dayIndex = (curDateTime - startDayDate).days
			actIDDateTime = startDayDate
			isDayRest = 0 if not hasattr(ipyData, "GetIsDayReset") else ipyData.GetIsDayReset()
			@@ -585,9 +599,9 @@
			actCfgCount = getattr(ipyDataMgr, "Get%sCount" % actName)()
			for cfgIndex in xrange(actCfgCount):
			ipyData = getattr(ipyDataMgr, "Get%sByIndex" % actName)(cfgIndex)
			platformList = [] if not hasattr(ipyData, "PlatformList") else ipyData.GetPlatformList()
			serverGroupIDList = [] if not hasattr(ipyData, "ServerGroupIDList") else ipyData.GetServerGroupIDList()
			serverGroupIDListExcept = [] if not hasattr(ipyData, "ServerGroupIDListExcept") else ipyData.GetServerGroupIDListExcept()
			platformList = [] if not hasattr(ipyData, "GetPlatformList") else ipyData.GetPlatformList()
			serverGroupIDList = [] if not hasattr(ipyData, "GetServerGroupIDList") else ipyData.GetServerGroupIDList()
			serverGroupIDListExcept = [] if not hasattr(ipyData, "GetServerGroupIDListExcept") else ipyData.GetServerGroupIDListExcept()

			if platformList and platform not in platformList:
			continue
			@@ -763,6 +777,11 @@
			GameWorld.Log(" dbActID变更: dbActID=%s,curActID=%s" % (dbActID, curActID))
			PlayerDBGSEvent.SetDBGSTrig_ByKey(dbOperationActIDKey, curActID)

			# 结束旧的
			if dbActID:
			if actName == ShareDefine.OperationActionName_BossTrial:
			PlayerActBossTrial.OnActEnd(actNum, ipyData, dayIndex)

			if curActID:
			if actName in ShareDefine.NeedWorldLVOperationActNameList:
			#记录开启时世界等级
			@@ -790,6 +809,8 @@
			PlayerStore.ResetFlashSaleBuyCnt(ipyData)
			elif actName == ShareDefine.OperationActionName_GarbageSorting:
			PlayerActGarbageSorting.OnActStart(actNum)
			elif actName == ShareDefine.OperationActionName_BossTrial:
			PlayerActBossTrial.OnActStart(actNum)
			else:
			if actName == ShareDefine.OperationActionName_GarbageSorting:
			PlayerActGarbageSorting.OnActEnd(actNum)
			@@ -1057,6 +1078,9 @@
			def Dispose_DailyActionState():
			# 日常活动状态变更检查处理

			if GameWorld.IsCrossServer():
			CrossActionControl.Dispose_CrossDailyActionState()

			todayDailyActionInfo = __GetTodayDailyActionInfo()
			if not todayDailyActionInfo:
			return
			@@ -1122,11 +1146,20 @@
			def SendMapServerDailyActionState():
			# 地图启动成功时通知本日进行中的日常活动状态

			gameWorld = GameWorld.GetGameWorld()
			if GameWorld.IsCrossServer():
			CrossActionControl.SendMapServerCrossDailyActionState()
			else:
			for dailyActionID in ShareDefine.CrossDailyActionIDList:
			dictName = ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % dailyActionID
			state = gameWorld.GetDictByKey(dictName)
			if state:
			GameWorld.SendMapServerMsgEx(dictName, state)

			todayDailyActionInfo = __GetTodayDailyActionInfo()
			if not todayDailyActionInfo:
			return

			gameWorld = GameWorld.GetGameWorld()
			for actionInfo in todayDailyActionInfo:
			dailyActionID = actionInfo[0]
			dictName = ShareDefine.Def_Notify_WorldKey_DailyActionState % dailyActionID