From e082d496795bd07657a81714bab4a5a63446e397 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 12 四月 2019 16:41:10 +0800
Subject: [PATCH] 6491 子 【2.0】【开发】打宝界面和境界压制调整 / 【2.0】【后端】打宝界面和境界压制调整

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
index 7a07176..22e5cba 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
@@ -36,6 +36,8 @@
 import NPCCommon
 import FBHelpBattle
 import PlayerActLogin
+import PlayerPet
+import PlayerHorse
 
 import math
 
@@ -119,12 +121,16 @@
 #  @param tick 时间戳
 #  @return 布尔值
 def OnEnterFBEvent(curPlayer, mapID, lineID, tick):
-    if lineID == 0:
-        return True
-    historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID-1, False, [mapID])
-    needStar = IpyGameDataPY.GetFuncCfg('MunekadoLockLimit')
-    if historyStar < needStar:
-        GameWorld.DebugLog('    上一层评级未达到%s,无法挑战本层!' % needStar)
+    if lineID != 0:
+        historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID-1, False, [mapID])
+        needStar = IpyGameDataPY.GetFuncCfg('MunekadoLockLimit')
+        if historyStar < needStar:
+            GameWorld.DebugLog('    上一层评级未达到%s,无法挑战本层!' % needStar)
+            return False
+    #坐骑与灵宠总等级
+    needSumLV = IpyGameDataPY.GetFuncEvalCfg('MunekadoLockLimit', 2, {}).get(lineID, 0)
+    if PlayerPet.GetTotalPetLV(curPlayer) + PlayerHorse.GetHorseSumLV(curPlayer) < needSumLV:
+        GameWorld.DebugLog('    坐骑与灵宠总等级未达到%s,无法挑战本层!' % needSumLV)
         return False
     return True
 

--
Gitblit v1.8.0