From 8d37b77678ea5dc0703354a6daaa1207ce6e8be3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 六月 2019 21:56:45 +0800
Subject: [PATCH] 7661 【后端】【主干】屏蔽多余日志输出(非拍品转拍品ErrLog改DebugLog,重刷传奇属性ErrLog改DebugLog)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
index b8ce421..55ba478 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
@@ -37,13 +37,12 @@
 FBPlayerDict_EncourageLV = 'FBPlayerDict_EncourageLV'  # 鼓舞等级
 FBDict_IsOver = 'FBDict_IsOver'  #是否已结算, 结算时的tick
 FBDict_EncourageCnt = 'FBDict_EncourageCnt'  #鼓舞过次数
-
+Map_FB_StartTick = 'Map_FB_StartTick' #活动开始时间
 
 (
     Def_BossTime,  #BOSS时间
     Def_LeaveTime,  #离开时间
-    Def_HPSpeed,  #掉血速度公式
-    ) = range(3)
+    ) = range(2)
 
 #当前副本地图的状态
 (
@@ -122,13 +121,23 @@
     if mapID != ChConfig.Def_FBMapID_AllFamilyBoss:
         return
     GameWorld.DebugLog('    多仙盟BOSS活动状态变更 state=%s' % state)
-
-    if not state:
+    
+    if state:
+        if not GameWorld.GetGameWorld().GetGameWorldDictByKey(Map_FB_StartTick):
+            GameWorld.GetGameWorld().SetGameWorldDict(Map_FB_StartTick, tick)
+    else:
+        GameWorld.GetGameWorld().SetGameWorldDict(Map_FB_StartTick, 0)
         if not GameWorld.GetGameFB().GetGameFBDictByKey(FBDict_IsOver):
             GameWorld.GetGameFB().SetGameFBDict(FBDict_IsOver, tick)
             __DoLogicAllFamilyBossOver(0, tick, 0, 0)
     return
 
+def __GetRemainTick(tick):
+    ##活动剩余毫秒
+    mapID = GameWorld.GetMap().GetMapID()
+    startTick = GameWorld.GetGameWorld().GetGameWorldDictByKey(Map_FB_StartTick)
+    closeFB_RemainTick = max(0, FBCommon.GetFBLineStepTime(mapID)[Def_BossTime] * 1000 - (tick - startTick))
+    return closeFB_RemainTick
 
 ## 进副本
 #  @param curPlayer
@@ -171,7 +180,9 @@
         FBCommon.AddFbEncourageBuff(curPlayer, FBPlayerDict_EncourageLV, tick, familyID)
     else:
         FBCommon.SendFBEncourageInfo(curPlayer, encourageLV, familyID)
-        
+    
+    closeFB_RemainTick = __GetRemainTick(tick)
+    curPlayer.Sync_TimeTick(IPY_GameWorld.tttTowerTake, 0, closeFB_RemainTick, True) 
     DoFBHelp(curPlayer, tick)
     return
 
@@ -287,6 +298,7 @@
             itemList = IpyGameDataPY.GetFuncEvalCfg('LeagueBOSSReward1')
             giveItemList = [[itemID, itemCnt, 0] for itemID, itemCnt in itemList]
             ItemControler.GivePlayerItemOrMail(curPlayer, giveItemList)
+            DoFBHelp(curPlayer, tick)
     return
 
 

--
Gitblit v1.8.0