From f88ead93b8cc2d26ce548d5f9138b5f37737175e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 24 十二月 2018 17:16:39 +0800
Subject: [PATCH] 5372 【后端】【1.4】聚魂副本开发(玩家召唤兽不能对怪上buff)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 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..b6db6ac 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -1438,15 +1438,52 @@
         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):
     if not curPlayer.GetDictByKey(ChConfig.Def_PDict_PKStateTick):

--
Gitblit v1.8.0