From 9884f7248cae1b51d22e59b61d1c2af21141101d Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 12 十一月 2018 20:45:33 +0800
Subject: [PATCH] 4723 【后端】【1.3】仙界秘境副本进入CD在角色达到N级后取消
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
index 339cda7..17a53df 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -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
#---------------------------------------------------------------------
@@ -1237,6 +1229,10 @@
PlayerSuccess.FinishDelayAddSuccessProgress(curPlayer, tick, False)
#开服红包处理
PlayerFamilyRedPacket.ProcessOSRedPacket(curPlayer, tick)
+ #限时抢购
+ PlayerFlashSale.ProcessFlashSaleMail(curPlayer, tick)
+ #地图经验
+ ProcessAreaExp(curPlayer, tick)
return
@@ -1467,4 +1463,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
--
Gitblit v1.8.0