Project_SG_ServerCode.git

			@@ -27,33 +27,23 @@
			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
			import PlayerActCollectWords
			import PlayerActTotalRecharge
			import PlayerActGarbageSorting
			import PlayerActXianXiaMJ
			import PlayerActGubao
			import PlayerActHorsePetTrain
			import PlayerActLianqi
			import PlayerActGodGift
			import PlayerActFamilyGCZ
			@@ -64,7 +54,6 @@
			import PlayerActRechargePrize
			import PlayerActGrowupBuy
			import PlayerActTurntable
			import PlayerActBossTrial
			import PlayerActBuyOne
			import PlayerSpringSale
			import PlayerBossReborn
			@@ -82,9 +71,6 @@
			import PlayerFlashGiftbag
			import PlayerDailyGiftbag
			import PlayerOfflineSupport
			import PlayerActHorsePetFeast
			import PlayerFeastRedPacket
			import PlayerCrossYaomoBoss
			import PlayerLuckyCloudBuy
			import PlayerLuckyTreasure
			import PlayerTongTianLing
			@@ -97,14 +83,13 @@
			import IpyGameDataPY
			import PlayerArena
			import PyGameData
			import PlayerGuaji
			import PlayerXiangong
			import PlayerMineArea
			import PlayerBillboard
			import PlayerViewCache
			import PlayerMail
			import PlayerHero
			import PlayerTree
			import PlayerLLMJ

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

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

			PlayerOfflineSupport.OnDay()
			playerManager = GameWorld.GetPlayerManager()
			@@ -161,6 +148,8 @@

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

			PlayerArena.OnWeek()

			playerManager = GameWorld.GetPlayerManager()
			for i in xrange(playerManager.GetPlayerCount()):
			@@ -257,17 +246,8 @@
			# 常规过天
			if onEventType == ShareDefine.Def_OnEventType:

			#开服活动
			OpenServerCampaign.OnOpenServerCampaignDay(curPlayer)

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

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

			PlayerOnlinePrize.ResetPrizeInfoOnDay(curPlayer)


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

			PlayerCoin.OnDay(curPlayer)
			PlayerTree.PlayerOnDay(curPlayer)
			#成就
			PlayerSuccess.SuccOnDay(curPlayer)
			#投资
			PlayerGoldInvest.OnDay(curPlayer)
			#战令
			@@ -294,31 +272,14 @@
			#仙宫
			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)
			ChPlayer.PlayerOnDay(curPlayer)
			PlayerActivity.OnDay(curPlayer)
			PlayerLLMJ.PlayerOnDay(curPlayer)
			FunctionNPCCommon.ShopItemOnDay(curPlayer)

			# 特殊时间点X点过天
			elif onEventType == ShareDefine.Def_OnEventTypeEx:
			PlayerHero.PlayerOnDay(curPlayer)
			# 资源找回
			PlayerRecover.RecoverOnDay(curPlayer)
			# 仙盟过天
			PlayerFamily.PlayerOnDay(curPlayer)
			# 重置物品每日使用次数
			@@ -333,30 +294,15 @@
			PlayerCrossChampionship.DoPlayerOnDay(curPlayer)
			#竞技场
			PlayerArena.OnDayEx(curPlayer)
			#福地
			PlayerMineArea.PlayerOnDay(curPlayer)
			#挂机
			PlayerGuaji.PlayerOnDay(curPlayer)
			#特殊时间点过天的，一般是游戏功能，此时立即同步一次跨服玩家数据
			CrossPlayerData.SendMergePlayerDataNow(curPlayer)

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

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

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

			# 仙盟红包OnDay
			PlayerFamilyRedPacket.RedPacketOnDay(curPlayer, onEventType)
			#许愿池
			PlayerWishingWell.OnDay(curPlayer)
			#通天令
			PlayerTongTianLing.OnDay(curPlayer, onEventType)
			#bossƾ֤
			PlayerActBossTrial.PlayerOnDay(curPlayer, onEventType)
			#任务活动
			PlayerActTask.OnDay(curPlayer)
			#登录活动
			@@ -441,11 +387,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:
			#竞技场
			@@ -454,12 +399,6 @@

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

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

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

			#---------------------------------------------------------------------
			@@ -500,8 +439,6 @@
			pass
			#OnMonthEx

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

			#---------------------------------------------------------------------
			@@ -911,14 +848,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,18 +878,6 @@
			elif actionName == ShareDefine.OperationActionName_TotalRecharge:
			PlayerActTotalRecharge.RefreshTotalRechargeActionInfo(actNum)

			elif actionName == ShareDefine.OperationActionName_GarbageSorting:
			PlayerActGarbageSorting.RefreshGarbageSortingActionInfo(actNum)

			elif actionName == ShareDefine.OperationActionName_XianXiaMJ:
			PlayerActXianXiaMJ.RefreshXianXiaMJActionInfo(actNum)

			elif actionName == ShareDefine.OperationActionName_Gubao:
			PlayerActGubao.RefreshGubaoActionInfo(actNum)

			elif actionName == ShareDefine.OperationActionName_HorsePetTrain:
			PlayerActHorsePetTrain.RefreshHorsePetTrainActionInfo(actNum)

			elif actionName == ShareDefine.OperationActionName_GodGift:
			PlayerActGodGift.RefreshGodGiftActionInfo(actNum)

			@@ -978,12 +895,6 @@

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

			elif actionName == ShareDefine.OperationActionName_BossTrial:
			PlayerActBossTrial.RefreshBossTrialActionInfo(actNum)

			elif actionName == ShareDefine.OperationActionName_HorsePetFeast:
			PlayerActHorsePetFeast.RefreshOperationAction_HorsePetFeast(actNum)

			elif actionName == ShareDefine.OperationActionName_FlashGiftbag:
			PlayerFlashGiftbag.RefreshFlashGiftbagActionInfo(actNum)
			@@ -1039,9 +950,6 @@
			elif actionName == ShareDefine.OperationActionName_FeastWeekParty:
			PlayerFeastWeekParty.RefreshOperationAction_FeastWeekParty()

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

			elif actionName == ShareDefine.OperationActionName_LuckyTreasure:
			PlayerLuckyTreasure.RefreshLuckyTreasureAction()

			@@ -1073,18 +981,6 @@

			elif actionName == ShareDefine.CrossActName_AllRecharge:
			CrossActAllRecharge.RefreshCrossActAllRechargeInfo()

			elif actionName == ShareDefine.CrossActName_BossTrial:
			PlayerActBossTrial.RefreshCrossActBossTrialInfo()

			elif actionName == ShareDefine.CrossActName_XianXiaMJ:
			PlayerActXianXiaMJ.RefreshCrossActXianXiaMJInfo()

			elif actionName == ShareDefine.CrossActName_Gubao:
			PlayerActGubao.RefreshCrossActGubaoInfo()

			elif actionName == ShareDefine.CrossActName_HorsePetTrain:
			PlayerActHorsePetTrain.RefreshCrossActHorsePetTrainInfo()

			elif actionName == ShareDefine.CrossActName_Lianqi:
			PlayerActLianqi.RefreshCrossActLianqiInfo()
			@@ -1144,11 +1040,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)