From f58688b45e5d7e36c528f46bfe2392a2c262cbf9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 09 一月 2026 10:54:34 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（主线装备掉落最后一档品质必掉保底未配置时不累加保底值；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
index 71ebe8c..b370c04 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
@@ -29,7 +29,6 @@
import FBLogic
import IpyGameDataPY
import ShareDefine
-import NPCCommon
import ChConfig
#---------------------------------------------------------------------
@@ -88,8 +87,6 @@
GameWorld.DebugLog("该副本当前无法扫荡！mapID=%s, lineID=%s" % (mapID, lineID))
return
- #PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FeastRedPack_FBSweep, 1, [mapID])
-
#需先扣除门票, 再增加次数, 否则可能导致扣除的数量错误
#FBCommon.DelFBEnterTicket(curPlayer, mapID, lineID, cnt)
@@ -122,21 +119,20 @@
return
reqRet = FBLogic.OnPlayerFBQuickPass(curPlayer, mapID, lineID)
- if not reqRet or len(reqRet) != 2:
+ if not reqRet:
GameWorld.DebugLog("无法一键过关副本: mapID=%s,lineID=%s" % (mapID, lineID), playerID)
return
- bossID, quickCnt = reqRet
- if bossID:
- npcData = GameWorld.GetGameData().FindNPCDataByID(bossID)
- if not npcData:
- return
- npcFightPower = NPCCommon.GetSuppressFightPower(npcData)
+ lineID = reqRet[0]
+ quickCnt = reqRet[1] if len(reqRet) > 1 else 0
+ quickFightPower = reqRet[2] if len(reqRet) > 2 else 0
+ quickData = reqRet[3] if len(reqRet) > 3 else []
+ if quickFightPower:
quickNeedRatio = IpyGameDataPY.GetFuncCfg("FBQuickPass", 1)
- quickNeedFightPower = int(npcFightPower * quickNeedRatio)
+ quickNeedFightPower = int(quickFightPower * quickNeedRatio)
curFightPower = PlayerControl.GetFightPower(curPlayer)
if quickNeedFightPower and curFightPower < quickNeedFightPower:
- GameWorld.DebugLog("无法一键过关副本! 战力限制: mapID=%s,lineID=%s,bossID=%s,npcFightPower=%s,quickNeedFightPower=%s > %s"
- % (mapID, lineID, bossID, npcFightPower, quickNeedFightPower, curFightPower), playerID)
+ GameWorld.DebugLog("无法一键过关副本! 战力限制: mapID=%s,lineID=%s,quickFightPower=%s,quickNeedFightPower=%s > %s"
+ % (mapID, lineID, quickFightPower, quickNeedFightPower, curFightPower), playerID)
PlayerControl.NotifyCode(curPlayer, 'TaskFeedback4')
return
@@ -148,6 +144,6 @@
FBCommon.AddEnterFBCount(curPlayer, mapID, quickCnt)
#扫荡结果给奖励等
- FBLogic.OnPlayerFBQuickPassResult(curPlayer, mapID, lineID)
+ FBLogic.OnPlayerFBQuickPassResult(curPlayer, mapID, lineID, quickData)
return
--
Gitblit v1.8.0