From 1ea73e1885835466265ce788d93556b7030ee0e8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 30 十二月 2018 18:42:00 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（GM工具增加子服服务器维护，文字翻译版）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 2 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 3860726..7fc1ec5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -54,6 +54,7 @@
import PlayerSuccess
import PassiveBuffEffMng
import PlayerFamilyRedPacket
+import FormulaControl
import PlayerGoldGift
import PlayerFlashSale
import PlayerWing
@@ -1071,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
@@ -1230,6 +1233,8 @@
PlayerFamilyRedPacket.ProcessOSRedPacket(curPlayer, tick)
#限时抢购
PlayerFlashSale.ProcessFlashSaleMail(curPlayer, tick)
+ #地图经验
+ ProcessAreaExp(curPlayer, tick)
return
@@ -1435,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):
@@ -1460,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
--
Gitblit v1.8.0