Project_SG_ServerCode.git

			@@ -53,7 +53,6 @@
			import PlayerCrossChampionship
			import GameFuncComm
			import PlayerFamilyTaofa
			import PlayerBossReborn
			import PlayerWeekParty
			import PlayerFeastWeekParty
			import PlayerFeastLogin
			@@ -80,7 +79,6 @@
			import PlayerActManyDayRecharge
			import PlayerActSingleRecharge
			import PlayerSpringSale
			import GY_Query_BossFirstKill
			import PlayerCrossYaomoBoss
			import PlayerLuckyCloudBuy
			import PlayerLuckyTreasure
			@@ -89,6 +87,7 @@
			import PlayerFuncSysPrivilege
			import PlayerActTurntable
			import PlayerTongTianLing
			import OpenServerActivity
			import CrossRealmPlayer
			import ChNetSendPack
			import PlayerArena
			@@ -134,7 +133,6 @@
			import PlayerTravel
			import TurnAttack
			import PlayerHJG
			import ObjPool

			import datetime
			import time
			@@ -617,8 +615,6 @@
			#PassiveBuffEffMng.OnLoginGFPassive(curPlayer)
			# 极品白拿
			PlayerFreeGoods.OnLogin(curPlayer)
			# BOSS复活活动
			PlayerBossReborn.OnLogin(curPlayer)
			# 周狂欢活动
			PlayerWeekParty.OnLogin(curPlayer)
			# 购买次数礼包活动
			@@ -664,8 +660,6 @@
			PlayerFB.OnLogin(curPlayer)
			#技能专精信息
			#SkillShell.NotifyElementSkillInfo(curPlayer)
			#Boss首杀
			GY_Query_BossFirstKill.OnPlayerLogin(curPlayer)
			#通天令
			PlayerTongTianLing.OnPlayerLogin(curPlayer)
			#创角奖励
			@@ -702,7 +696,7 @@
			curPlayer.SetState(0) # 脱机挂恢复为正常上线
			curPlayer.SetCountryLastWeekHornor(0) # 通知数据库是否保存还是下线，做一次恢复，1为保存 0为正常下线

			PlayerControl.DoGMForbidenTalkOnLogin(curPlayer)
			PlayerControl.OnPlayerLogin(curPlayer)
			DataRecordPack.DR_PlayerLogin(curPlayer) # 放最后，记录等级、经验等信息
			return

			@@ -735,6 +729,7 @@
			PlayerLLMJ.OnPlayerLogin(curPlayer)
			PlayerBeauty.OnPlayerLogin(curPlayer)
			PlayerTravel.OnPlayerLogin(curPlayer)
			OpenServerActivity.OnPlayerLogin(curPlayer)

			# 上线查询一次充值订单
			# curPlayer.SendDBQueryRecharge() 不查了，由在线轮询触发即可
			@@ -768,8 +763,7 @@
			# 特殊说明：如果地图没有完全初始化好，客户端断开或者异常等情况会触发RunGateGameServerMapServerKickOutPlayerNoSave
			# 那么在DoPlayerLogin 中设置的数据将不会被保存，如会导致第一个任务重复触发问题，记录多次发送
			EventReport.WriteEvent_Entry(curPlayer, 4)
			#EventReport.EventReport(ShareDefine.Def_UserAction_FirstLogin, "", curPlayer)


			curPlayer.SetFightPoint(1) # 初始化为1倍消耗

			#---补满血满魔---
			@@ -1025,7 +1019,6 @@

			#检查更新总战斗力
			#PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer, True)
			EventReport.WriteEvent_FightPower(curPlayer)

			#清除在本地图离线记录信息
			PlayerControl.RemoveLeaveServerPlayerInfo(curPlayer.GetPlayerID())
			@@ -3194,6 +3187,9 @@
			# 领取分包下载奖励
			elif rewardType == ChConfig.Def_RewardType_DownLoad:
			GetDownloadAward(curPlayer, dataEx)
			# 开服庆典积分阶段奖励
			elif rewardType == ChConfig.Def_RewardType_OSACelebrationPointAward:
			OpenServerActivity.GetOSACelebrationPointAward(curPlayer, dataEx)


			# 每日免费直购礼包
			@@ -3220,9 +3216,6 @@
			# 领取单笔累充领取
			elif rewardType == ChConfig.Def_RewardType_SingleRecharge:
			PlayerActSingleRecharge.OnGetSingleRechargeAward(curPlayer, dataEx, dataExStr)
			# 领取boss复活活动奖励
			elif rewardType == ChConfig.Def_RewardType_BossReborn:
			PlayerBossReborn.GetBossRebornActionAward(curPlayer, dataEx)
			# 领取许愿池奖励
			elif rewardType == ChConfig.Def_RewardType_WishingWell:
			PlayerWishingWell.DoGetWishingAward(curPlayer)
			@@ -3386,7 +3379,7 @@
			adCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ADCnt % adID)
			if not adCnt and syncADIDList == None:
			continue
			adInfo = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCADInfo)
			adInfo = ChPyNetSendPack.tagSCADInfo()
			adInfo.ADID = adID
			adInfo.ADCnt = adCnt
			adInfoList.append(adInfo)
			@@ -3394,7 +3387,7 @@
			if not adInfoList:
			return

			clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCADInfoList)
			clientPack = ChPyNetSendPack.tagSCADInfoList()
			clientPack.ADInfoList = adInfoList[:255]
			clientPack.Count = len(clientPack.ADInfoList)
			NetPackCommon.SendFakePack(curPlayer, clientPack)