From 62dd57353d0e2489b725ffb78d0e946c3ba2b026 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 17 六月 2019 21:08:08 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 嗜天风暴重击多触发一次伤害问题,射日魔吸攻速数值不对问题

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.py |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.py
index 1a40f3a..b2353fc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.py
@@ -75,25 +75,23 @@
 def OnChangeMapAsk(ask, tick):
     return IPY_GameWorld.cmeAccept
 
-
 ## 进副本
 #  @param curPlayer
 #  @param tick
 #  @return None
 def DoEnterFB(curPlayer, tick):
     playerID = curPlayer.GetPlayerID()
+    if curPlayer.GetHP() == 0:
+        PlayerControl.PlayerLeaveFB(curPlayer)
+        return
 
-    # 设置副本公共属性的单独处理,防止队员进入后被修改
-    if not FBCommon.GetHadSetFBPropertyMark():
-        lineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqFBFuncLine)
-        FBCommon.SetFBPropertyMark(lineID)
-        
-    GameWorld.DebugLog("DoEnterFB...lineID=%s" % FBCommon.GetFBPropertyMark(), playerID)
+    lineID = PlayerControl.GetFBFuncLineID(curPlayer) 
+    GameWorld.DebugLog("DoEnterFB...lineID=%s" % lineID, playerID)
     hadDelTicket = FBCommon.GetHadDelTicket(curPlayer)
     if not hadDelTicket:
+        GameWorld.DebugLog('扣门票!')
         FBCommon.SetHadDelTicket(curPlayer)
         canEnterLine = PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_BossHome)
-        lineID = FBCommon.GetFBPropertyMark()
         if lineID+1 > canEnterLine:
             costGold = __GetEnterCostMoney(lineID)
             costMoneyList = PlayerControl.HaveMoneyEx(curPlayer, ShareDefine.TYPE_Price_Gold_Paper_Money, costGold)
@@ -101,7 +99,8 @@
             infoDict = {"MapID":mapID,"LineID":lineID}
             for moneyType, moneyNum in costMoneyList:
                 if not PlayerControl.PayMoney(curPlayer, moneyType, moneyNum, ChConfig.Def_Cost_EnterFB, infoDict):
-                    GameWorld.DebugLog("仙玉不足!costGold=%s" % costGold)
+                    GameWorld.Log("仙玉不足!costGold=%s" % costGold)
+                    PlayerControl.PlayerLeaveFB(curPlayer)
                     return
         EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_BossHome, lineID, ChConfig.CME_Log_Start)
     
@@ -173,7 +172,7 @@
 # @remarks 玩家主动离开副本.
 def DoPlayerDead(curPlayer):
     FBCommon.Notify_FB_Over(curPlayer, {FBCommon.Over_isPass:0})
-    lineID = FBCommon.GetFBPropertyMark()
+    lineID = PlayerControl.GetFBFuncLineID(curPlayer) 
     leaveTime = int(FBCommon.GetFBLineStepTime(ChConfig.Def_FBMapID_BossHome, lineID))
     curPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTime*1000, True)
     return
\ No newline at end of file

--
Gitblit v1.8.0