From ab3c1e29995e5bae442a06bbd8c4ae821efe88d0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 十一月 2025 11:11:46 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（优化被动buff触发有效效果逻辑；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py
index 151f780..b88a642 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py
@@ -17,7 +17,10 @@
import GameWorld
import ItemControler
+import PlayerBeauty
import FBCommon
+import PlayerTask
+import ChConfig
def OnTurnFightRequest(curPlayer, mapID, funcLineID, tagType, tagID, valueList):
## 回合战斗请求
@@ -26,7 +29,7 @@
GameWorld.DebugLog("已过关的不能不重复挑战! mapID=%s,funcLineID=%s" % (mapID, funcLineID))
return
- return True
+ return True, funcLineID
def OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg):
## 回合战斗结束
@@ -45,28 +48,66 @@
itemList = FBCommon.GetPassAwardList(mapID, funcLineID)
GameWorld.DebugLog("过关奖励: mapID=%s,funcLineID=%s,itemList=%s" % (mapID, funcLineID, itemList))
- # 首通不扣次数
- FBCommon.SetFBPass(curPlayer, mapID, funcLineID)
- ItemControler.GivePlayerItemOrMail(curPlayer, itemList, event=["Zhanchui", False, {}], isNotifyAward=False)
overMsg.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList)})
+ turnFight.awardData = [itemList]
return
+def OnTurnFightAward(curPlayer, turnFight, mapID, funcLineID, awardData):
+ ## 回合战斗结算奖励
+ if not curPlayer:
+ return
+
+ if not awardData:
+ return
+
+ itemList = awardData[0]
+
+ # 首通不扣次数
+ FBCommon.AddEnterFBCount(curPlayer, mapID, isFree=True)
+ FBCommon.SetFBPass(curPlayer, mapID, funcLineID)
+ ItemControler.GivePlayerItemOrMail(curPlayer, itemList, event=["Zhanchui", False, {}], isNotifyAward=False)
+
+ PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_FBZhanchui)
+ return
+
def OnPlayerFBSweepAsk(curPlayer, mapID, lineID, sweepCnt, dataEx):
## 可否扫荡
return True
-def OnPlayerFBSweepResult(curPlayer, mapID, lineID, sweepCnt, dataEx):
+def OnPlayerFBSweepResult(curPlayer, mapID, lineID, sweepCnt, dataEx, askRet):
## 扫荡结果，次数消耗已在外层处理扣除
- itemList = FBCommon.GetSweepAwardList(mapID, lineID, sweepCnt)
- GameWorld.DebugLog("白骨盈野扫荡: mapID=%s,lineID=%s,sweepCnt=%s" % (mapID, lineID, sweepCnt))
+ itemList = []
+ itemList += FBCommon.GetSweepAwardList(mapID, lineID, sweepCnt)
+ GameWorld.DebugLog("白骨盈野扫荡: mapID=%s,lineID=%s,sweepCnt=%s,itemList=%s" % (mapID, lineID, sweepCnt, itemList))
+ addPer = PlayerBeauty.GetBeautyEffInfo(curPlayer, PlayerBeauty.EffType_FBZhanchuiAwardPer)[0] # 扫荡奖励百分比
+ if addPer:
+ GameWorld.DebugLog("红颜额外增加扫荡奖励百分比: %s, itemList=%s" % (addPer, itemList))
+ itemListEx = []
+ for itemInfo in itemList:
+ itemID = itemInfo[0]
+ itemCount = itemInfo[1]
+ addCount = int(itemCount * addPer / 100.0)
+ if addCount > 0:
+ itemListEx.append([itemID, addCount, 1]) # 标记是红颜效果额外获得的
+ itemList += itemListEx
+ GameWorld.DebugLog("itemListEx=%s,itemList=%s" % (itemListEx, itemList))
+
ItemControler.GivePlayerItemOrMail(curPlayer, itemList, event=["Zhanchui", False, {}], isNotifyAward=False)
isPass = 1
- overDict = {FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList), FBCommon.Over_isSweep:1}
+ jsonItemList = []
+ for itemInfo in itemList:
+ itemID = itemInfo[0]
+ itemCount = itemInfo[1]
+ itemDict = {"ItemID":itemInfo[0], "Count":itemInfo[1]}
+ if len(itemInfo) > 2:
+ itemDict['BeautyEx'] = itemInfo[2]
+ jsonItemList.append(itemDict)
+ overDict = {FBCommon.Over_itemInfo:jsonItemList, FBCommon.Over_isSweep:1}
FBCommon.NotifyFBOver(curPlayer, mapID, lineID, isPass, overDict)
return True
--
Gitblit v1.8.0