From e261fda74c51592a8e83175f3a7386f48ed13df4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 28 十一月 2018 16:46:56 +0800
Subject: [PATCH] 4762 【后端】修复开关服后助战次数信息加载失败bug;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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 17a53df..99e49a4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -1438,13 +1438,30 @@
         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秒后按比例恢复
+    if not IsInPKState(curPlayer):
+        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
+        #非PK状态恢复护盾
+        PlayerControl.SetProDef(curPlayer, min(PlayerControl.GetProDef(curPlayer) + \
+                    IpyGameDataPY.GetFuncCfg("MagicExterior", 3)*PlayerControl.GetMaxProDef(curPlayer)/ChConfig.Def_MaxRateValue, \
+                    PlayerControl.GetMaxProDef(curPlayer)))
+        curPlayer.SetDict("restoreProDTick", tick)
     return
 
 def IsInPKState(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PDict_PKStateTick) > 0

--
Gitblit v1.8.0