ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py
@@ -27,6 +27,7 @@
import ItemCommon
import FormulaControl
import NPCCustomRefresh
import PlayerWeekParty
import PlayerSuccess
import PyGameData
import EventReport
@@ -137,7 +138,7 @@
        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_XMZZLastStartTime, curtime)
        #FBCommon.SetFBStep(FB_Step_Prepare, tick)
        #PrepareXMZZPK(curPlayer, tick)
        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_XMZZ, 1)
        msgInfo = str([1]) # 是否刚开始
        GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0, 'XMZZStartFight', msgInfo, len(msgInfo))
        curPlayer.SetHP(curPlayer.GetMaxHP())
@@ -175,7 +176,9 @@
    fbStep = GameWorld.GetGameFB().GetFBStep()
    
#    # 副本准备
#    if fbStep == FB_Step_Prepare:
    if fbStep == FB_Step_Prepare:
        ResetPos(tick)
#        PrepareXMZZPK(tick) 
#    # 副本进行中
    if fbStep == FB_Step_Fighting:
@@ -185,6 +188,15 @@
#        __DoLogic_FB_Over(tick)
    
    
    return
def ResetPos(tick):
    if tick - GameWorld.GetGameFB().GetFBStepTick() < 1 * 1000:
        return
    FBCommon.SetFBStep(FB_Step_Fighting, tick)
    curPlayer = FBCommon.GetCurSingleFBPlayer()
    if curPlayer:
        __ResetPos(curPlayer)
    return
def __ChcekFBOver(tick):
@@ -240,10 +252,10 @@
    #===============================================================================================
    FBCommon.SetFBStep(FB_Step_Prepare, tick)
    #重置坐标
    __ResetPos(curPlayer)
    #__ResetPos(curPlayer)
        
    FBCommon.Sync_Player_TimeTick(IPY_GameWorld.tttWaitStart, __GetFightTime()[Def_PrepareTime] * 1000)
    FBCommon.SetFBStep(FB_Step_Fighting, tick)
    #FBCommon.SetFBStep(FB_Step_Fighting, tick)
    
    if not vsPlayerInfo:
        return
@@ -355,8 +367,8 @@
# @return 返回值无意义
# @remarks 玩家主动离开副本.
def DoPlayerDead(curPlayer):
    if GameWorld.GetGameFB().GetFBStep() != FB_Step_Fighting:
        return
#    if GameWorld.GetGameFB().GetFBStep() != FB_Step_Fighting:
#        return
    
    HPPer = __GetHPPer(curPlayer)
    __SendPKResult(curPlayer, 0, 1, HPPer)