Project_SG_ServerCode.git

			@@ -56,7 +56,6 @@
			import PlayerBossReborn
			import PlayerWeekParty
			import PlayerFeastWeekParty
			import PlayerFeastTravel
			import PlayerFeastLogin
			import PlayerFeastWish
			import PlayerActLogin
			@@ -85,7 +84,6 @@
			import PlayerCrossYaomoBoss
			import PlayerLuckyCloudBuy
			import PlayerLuckyTreasure
			import Item_ResetAttrPoint
			import CrossActCTGBillboard
			import CrossActAllRecharge
			import PlayerFuncSysPrivilege
			@@ -103,7 +101,6 @@
			import PlayerFaQi
			import SkillShell
			import PlayerGubao
			import PlayerShentong
			import PlayerCustomAward
			import PlayerZhanling
			import PlayerTree
			@@ -133,6 +130,7 @@
			import PlayerTalk
			import PlayerHero
			import PlayerOnline
			import PlayerBeauty
			import TurnAttack
			import PlayerHJG
			import ObjPool
			@@ -638,8 +636,6 @@
			PlayerFeastLogin.OnPlayerLogin(curPlayer)
			# 节日祝福活动
			PlayerFeastWish.OnPlayerLogin(curPlayer)
			# 节日游历活动
			PlayerFeastTravel.OnPlayerLogin(curPlayer)
			# 登录奖励活动
			PlayerActLogin.OnLogin(curPlayer)
			# 炼器活动
			@@ -724,7 +720,6 @@
			PlayerHJG.OnPlayerLogin(curPlayer)
			PlayerXiangong.OnPlayerLogin(curPlayer)
			PlayerGubao.OnPlayerLogin(curPlayer)
			PlayerShentong.OnPlayerLogin(curPlayer)
			PlayerZhanling.OnPlayerLogin(curPlayer)
			PlayerTask.OnPlayerLogin(curPlayer)
			PlayerTree.OnPlayerLogin(curPlayer)
			@@ -735,6 +730,7 @@
			UpdatePlayerName.OnPlayerLogin(curPlayer)
			PlayerActivity.OnPlayerLogin(curPlayer)
			PlayerLLMJ.OnPlayerLogin(curPlayer)
			PlayerBeauty.OnPlayerLogin(curPlayer)

			# 上线查询一次充值订单
			curPlayer.SendDBQueryRecharge()
			@@ -1581,7 +1577,7 @@
			return
			ItemCommon.ReduceItem(curPlayer, itemPack, [delIndex], 1, False, ChConfig.ItemDel_ResetAttrPoint)

			Item_ResetAttrPoint.DoResetAttrPoint(curPlayer, 0, 0, 0)
			#Item_ResetAttrPoint.DoResetAttrPoint(curPlayer, 0, 0, 0)
			return

			def NotifyPlayerBasePoint(curPlayer, syncAttrIDList=[]):
			@@ -3220,7 +3216,7 @@
			PlayerSuccess.GetSuccessAward(curPlayer, dataEx)
			# 仙树免费减时
			elif rewardType == ChConfig.Def_RewardType_TreeFreeTime:
			PlayerTree.FreeReduceTreeLVTime(curPlayer)
			PlayerTree.FreeReduceTreeLVTime(curPlayer, dataEx)
			# 广告奖励
			elif rewardType == ChConfig.Def_RewardType_ADAward:
			OnGetADAward(curPlayer, dataEx)
			@@ -3233,6 +3229,12 @@
			# 阵容推荐奖励
			elif rewardType == ChConfig.Def_RewardType_LineupRecommend:
			PlayerHero.GetLineupRecommendAward(curPlayer, dataEx, dataExStr)
			# 功能开启奖励
			elif rewardType == ChConfig.Def_RewardType_OpenFunc:
			GameFuncComm.GetFuncOpenAward(curPlayer, dataEx)
			# 红颜等级奖励
			elif rewardType == ChConfig.Def_RewardType_BeautyLVAward:
			PlayerBeauty.GetBeautyLVAward(curPlayer, dataEx)


			# 每日免费直购礼包
			@@ -3265,9 +3267,6 @@
			# 领取许愿池奖励
			elif rewardType == ChConfig.Def_RewardType_WishingWell:
			PlayerWishingWell.DoGetWishingAward(curPlayer)
			# 功能开启奖励
			elif rewardType == ChConfig.Def_RewardType_OpenFunc:
			GameFuncComm.GetFuncOpenAward(curPlayer, dataEx)
			# 领取周狂欢活动奖励
			elif rewardType == ChConfig.Def_RewardType_WeekPartyAct:
			PlayerWeekParty.GetWeekPartyActionAward(curPlayer, dataEx, dataExStr)
			@@ -3286,9 +3285,6 @@
			# 领取节日登录奖励
			elif rewardType == ChConfig.Def_RewardType_FeastLogin:
			PlayerFeastLogin.GetFeastLoginAward(curPlayer, dataEx)
			# 领取节日游历奖励
			elif rewardType == ChConfig.Def_RewardType_FeastTravel:
			PlayerFeastTravel.GetFeastTravelAward(curPlayer, dataEx)
			# 领取登录活动奖励
			elif rewardType == ChConfig.Def_RewardType_ActLoginAwardNew:
			PlayerActLoginNew.OnGetActLoginAward(curPlayer, dataEx, dataExStr)
			@@ -3378,22 +3374,31 @@
			return
			adCntMax = ipyData.GetADCntMax()
			adCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ADCnt % adID)
			if adCnt >= adCntMax:
			if adCntMax and adCnt >= adCntMax:
			GameWorld.DebugLog("今日该广告奖励已达上限! adID=%s,adCnt=%s > %s" % (adID, adCnt, adCntMax))
			return
			adCnt += 1
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ADCnt % adID, adCnt)
			awardItemList = ipyData.GetADAwardItemList()
			adMapID = ipyData.GetADMapID()
			GameWorld.DebugLog("领取广告奖励! adID=%s,adCnt=%s,adMapID=%s,awardItemList=%s" % (adID, adCnt, adMapID, awardItemList))
			adAwardType = ipyData.GetADAwardType()
			adAwardValue = ipyData.GetADAwardValue()
			GameWorld.DebugLog("领取广告奖励! adID=%s,adCnt=%s,adAwardType=%s,adAwardValue=%s,awardItemList=%s" % (adID, adCnt, adAwardType, adAwardValue, awardItemList))
			SyncADCntInfo(curPlayer, [adID])

			if adMapID:
			FBCommon.AddFBADCnt(curPlayer, adMapID)

			if awardItemList:
			ItemControler.GivePlayerItemOrMail(curPlayer, awardItemList, event=["ADAward", False, {}])

			# 领取祝福树充能奖励
			if adAwardType == 1:
			PlayerTree.GetTreeEnergyAward(curPlayer, False)
			# 副本次数
			elif adAwardType == 2:
			adMapID = adAwardValue
			FBCommon.AddFBADCnt(curPlayer, adMapID)
			# 寻宝
			elif adAwardType == 3:
			treasureType = adAwardValue
			PlayerTreasure.DoTreasure(curPlayer, treasureType, PlayerTreasure.CostType_ADFree)
			return

			def ADCntOnDay(curPlayer):
			@@ -3748,24 +3753,6 @@
			clientPack.NowMicSecond = serverTime.microsecond
			clientPack.WeekOfYear = GameWorld.GetWeekOfYear()
			NetPackCommon.SendFakePack(curPlayer, clientPack)

			#旧包先保留，之后删除
			gw = GameWorld.GetGameWorld()
			packData = ChPyNetSendPack.tagOpenServerDay()
			packData.Clear()
			packData.Day = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)
			packData.IsMixServer = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_IsMixServer)
			packData.MixDay = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_MixServerDay)
			packData.OpenWeekday = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_OpenServerWeekday)
			packData.NowYear = serverTime.year
			packData.NowMonth = serverTime.month
			packData.NowDay = serverTime.day
			packData.NowHour = serverTime.hour
			packData.NowMinute = serverTime.minute
			packData.NowSecond = serverTime.second
			packData.NowMicSecond = serverTime.microsecond
			packData.WeekOfYear = GameWorld.GetWeekOfYear()
			NetPackCommon.SendFakePack(curPlayer, packData)
			return

			#===============================================================================