From cdcd834e0f57bc91ba002775f808e7c0fe7a5777 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 07 一月 2019 17:15:39 +0800
Subject: [PATCH] 5746 【后端】【1.5】仙盟联赛副本中死亡支持玩家使用原地复活(与现有的原地复活逻辑一致)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 47b0c39..df300e4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -3750,6 +3750,11 @@
 #@return 死亡冷却时间
 def GetRebronTime(curPlayer, playerRebornType):
     mapType = GameWorld.GetMap().GetMapFBType()
+    
+    if playerRebornType in [ChConfig.rebornType_Health, ChConfig.rebornType_UseItem]:
+        #原地复活、道具复活不用CD
+        return 0
+    
     # 副本地图CD
     if mapType != IPY_GameWorld.fbtNull:
         fbRebornTimeDict = IpyGameDataPY.GetFuncEvalCfg('DuplicatesRebornTime', 1)
@@ -3757,9 +3762,7 @@
         if curMapID in fbRebornTimeDict:
             return fbRebornTimeDict[curMapID]
         return fbRebornTimeDict.get(0, 0)
-    if playerRebornType in [ChConfig.rebornType_Health, ChConfig.rebornType_UseItem]:
-        #原地复活、道具复活不用CD
-        return 0
+    
     if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_IsAddReviveTired):
         findBuff = SkillCommon.FindBuffByID(curPlayer, ChConfig.Def_SkillID_ReviveTired)[0]
         if findBuff:

--
Gitblit v1.8.0