From 0cb288fc2cad76d7cd8150a3e0b15bbe0eff2c1e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 05 三月 2019 10:57:47 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(强化)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py
index 48022cf..385a9f4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py
@@ -32,6 +32,9 @@
 import EventReport
 import ChPlayer
 import FBHelpBattle
+import IpyGameDataPY
+import PlayerWeekParty
+import PlayerActLogin
 
 
 #阶段时间
@@ -136,7 +139,7 @@
 def DoEnterFB(curPlayer, tick):
     playerID = curPlayer.GetPlayerID()
     GameWorld.DebugLog("DoEnterFB...", playerID)
-    
+
     gameFB = GameWorld.GetGameFB()
     
     if not FBCommon.GetHadDelTicket(curPlayer):
@@ -190,6 +193,13 @@
     fbLineTime = FBCommon.GetFBLineStepTime(ChConfig.Def_FBMapID_QueenRelics, lineID)
     curPlayer.Sync_TimeTick(IPY_GameWorld.tttWaitStart, 0, fbLineTime[Def_PrepareTime] * 1000, True)
     EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_QueenRelics, lineID, ChConfig.CME_Log_Start)
+    
+    helpIpyData = IpyGameDataPY.GetIpyGameData("FBHelpBattle", ChConfig.Def_FBMapID_QueenRelics, lineID)
+    if helpIpyData:
+        gameFB.SetGameFBDict(ChConfig.FBPD_HelpBattleFBBaseHurt, helpIpyData.GetRobotBaseHurt())
+        gameFB.SetGameFBDict(ChConfig.FBPD_HelpBattleFBFightPower, helpIpyData.GetFightPowerMin())
+        GameWorld.DebugLog("    更新副本助战机器人基础伤害: lineID=%s,RobotBaseHurt=%s,fbFightPower=%s" 
+                           % (lineID, helpIpyData.GetRobotBaseHurt(), helpIpyData.GetFightPowerMin()))
     return
 
 ##副本总逻辑计时器
@@ -496,7 +506,6 @@
             EventShell.EventRespons_PassQueenRelecs(curPlayer, lineID, grade)
             #任务
             EventShell.EventRespons_FBEvent(curPlayer, "queenrelics_pass")
-        FBCommon.NotifyFBOver(curPlayer, dataMapID, lineID, isPass, overDict)
         
         # 记录结算到的线路层,记录值+1
         updRewardLine = lineID + 1
@@ -508,10 +517,13 @@
                 GameWorld.DebugLog("首次结算奖励,增加挑战次数!", playerID)
                 needSyncFBData = True
                 FBCommon.AddEnterFBCount(curPlayer, dataMapID)
-                FBHelpBattle.DoSingleFBAddXianyuanCoin(curPlayer, mapID, lineID)
+                addXianyuanCoin, reason = FBHelpBattle.DoFBAddXianyuanCoin(curPlayer, mapID, lineID)
+                overDict[FBCommon.Over_xianyuanCoin] = [addXianyuanCoin, reason]
             else:
                 GameWorld.DebugLog("副本中过天,不增加挑战次数!", playerID)
             PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_QueenRelicsEx, 1)
+            PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_QueenRelices, 1)
+            PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_QueenRelices, 1)
         # 不可再挑战下一关了
         if not nextLineID:
             curPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, fbLineTime[Def_LeaveTime] * 1000, True)
@@ -521,6 +533,8 @@
             
         if needSyncFBData:
             FBCommon.Sync_FBPlayerFBInfoData(curPlayer, dataMapID) # 同步信息
+            
+        FBCommon.NotifyFBOver(curPlayer, dataMapID, lineID, isPass, overDict)
     return
 
 def __GivePlayerQueenRelicsReward(curPlayer, dataMapID, rewardLineID, curLineID, passGrade, maxGrade, rewardRateList):

--
Gitblit v1.8.0