From 0c27822ef5e6c67782ed143a4ff03ecfbdfda1fb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 23 五月 2022 16:52:58 +0800
Subject: [PATCH] 9415 【BT】【后端】古神战场(副本内功能完整版本)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 f6781a1..b78c037 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -4308,11 +4308,16 @@
         if not __RebornCost(curPlayer, rebornType, False):
             return
         
+    # 副本额外验证
+    if not FBLogic.OnCanFBReborn(curPlayer, rebornType):
+        return
+    
     return True
 
 def __RebornCost(curPlayer, rebornType, isDoCost):
     ## 扣除复活消耗
     # @param isDoCost: 是否执行消耗
+    crossMapID = PlayerControl.GetCrossMapID(curPlayer)
     playerID = curPlayer.GetPlayerID()
     if rebornType == ChConfig.rebornType_Health:
         rebornCfg = IpyGameDataPY.GetFuncEvalCfg('RebornArguments', 1)
@@ -4328,7 +4333,11 @@
                     return
                 
     elif rebornType == ChConfig.rebornType_UseItem:
-        rebornItem = ItemCommon.FindItemInPackByEffectEx(curPlayer, ChConfig.Def_Effect_Reborn)
+        if crossMapID == ChConfig.Def_FBMapID_CrossBattlefield:
+            rebornItemID = IpyGameDataPY.GetFuncCfg("CrossBattlefieldReborn", 1)
+            rebornItem = ItemCommon.FindItemInPackByItemID(curPlayer, rebornItemID, IPY_GameWorld.rptItem)
+        else:
+            rebornItem = ItemCommon.FindItemInPackByEffectEx(curPlayer, ChConfig.Def_Effect_Reborn)
         if not rebornItem:
             GameWorld.ErrLog("复活道具不足,无法原地复活! ", playerID)                
             return

--
Gitblit v1.8.0