From 9a1a4ea5a8728383a393bfa626f55e86b55b0e46 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 31 一月 2019 21:37:59 +0800
Subject: [PATCH] 6116 子 【开发】【1.6】当玩家攻击无敌状态的目标时候进入cd / 【后端】【1.6】攻击无敌目标技能进入cd - # 根据策划需求 以客户端动作为标准,不可攻击状态也进入CD

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py
index bf9d933..4fdc3fc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py
@@ -88,6 +88,7 @@
     ttInfo = ChPyNetSendPack.tagMCZhuXianTowerInfo()
     ttInfo.Clear()
     ttInfo.Floor = __GetZhuXianTowerCurPassLV(curPlayer)
+    ttInfo.LastFloor = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ZhuXianTowerLastFloor)
     NetPackCommon.SendFakePack(curPlayer, ttInfo)
     return
 
@@ -136,8 +137,10 @@
     gameFB = GameWorld.GetGameFB()
     fbStep = gameFB.GetFBStep()
     curStar = gameFB.GetGameFBDictByKey(FBDict_FBStar)
-    if curStar != Def_MaxStar and fbStep == FB_State_FreeTime:
-        FBCommon.UpdateFBEnterTick(curPlayer)
+    hasPass = gameFB.GetGameFBDictByKey(FBDict_HasPass)
+    if fbStep == FB_State_FreeTime: #失败或非S通关需要加cd
+        if curStar != Def_MaxStar or not hasPass:
+            FBCommon.UpdateFBEnterTick(curPlayer)
     return
 
 ##副本玩家进入点
@@ -341,6 +344,11 @@
     FBCommon.Sync_Player_TimeTick(IPY_GameWorld.tttWaitStart, prepareTick)
     FBCommon.SetFBStep(FB_State_FightPrepare, tick)
 
+    lastFloor = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ZhuXianTowerLastFloor)
+    if fbLevel != lastFloor:
+        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ZhuXianTowerLastFloor, fbLevel)
+        SyncZhuXianLevelInfo(curPlayer) # 同步信息
+    
     DoFBHelp(curPlayer, tick)
     GameWorld.DebugLog("StartFBLevel, fbLevel=%s,totalHP=%s" % (fbLevel, totalHP), curPlayer.GetPlayerID())
     return
@@ -502,7 +510,7 @@
     remainHP = GetBossRemainHP(tick)
     totalHP = __GetBossTotalHP()
     hpReduceSpeed = curSpeed * 10000 / totalHP if totalHP else 0
-    remainHPPer = min(100, remainHP * 100 / totalHP) if totalHP else 0
+    remainHPPer = min(1000000, remainHP * 1000000 / totalHP) if totalHP else 0
     fbLevel = gameFB.GetGameFBDictByKey(FBDict_Level)
     fbHelpDict = {FBCommon.Help_wheel:fbLevel, FBCommon.Help_grade:star, 'hpReduceSpeed':hpReduceSpeed, 'remainHPPer':remainHPPer, 'isReduceing':isReduceing}
     GameWorld.DebugLog("DoFBHelp: %s" % fbHelpDict, curPlayer.GetPlayerID())

--
Gitblit v1.8.0