Project_SG_ServerCode.git

			@@ -27,24 +27,18 @@
			import PlayerCoin
			import PlayerControl
			import PlayerFamily
			import PlayerFamilyZhenfa
			import PlayerOnlinePrize
			import PlayerLoginDayAward
			import NPCCommon
			import FunctionNPCCommon
			import PlayerGoldGift
			import PlayerActivity
			import FBCommon
			import PlayerSuccess
			import PlayerFreeGoods
			import ChItem
			import GameLogic_Tianzi
			import PlayerGoldInvest
			import PlayerCrossRealmPK
			import PlayerCrossChampionship
			import PlayerPet
			import PlayerRecover
			import PlayerFamilyRedPacket
			import OpenServerCampaign
			import PlayerCostRebate
			import CrossActCTGBillboard
			import CrossActAllRecharge
			@@ -62,10 +56,8 @@
			import PlayerActTurntable
			import PlayerActBuyOne
			import PlayerSpringSale
			import PlayerBossReborn
			import PlayerWeekParty
			import PlayerFeastWeekParty
			import PlayerFeastTravel
			import PlayerFeastLogin
			import PlayerFeastWish
			import PlayerActTask
			@@ -77,8 +69,6 @@
			import PlayerFlashGiftbag
			import PlayerDailyGiftbag
			import PlayerOfflineSupport
			import PlayerFeastRedPacket
			import PlayerCrossYaomoBoss
			import PlayerLuckyCloudBuy
			import PlayerLuckyTreasure
			import PlayerTongTianLing
			@@ -91,12 +81,15 @@
			import IpyGameDataPY
			import PlayerArena
			import PyGameData
			import OpenServerActivity
			import PlayerXiangong
			import PlayerBillboard
			import PlayerViewCache
			import GameFuncComm
			import PlayerMail
			import PlayerHero
			import PlayerTree
			import PlayerLLMJ

			import datetime
			import time
			@@ -111,10 +104,13 @@
			def DoLogic_OnDay(tick):
			GameWorld.Log("MapServer -> OnDay!")
			#副本OnDay事件响应
			FBLogic.OnDay(tick)
			#FBLogic.OnDay(tick)

			OpenServerActivity.OnDay()
			#仙盟
			PlayerFamily.FamilyOnDay()
			PlayerArena.OnDay()
			GameLogic_Tianzi.OnDay()

			PlayerOfflineSupport.OnDay()
			playerManager = GameWorld.GetPlayerManager()
			@@ -153,6 +149,8 @@

			def DoLogic_OnWeek(tick):
			GameWorld.Log("MapServer -> OnWeek!")

			PlayerArena.OnWeek()

			playerManager = GameWorld.GetPlayerManager()
			for i in xrange(playerManager.GetPlayerCount()):
			@@ -235,6 +233,10 @@
			playerID = curPlayer.GetPlayerID()
			GameWorld.Log("PlayerOnDay! ondayValue=%s" % (ondayValue), playerID)

			# 过天同步下时间、开服天
			ChPlayer.Sync_PyServerDataTimeToClient(curPlayer)
			ChPlayer.Sync_OpenServerDay(curPlayer)

			__DoPlayerOnDay(curPlayer, ShareDefine.Def_OnEventType)
			__DoPlayerOnDay(curPlayer, ShareDefine.Def_OnEventTypeEx)

			@@ -248,18 +250,9 @@

			# 常规过天
			if onEventType == ShareDefine.Def_OnEventType:

			#开服活动
			OpenServerCampaign.OnOpenServerCampaignDay(curPlayer)

			GameFuncComm.DoFuncOpenLogic(curPlayer)
			#清空每日事件奖励
			curPlayer.SetDayProcessGameEventCount(0)

			#重置宠物每天的训练次数
			#PlayerPet.DoLogic_PetInfo_OnDay(curPlayer)

			PlayerOnlinePrize.ResetPrizeInfoOnDay(curPlayer)


			#OnDay时清除每日签到的信息
			PlayerSignDay.SignDayOnDay(curPlayer)
			@@ -270,8 +263,6 @@

			PlayerCoin.OnDay(curPlayer)
			PlayerTree.PlayerOnDay(curPlayer)
			#成就
			PlayerSuccess.SuccOnDay(curPlayer)
			#投资
			PlayerGoldInvest.OnDay(curPlayer)
			#战令
			@@ -285,32 +276,16 @@
			PlayerLove.DoPlayerOnDay(curPlayer)
			#仙宫
			PlayerXiangong.PlayerOnDay(curPlayer)
			PlayerControl.PayCoinOnDay(curPlayer)
			#玩法前瞻奖励
			gameNoticeAwardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GameNoticeAwardState)
			if gameNoticeAwardState:
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_GameNoticeAwardState, 0)
			ChPlayer.Sync_RewardGetRecordInfo(curPlayer, ChConfig.Def_RewardType_GameNotice, 0)
			#每日分享奖励重置
			shareGameAwardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ShareGameAwardState)
			if shareGameAwardState:
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ShareGameAwardState, 0)
			ChPlayer.Sync_RewardGetRecordInfo(curPlayer, ChConfig.Def_RewardType_ShareGame, 0)
			#开服每日奖励
			awardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OpenSererDailyAward)
			if awardState:
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OpenSererDailyAward, 0)
			ChPlayer.Sync_RewardGetRecordInfo(curPlayer, ChConfig.Def_RewardType_OpenServerDailyAward, 0)
			#开服每日奖励
			awardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RechargeDayAward)
			if awardState:
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_RechargeDayAward, 0)
			ChPlayer.Sync_RewardGetRecordInfo(curPlayer, ChConfig.Def_RewardType_RechargeDayAward, 0)
			PlayerControl.PlayerOnDay(curPlayer)
			ChPlayer.PlayerOnDay(curPlayer)
			PlayerActivity.OnDay(curPlayer)
			PlayerLLMJ.PlayerOnDay(curPlayer)
			FunctionNPCCommon.ShopItemOnDay(curPlayer)
			OpenServerActivity.PlayerOnDay(curPlayer)

			# 特殊时间点X点过天
			elif onEventType == ShareDefine.Def_OnEventTypeEx:
			PlayerHero.PlayerOnDay(curPlayer)
			# 资源找回
			PlayerRecover.RecoverOnDay(curPlayer)
			# 仙盟过天
			PlayerFamily.PlayerOnDay(curPlayer)
			# 重置物品每日使用次数
			@@ -330,15 +305,6 @@

			# 以下为支持两种重置模式切换配置的
			FBCommon.FBOnDay(curPlayer, onEventType)

			#日常活动OnDay
			PlayerActivity.OnDay(curPlayer, onEventType)

			# 商店物品购买兑换OnDay
			FunctionNPCCommon.ShopItemOnDay(curPlayer, onEventType)

			# 仙盟红包OnDay
			PlayerFamilyRedPacket.RedPacketOnDay(curPlayer, onEventType)
			#许愿池
			PlayerWishingWell.OnDay(curPlayer)
			#通天令
			@@ -427,11 +393,10 @@

			#计算这一周的家族的活跃度
			CalcFamilyActiveValue(curPlayer)
			#成就Onweek
			PlayerSuccess.OnWeek(curPlayer)

			# 每周提示玩家提示vip等级加入贵宾俱乐部
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_HasVIPClubNote, 0)
			FunctionNPCCommon.ShopItemOnWeek(curPlayer)

			elif onEventType == ShareDefine.Def_OnEventTypeEx:
			#竞技场
			@@ -440,12 +405,6 @@

			# 以下为支持两种重置模式切换配置的
			FBCommon.FBOnWeek(curPlayer, onEventType)

			#日常活动OnWeek
			PlayerActivity.OnWeek(curPlayer, onEventType)

			# 商店物品购买兑换OnDay
			FunctionNPCCommon.ShopItemOnWeek(curPlayer, onEventType)
			return

			#---------------------------------------------------------------------
			@@ -486,8 +445,6 @@
			pass
			#OnMonthEx

			# 商店物品购买兑换OnMonth
			FunctionNPCCommon.ShopItemOnMonth(curPlayer, onEventType)
			return

			#---------------------------------------------------------------------
			@@ -897,14 +854,6 @@
			PyGameData.FBOpenTimeRecord = eval(msgValue)
			return

			if key == ShareDefine.Def_Notify_WorldKey_VSFamilyInfo:
			PyGameData.VSFamilyInfo = eval(msgValue)
			return

			if key == ShareDefine.Def_Notify_WorldKey_FamilyZhenfaInfo:
			PlayerFamilyZhenfa.GameServer_FamilyZhenfa(eval(msgValue))
			return

			if key == ShareDefine.Def_Notify_WorldKey_CoupleInfo:
			syncCoupleInfo = eval(msgValue)
			for playerID, coupleInfo in syncCoupleInfo.items():
			@@ -949,9 +898,6 @@

			elif actionName == ShareDefine.OperationActionName_SpringSale:
			PlayerSpringSale.RefreshSpringSaleActionInfo(actNum)

			elif actionName == ShareDefine.OperationActionName_BossReborn:
			PlayerBossReborn.RefreshOperationAction_BossReborn()

			elif actionName == ShareDefine.OperationActionName_FlashGiftbag:
			PlayerFlashGiftbag.RefreshFlashGiftbagActionInfo(actNum)
			@@ -1001,14 +947,8 @@
			elif actionName == ShareDefine.OperationActionName_FeastWish:
			PlayerFeastWish.RefreshFeastWishActionInfo()

			elif actionName == ShareDefine.OperationActionName_FeastTravel:
			PlayerFeastTravel.RefreshFeastTravelActionInfo()

			elif actionName == ShareDefine.OperationActionName_FeastWeekParty:
			PlayerFeastWeekParty.RefreshOperationAction_FeastWeekParty()

			elif actionName == ShareDefine.OperationActionName_FeastRedPacket:
			PlayerFeastRedPacket.RefreshOperationAction_FeastRedPacket()

			elif actionName == ShareDefine.OperationActionName_LuckyTreasure:
			PlayerLuckyTreasure.RefreshLuckyTreasureAction()
			@@ -1054,16 +994,6 @@
			PyGameData.g_crossZoneName = msgValue
			return

			if key == ShareDefine.Def_Notify_WorldKey_CrossServerTime:
			PyGameData.g_crossServerTimeInfo = eval(msgValue)
			playerManager = GameWorld.GetPlayerManager()
			for index in xrange(playerManager.GetPlayerCount()):
			curPlayer = playerManager.GetPlayerByIndex(index)
			if not GameWorld.IsNormalPlayer(curPlayer):
			continue
			ChPlayer.Sync_PyServerDataTimeToClient(curPlayer)
			return

			# 幸运云购
			if key == ShareDefine.Def_Notify_WorldKey_LuckyCloudBuyInfo:
			PyGameData.g_luckyCloudBuyInfo = eval(msgValue)
			@@ -1100,11 +1030,6 @@
			# 跨服PK
			elif key == ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID:
			PlayerCrossRealmPK.OnCrossRealmPKSeasonChange(value)

			# 跨服妖魔boss
			elif key == ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.CrossDailyActionID_YaomoBoss:
			if gameWorldMgr.GetGameWorldDictByKey(key) != value:
			PlayerCrossYaomoBoss.OnYaomoBossStateChange(value, tick)

			#通用设置
			befValue = gameWorldMgr.GetGameWorldDictByKey(key)