From f397f8712fb5297a8dc44f02e4470cbbc93e755f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 十二月 2025 12:13:16 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端（武将招募未激活永久卡时不增加幸运；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 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 67867c2..f79961a 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
@@ -19,6 +19,8 @@
import ItemControler
import PlayerBeauty
import FBCommon
+import PlayerSuccess
+import ShareDefine
import PlayerTask
import ChConfig
@@ -31,13 +33,12 @@
return True, funcLineID
-def OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg):
- ## 回合战斗结束
-
+def OnTurnFightAward(curPlayer, guid, mapID, funcLineID, winFaction, statMsg, dateStr, reqData, awardDict):
+ ## 回合战斗结算奖励
if not curPlayer:
return
- isWin = turnFight.isWin
+ isWin = winFaction == ChConfig.Def_FactionA
if not isWin:
return
@@ -48,20 +49,7 @@
itemList = FBCommon.GetPassAwardList(mapID, funcLineID)
GameWorld.DebugLog("过关奖励: mapID=%s,funcLineID=%s,itemList=%s" % (mapID, funcLineID, itemList))
- 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]
+ awardDict.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList)})
# 首通不扣次数
FBCommon.AddEnterFBCount(curPlayer, mapID, isFree=True)
@@ -69,6 +57,7 @@
ItemControler.GivePlayerItemOrMail(curPlayer, itemList, event=["Zhanchui", False, {}], isNotifyAward=False)
PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_FBZhanchui)
+ PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_OSAFBZhanchui, funcLineID)
return
def OnPlayerFBSweepAsk(curPlayer, mapID, lineID, sweepCnt, dataEx):
--
Gitblit v1.8.0