From d5e9bbcf96cf98d767ba073774b1ee287569659d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 18:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
index 571ee07..848c439 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
@@ -620,7 +620,7 @@
     onlineCnt = __GetBossOnlineHeroCnt(bossid)[0]
     LVLimit = ipyData.GetLVLimit()
     openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)
-    if openServerDay != 0:
+    if openServerDay != 0 and LVLimit and len(LVLimit) == 2:
         yesterdayCnt = len([1 for lv in PyGameData.g_yesterdayPlayerLVDict.values() if LVLimit[0]<=lv <= LVLimit[1]]) #参数昨日活跃人数
     else:
         yesterdayCnt = IpyGameDataPY.GetFuncCfg('FirstDayActivePlayerCnt')
@@ -950,8 +950,10 @@
             refreshTime = 0
             PyGameData.g_sortBOSSRefreshList[i] = [bossID, killedTime, refreshTime]
             bossIDList.append(bossID)
+        curTime = int(time.time())
+        PyGameData.g_sortBOSSRefreshList.sort(key=lambda asd:max(0, asd[2] - (curTime - asd[1])))
         GameWorld.Log(' boss复活活动 重生boss bossIDList=%s'%bossIDList)
-        g_lastBossRebornTime = int(time.time())
+        g_lastBossRebornTime = curTime
     else:
         #广播
         needNotifyPointPerList = IpyGameDataPY.GetFuncEvalCfg('BossRebornNotify')

--
Gitblit v1.8.0