From 4b411bb19ecb34dacf6792220d5ffb79afb9d022 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 19 四月 2019 17:55:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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..9750a4f 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
@@ -474,7 +480,7 @@
if lineID < 2:
GameWorld.DebugLog("前两层不能扫荡!")
return
- historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID-1, False, [mapID])
+ historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, False, [mapID])
if historyStar < 5:
GameWorld.DebugLog("没有S级不能扫荡!")
return
--
Gitblit v1.8.0