SnxxServerCode.git

			@@ -25,7 +25,6 @@
			# @change: "2014-02-27 12:00" hxp 增加世界boss逻辑
			# @change: "2014-04-26 19:30" hxp 增加领地战活动
			# @change: "2014-06-21 15:20" hxp 增加特惠活动
			# @change: "2014-08-04 17:30" xmnathan 天梯每日更新
			# @change: "2014-08-15 17:00" xmnathan 修改OnDay函数内的执行顺序
			# @change: "2014-10-08 10:30" xmnathan add 定时清理过期补偿
			# @change: "2014-10-29 22:00" hxp MapServerInitOK增加扩展key状态通知
			@@ -83,9 +82,7 @@
			import GameWorldAverageLv
			import PlayerDBOper
			import PlayerGeTui
			#import PlayerManorWar
			import GameWorldBoss
			#import HighLadder
			import PlayerCompensation
			import ReadChConfig
			import EventReport
			@@ -93,11 +90,14 @@
			import CrossRealmPK
			import CrossRealmMsg
			import CrossRealmPlayer
			import CrossActionControl
			import PlayerFBHelpBattle
			import PlayerFamilyRedPacket
			import PlayerFairyDomain
			import IpyGameDataPY
			import PlayerFamilyParty
			import GameWorldFamilyWar
			import GameWorldArena
			import AuctionHouse
			import PlayerXMZZ
			import PlayerTeam
			@@ -118,8 +118,6 @@
			GameWorld.Log("GameServer -> OnHour!")
			PlayerEventCounter.DoLogic_GameServer_OnHour(tick)
			GameWorld.GetGameWorld().OnHour(curTimeStr)
			#每小时更新天梯
			#HighLadder.OnHour()
			#设置存取数据库Key
			__SetWorldKey_SavePlayer(curTimeStr)
			#每小时清空宝物掉落
			@@ -128,6 +126,7 @@
			GameLogInfo.Set_Server_Hour()

			PlayerFamily.FamilyOnHour()
			ChPlayer.CheckOnedayJobPlayerLoginoffTimeout()
			return

			## 触发每日事件(参数 -> 当前时间)
			@@ -137,8 +136,6 @@
			# @remarks 函数详细说明.
			def OnDay(curTimeStr, tick):
			GameWorld.Log("GameServer -> OnDay!")
			#天梯竞技场，放在排行榜更新之前处理
			#HighLadder.OnDay()
			#排行榜拷贝昨日榜单
			PlayerBillboard.CopyBillboardOnDay()
			#开服活动，放在排行榜拷贝昨日榜更新后处理
			@@ -168,7 +165,7 @@
			#GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ServerDay, openServerDay)
			#清理过期补偿
			PlayerCompensation.ClearUpTimeOutCompensation()
			PlayerGeTui.ClearFMTGeTuiLimit()
			#PlayerGeTui.ClearFMTGeTuiLimit()
			import PlayerBourse
			PlayerBourse.OverTimeItemsDeal()
			# 仙盟联赛
			@@ -183,6 +180,8 @@

			#仙魔之争
			PlayerXMZZ.XMZZOndayEx()
			#boss复活
			GameWorldBoss.BossRebornOnDayEx()
			return

			## 触发每周事件(参数 -> 当前时间)
			@@ -298,8 +297,8 @@
			CrossRealmPK.OnPKMatchProcess(tick)

			GameWorldBoss.DoCheckWorldBossReborn(tick)
			GameWorldBoss.ProcessBossGeTui(tick)
			PlayerGeTui.ProcessNewGuyCallBackGeTui(tick)
			#GameWorldBoss.ProcessBossGeTui(tick)
			#PlayerGeTui.ProcessNewGuyCallBackGeTui(tick)
			#组队副本版本
			PlayerTeam.DoTeamProcess(tick)

			@@ -307,7 +306,7 @@
			PlayerDBOper.PyDBProccess(tick)

			#拍卖行
			AuctionHouse.OnAuctionItemTimeProcess(curTime)
			AuctionHouse.OnAuctionItemTimeProcess(curTime, tick)

			#每整分钟处理一次
			curDateTime = datetime.datetime.today()
			@@ -358,10 +357,10 @@
			GameWorldAverageLv.OpenWorldAverageLv()
			#倒计时离队处理
			PlayerTeam.DoCountdownLeaveTeamLogic(tick)
			#副本助战
			PlayerFBHelpBattle.OnMinuteProcess()
			#红包
			PlayerFamilyRedPacket.OnRedPacketMinuteProcess()
			#拍卖行
			AuctionHouse.OnAuctionItemMinuteProcess(tick)
			#每5分钟触发一次仙盟总战力更新
			if curMinute % 5 == 0:
			PlayerFamily.UpdFamilyTotalFightPower()
			@@ -1237,6 +1236,8 @@
			ChPlayer.LoadPlayerLVData()
			#加载助战信息
			PlayerFBHelpBattle.OnServerStart()
			#本服竞技场
			GameWorldArena.OnServerStart()
			#跨服PK
			CrossRealmPK.OnGameServerInitOK()
			#世界boss被杀次数重置
			@@ -1256,6 +1257,7 @@
			GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
			GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_GameWorldInitOK, 1)

			AuctionHouse.OnGameServerInitOK()
			# 注意：跨服相关信息的调用需放在最后，不然可能导致服务器未启动功能或者功能未加载成功导致跨服服务器与子服之间的数据同步可能出现异常的情况
			CrossRealmMsg.OnGameServerInitOK()
			return
			@@ -1405,8 +1407,6 @@

			# 仙盟联赛
			GameWorldFamilyWar.OnMapServerInitOK()
			# 领地争夺战
			#PlayerManorWar.OnMapServerInitOK()

			# 跨服服务器状态
			isCrossServerOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
			@@ -1415,13 +1415,16 @@

			# 跨服PK
			CrossRealmPK.OnMapServerInitOK()
			# 本服竞技场
			GameWorldArena.SendMapServerArenaInfo()

			SendAllMapGlobalDropInfo() # 全局掉落控制

			SendMapCommMapLinePlayerCount(True) # 同步一次普通地图线路人数信息
			#随机假仙盟
			PlayerFamily.RandomFakeFamily()

			#缥缈仙域
			PlayerFairyDomain.OnMapServerInitOK()
			# 记录服务器是否正常开启完毕
			getUrl = ReadChConfig.GetPyMongoConfig("EventReport", "OpenStateUrl") + "?Type=MapInit&MapCount=%s"%GameWorld.GetGameWorld().GetGameMapManager().GetCount()
			GameWorld.GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
			@@ -1928,6 +1931,8 @@
			PlayerTeam.OnServerClose(tick)
			ChPlayer.SavePlayerLVData()
			PlayerFBHelpBattle.OnServerClose()
			CrossActionControl.OnServerClose()
			GameWorldArena.OnServerClose()
			GameWorld.Log("通知C++关服！")
			GameWorld.GetGameWorld().OnServerClose()