SnxxServerCode.git

			@@ -54,7 +54,9 @@
			import PlayerSuccess
			import PassiveBuffEffMng
			import PlayerFamilyRedPacket
			import FormulaControl
			import PlayerGoldGift
			import PlayerFlashSale
			import PlayerWing
			import ChEquip

			@@ -461,7 +463,7 @@
			relation = BaseAttack.GetTagRelation(curPlayer, curTag, None, tick)
			#判断是否敌对关系
			if relation[0] != ChConfig.Type_Relation_Enemy :
			AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1])
			#AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1])
			return

			return curTag
			@@ -532,7 +534,7 @@

			if tick - curPlayer.GetPlayerActionTick() < curPlayer.GetPrepareTime():
			#时间间隔没有到
			if prepareState == IPY_GameWorld.pstCollecting:
			if prepareState in [IPY_GameWorld.pstCollecting, IPY_GameWorld.pstMissionCollecting]:
			FBLogic.OnCollecting(curPlayer, tick)

			return
			@@ -571,16 +573,6 @@
			mapID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TransMapId)
			posX = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TransPosX)
			posY = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TransPosY)

			#执行逻辑，应该在入口设置好消耗，这边只是扣除
			#=======================================================================
			# isFreedomTransBuff = SkillCommon.GetPlayerBuffBySkillTypeID(curPlayer, ShareDefine.Def_FreedomTransBuffID)
			# if transportType == ChConfig.Def_Transport_Type_BigMap or not isFreedomTransBuff:
			# isAutoBuy = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TransAutoBuyItem)
			# #传送支付处理
			# if not ChPlayer.PayForTransport(curPlayer, transportType, isAutoBuy):
			# return
			#=======================================================================

			if not TransCostAfterPrepare(curPlayer):
			return
			@@ -637,7 +629,7 @@
			if not result:
			return

			FBLogic.OnCollectOK(curPlayer, tick)
			FBLogic.OnCollectOK(curPlayer, curNPC.GetNPCID(), tick)
			return

			#---------------------------------------------------------------------
			@@ -1080,7 +1072,9 @@
			## 装备有效时间到了需要脱下，有效时间物品改成不消失，但是无使用效果可出售和续费
			def __DoLogic_ProcessTimeEquip(curPlayer, curItem, equipIndex):
			#验证物品是否过期
			curItemExpireTime = curItem.GetExpireTime()
			curItemExpireTime = curItem.GetUserAttr(ShareDefine.Def_IudetExpireTime)
			if not curItemExpireTime:
			curItemExpireTime = curItem.GetExpireTime()
			curItemPastTime = time.time() - curItem.GetUserAttr(ShareDefine.Def_IudetCreateTime)
			if curItemExpireTime - curItemPastTime > 0:
			return
			@@ -1237,6 +1231,10 @@
			PlayerSuccess.FinishDelayAddSuccessProgress(curPlayer, tick, False)
			#开服红包处理
			PlayerFamilyRedPacket.ProcessOSRedPacket(curPlayer, tick)
			#限时抢购
			PlayerFlashSale.ProcessFlashSaleMail(curPlayer, tick)
			#地图经验
			ProcessAreaExp(curPlayer, tick)
			return


			@@ -1442,14 +1440,51 @@
			curPlayer.SetDict(ChConfig.Def_PDict_PKStateTick, 0)
			curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_PKState, 0, False)
			#GameWorld.DebugLog("退出PK状态!", curPlayer.GetPlayerID())
			curPlayer.SetDict("StartProDTick", tick) # 开始恢复时间点

			bossStateTick = curPlayer.GetDictByKey(ChConfig.Def_PDict_BossStateTick)
			if bossStateTick and (tick - bossStateTick) >= validTime:
			curPlayer.SetDict(ChConfig.Def_PDict_BossStateTick, 0)
			curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_BossState, 0, False)
			#GameWorld.DebugLog("退出Boss状态!", curPlayer.GetPlayerID())


			# 脱离PK战斗 X秒后按比例恢复
			ProcessProDef(curPlayer, tick)
			return

			# 脱离PK战斗 X秒后按比例恢复
			def ProcessProDef(curPlayer, tick):
			if PlayerControl.GetProDefHPPer(curPlayer) == 0:
			# 没转化值
			return

			# 脱离PK战斗 X秒后按比例恢复
			if IsInPKState(curPlayer):
			return

			if tick - curPlayer.GetDictByKey("StartProDTick") < IpyGameDataPY.GetFuncCfg("MagicExterior", 2) * 1000:
			return

			if curPlayer.GetPlayerAction() == IPY_GameWorld.paDie:
			return

			# 每秒恢复
			if tick - curPlayer.GetDictByKey("restoreProDTick") < 1000:
			return

			curProDef = PlayerControl.GetProDef(curPlayer)
			maxProDef = PlayerControl.GetMaxProDef(curPlayer)

			if curProDef == maxProDef:
			return

			#非PK状态恢复护盾
			PlayerControl.SetProDef(curPlayer, min(curProDef + \
			IpyGameDataPY.GetFuncCfg("MagicExterior", 3)*maxProDef/ChConfig.Def_MaxRateValue, maxProDef))
			curPlayer.SetDict("restoreProDTick", tick)

			return


			def IsInPKState(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PDict_PKStateTick) > 0
			def SetPKStateTick(curPlayer, tick):
			@@ -1467,4 +1502,27 @@
			#GameWorld.DebugLog("设置Boss状态tick!tick=%s" % tick, curPlayer.GetPlayerID())
			return

			def ProcessAreaExp(curPlayer, tick):
			##给场景经验
			mapID = GameWorld.GetMap().GetMapID()
			neutralMapExpAwardDict = IpyGameDataPY.GetFuncEvalCfg('NeutralMapExpAward', 1, {})
			expAwardInfo = GameWorld.GetDictValueByKey(neutralMapExpAwardDict, mapID)
			if not expAwardInfo:
			return
			if len(expAwardInfo) != 2:
			return
			secondCD, expFormula = expAwardInfo
			lastTick = curPlayer.GetDictByKey(ChConfig.Def_PDict_MapAreaExpTick)
			if not lastTick:
			curPlayer.SetDict(ChConfig.Def_PDict_MapAreaExpTick, tick)
			return
			if tick - lastTick < secondCD:
			return
			curPlayer.SetDict(ChConfig.Def_PDict_MapAreaExpTick, tick)

			reExp = PlayerControl.GetPlayerReExp(curPlayer)
			reLV = curPlayer.GetLV()
			worldLV = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)
			addExp = eval(FormulaControl.GetCompileFormula('NeutralMapExpAward%s'%mapID, expFormula))
			PlayerControl.PlayerControl(curPlayer).AddExp(addExp)
			return