From 542b896965d8b73ce4434de75c7eb232378c0a64 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 23 一月 2019 10:57:47 +0800
Subject: [PATCH] 6001 【后端】【1.5.100】七日巡礼增加条件(封包)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 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 9e58080..9b1501c 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
@@ -49,6 +49,7 @@
 FBDict_BossTotalHP = 'FBDict_BossTotalHP'  #BOSS血量
 FBDict_LastHurtTick = 'FBDict_LastHurtTick'  #上次伤害时间
 FBDict_HasGiveAward = 'FBDict_HasGiveAward'  # 是否有给奖励
+FBDict_HasAddCnt = 'FBDict_HasAddCnt'  # 是否有扣次数
 
 # 副本通用配置
 (
@@ -76,7 +77,7 @@
     return IpyGameDataPY.GetIpyGameData('ZhuXianTower', level)
 
 
-def OnFBPlayerLogin(curPlayer):
+def OnFBPlayerOnLogin(curPlayer):
     SyncZhuXianLevelInfo(curPlayer)
     return
 
@@ -191,7 +192,14 @@
 # @remarks 玩家主动离开副本.
 def DoExitFB(curPlayer, tick):
     # 玩家退出默认关闭副本
-    #GameWorldProcess.CloseFB(tick)
+    gameFB = GameWorld.GetGameFB()
+    fbStep = gameFB.GetFBStep()
+    if fbStep == FB_State_FreeTime:
+        #退出时,若s级则补发奖励
+        curStar = gameFB.GetGameFBDictByKey(FBDict_FBStar)
+        if curStar == Def_MaxStar:
+            __GiveFBPassPrize(curPlayer)
+        GameWorldProcess.CloseFB(tick)
     return
 
 
@@ -317,6 +325,12 @@
     gameFB.SetGameFBDict(FBDict_BossTotalHP, totalHP * 1000)
     gameFB.SetGameFBDict(FBDict_Speed, 1000)  #速度默认1000
     gameFB.SetGameFBDict(FBDict_RemainHP, totalHP * 1000)
+    gameFB.SetGameFBDict(FBDict_IsReduceing, 0)
+    gameFB.SetGameFBDict(FBDict_LastHurtTick, 0)
+    gameFB.SetGameFBDict(FBDict_HasGiveAward, 0)
+    gameFB.SetGameFBDict(FBDict_StartTick, 0)
+    gameFB.SetGameFBDict(FBDict_FBStar, 0)
+    
     prepareTick = __GetZhuXianCfg()[Def_PrepareTime] * 1000
     FBCommon.Sync_Player_TimeTick(IPY_GameWorld.tttAddUpTime, prepareTick)
     FBCommon.Sync_Player_TimeTick(IPY_GameWorld.tttWaitStart, prepareTick)
@@ -388,26 +402,28 @@
         return
     # 记录过关
     #EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_ZhuXianTower, 0, ChConfig.CME_Log_End, 0, 1)
-    unLockEquipPlace = ipyData.GetUnLockEquipPlace()
-    if unLockEquipPlace:
-        PlayerControl.WorldNotify(0, 'KillGodTowerInfo_1', [curPlayer.GetPlayerName(), fbLevel, unLockEquipPlace])
-    ipyMgr = IpyGameDataPY.IPY_Data()
-    maxFloor = ipyMgr.GetZhuXianTowerByIndex(ipyMgr.GetZhuXianTowerCount() - 1).GetID()
+
     # 过关时间
     costTime = tick - GameWorld.GetGameFB().GetFBStepTick()
     curStar = gameFB.GetGameFBDictByKey(FBDict_FBStar)
     isFirstS = 0
-    if fbLevel < maxFloor and curStar == Def_MaxStar:
+    if fbLevel != __GetZhuXianTowerCurPassLV(curPlayer) and curStar == Def_MaxStar:
         #更新关卡
         SetZhuXianTowerCurPassLV(curPlayer, fbLevel)
         #更新诛仙塔排行榜
-        PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_ZhuXianTower, fbLevel, costTime/1000)
+        PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_ZhuXianTower, fbLevel, 10000-costTime/1000)
         isFirstS = 1  #是否首次S通关
     gameFB.SetGameFBDict(FBDict_isFirstS, isFirstS)
+    
+    unLockEquipPlace = ipyData.GetUnLockEquipPlace()
+    if isFirstS and unLockEquipPlace:
+        PlayerControl.WorldNotify(0, 'KillGodTowerInfo_1', [curPlayer.GetPlayerName(), fbLevel, unLockEquipPlace])
+        
     # 给过关奖励
     prizeItemList = __GiveFBPassPrize(curPlayer, False)
     
-    prizeDict = {FBCommon.Over_costTime:costTime, FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(prizeItemList)}
+    prizeDict = {FBCommon.Over_costTime:costTime, FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(prizeItemList),
+                 FBCommon.Over_grade:curStar}
     __SendZhuXianTowerOverInfo(curPlayer, fbLevel, True if prizeItemList else False, prizeDict)
     
     #任务
@@ -463,8 +479,10 @@
         for itemID, itemCnt, isBind in prizeItemList:
             ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem],
                                             event=["ZhuXianTower", False, {}])
-            
-    FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_ZhuXianTower, 1)
+    #本次副本里第一次给奖励时扣次数
+    if not gameFB.GetGameFBDictByKey(FBDict_HasAddCnt):
+        FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_ZhuXianTower, 1)
+        gameFB.SetGameFBDict(FBDict_HasAddCnt, 1)
         
     gameFB.SetGameFBDict(FBDict_HasGiveAward, 1)
     
@@ -562,7 +580,7 @@
         #领取奖励
         if fbStep != FB_State_FreeTime:
             return
-        __GiveFBPassPrize(curPlayer, False)
+        __GiveFBPassPrize(curPlayer)
     return
 
 

--
Gitblit v1.8.0