From 751709e3494aad919e4313c26066be24e2d4bf8a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 09 五月 2019 14:10:54 +0800
Subject: [PATCH] 6711 【后端】【2.0】洗练从0级开始洗练

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 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..f68012f 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
@@ -29,10 +29,11 @@
 import ItemCommon
 import ChConfig
 import ChPlayer
-import PlayerSuccess
+import PlayerActLogin
 import GameWorldProcess
 import PlayerBillboard
 import EventReport
+import EventShell
 
 import random
 import math
@@ -88,6 +89,7 @@
     ttInfo = ChPyNetSendPack.tagMCZhuXianTowerInfo()
     ttInfo.Clear()
     ttInfo.Floor = __GetZhuXianTowerCurPassLV(curPlayer)
+    ttInfo.LastFloor = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ZhuXianTowerLastFloor)
     NetPackCommon.SendFakePack(curPlayer, ttInfo)
     return
 
@@ -98,11 +100,12 @@
 
 
 ## 更新当前已通关关卡
-def SetZhuXianTowerCurPassLV(curPlayer, passlv):
+def SetZhuXianTowerCurPassLV(curPlayer, passlv, costSeconds=0):
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ZhuXianTowerPassLV, passlv)
-    #PlayerRune.DoUnlockRuneHole(curPlayer)
-    
-    #PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Tower, passlv, False)
+    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ZhuXianTowerCostTime, costSeconds)
+    #更新诛仙塔排行榜
+    PlayerBillboard.UpdateZhuXianTowerBillboard(curPlayer)
+    EventShell.EventRespons_ZhuXianTowerPass(curPlayer, passlv)
     GameWorld.DebugLog(' 更新诛仙塔已通关数 %s' % passlv)
     return
 
@@ -136,8 +139,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 +346,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
@@ -414,9 +424,8 @@
     isFirstS = 0
     if fbLevel != __GetZhuXianTowerCurPassLV(curPlayer) and curStar == Def_MaxStar:
         #更新关卡
-        SetZhuXianTowerCurPassLV(curPlayer, fbLevel)
-        #更新诛仙塔排行榜
-        PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_ZhuXianTower, fbLevel, 10000-costTime/1000)
+        SetZhuXianTowerCurPassLV(curPlayer, fbLevel, costTime/1000)
+        
         isFirstS = 1  #是否首次S通关
     gameFB.SetGameFBDict(FBDict_isFirstS, isFirstS)
     
@@ -430,10 +439,7 @@
     prizeDict = {FBCommon.Over_costTime:costTime, FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(prizeItemList),
                  FBCommon.Over_grade:curStar}
     __SendZhuXianTowerOverInfo(curPlayer, fbLevel, True if prizeItemList else False, prizeDict)
-    
-    #任务
-    #EventShell.EventRespons_ZhuXianTowerCnt(curPlayer, fbLevel)
-    
+
     SyncZhuXianLevelInfo(curPlayer)  # 同步最新关卡信息
     __SetFBToFreeTime(tick)
     #每日任务
@@ -485,6 +491,7 @@
 
         
     gameFB.SetGameFBDict(FBDict_HasGiveAward, 1)
+    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_ZhuXianTower, 1)
     return
 
 
@@ -502,7 +509,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