Project_SG_ServerCode.git

			@@ -28,7 +28,6 @@
			import PlayerControl
			import PlayerFamily
			import PlayerFamilyZhenfa
			import PlayerOnlinePrize
			import PlayerLoginDayAward
			import NPCCommon
			import FunctionNPCCommon
			@@ -38,11 +37,11 @@
			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
			@@ -78,7 +77,6 @@
			import PlayerDailyGiftbag
			import PlayerOfflineSupport
			import PlayerFeastRedPacket
			import PlayerCrossYaomoBoss
			import PlayerLuckyCloudBuy
			import PlayerLuckyTreasure
			import PlayerTongTianLing
			@@ -111,10 +109,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()
			@@ -153,6 +153,8 @@

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

			PlayerArena.OnWeek()

			playerManager = GameWorld.GetPlayerManager()
			for i in xrange(playerManager.GetPlayerCount()):
			@@ -258,9 +260,6 @@
			#重置宠物每天的训练次数
			#PlayerPet.DoLogic_PetInfo_OnDay(curPlayer)

			PlayerOnlinePrize.ResetPrizeInfoOnDay(curPlayer)


			#OnDay时清除每日签到的信息
			PlayerSignDay.SignDayOnDay(curPlayer)
			# 累计登陆礼包登陆次数刷新
			@@ -286,31 +285,12 @@
			#仙宫
			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)

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

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

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

			# 商店物品购买兑换OnDay
			FunctionNPCCommon.ShopItemOnDay(curPlayer, onEventType)
			@@ -440,9 +417,6 @@

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

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

			# 商店物品购买兑换OnDay
			FunctionNPCCommon.ShopItemOnWeek(curPlayer, onEventType)
			@@ -1100,11 +1074,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)