From 65a4c2029af3f70ce484a2eec167c50f227d7a5c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 27 五月 2019 14:08:22 +0800
Subject: [PATCH] 6805 【后端】【2.0】副本前端化(封魔坛前期本)
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 7d16d92..1dfac90 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -35,6 +35,8 @@
import PlayerNewFairyCeremony
import PlayerUniversalGameRec
import GameWorldAverageLv
+import PlayerFamilyBoss
+import PlayerHorsePetBoss
import GameWorldProcess
import ChPyNetSendPack
import NetPackCommon
@@ -42,7 +44,6 @@
from types import IntType
import time
-import json
#---------------------------------------------------------------------
#年月日时间格式
@@ -270,9 +271,9 @@
isEnd = (curDateTime == endDayDate)
# 每天按时段开启的，支持多时段
- else:
- if startDayDate <= curDateTime <= endDayDate:
- isEnd = (curDateTime == endDayDate)
+ elif startDayDate <= curDateTime <= endDayDate:
+ isEnd = (curDateTime == endDayDate)
+ if not isEnd:
for hmIndex, startHMStr in enumerate(startHMStrList):
endHMStr = endHMStrList[hmIndex]
# 每天开的, 实际开关时间只取今天的日期； 这里有个问题，全服广播的时间不是今天的, 暂不做支持，之后真有这种需求再说
@@ -1121,20 +1122,20 @@
recMapID = universalRecData.GetValue1()
if recMapID == mapID:
findRecData = universalRecData
- fbOpenRecord[recMapID] = json.loads(universalRecData.GetStrValue1())
+ fbOpenRecord[recMapID] = eval(universalRecData.GetStrValue1())
if not findRecData:
findRecData = recTypeListData.AddRec()
findRecData.SetValue1(mapID)
- findRecData.SetStrValue1(json.dumps([curDayStr], ensure_ascii=False))
+ findRecData.SetStrValue1(str([curDayStr]))
fbOpenRecord[mapID] = [curDayStr]
else:
- recordList = json.loads(findRecData.GetStrValue1())
+ recordList = eval(findRecData.GetStrValue1())
if curDayStr not in recordList:
recordList.append(curDayStr)
if len(recordList) > 3: #只存最近3次
del recordList[0]
- findRecData.SetStrValue1(json.dumps(recordList, ensure_ascii=False))
+ findRecData.SetStrValue1(str(recordList))
fbOpenRecord[mapID] = recordList
else:
return
@@ -1150,7 +1151,7 @@
for index in range(recTypeListData.Count()):
universalRecData = recTypeListData.At(index)
recMapID = universalRecData.GetValue1()
- recordList = json.loads(universalRecData.GetStrValue1())
+ recordList = eval(universalRecData.GetStrValue1())
fbOpenRecord[recMapID] = recordList
return fbOpenRecord
@@ -1265,6 +1266,13 @@
#跨服PK
elif dictName == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_CrossReamPK:
CrossRealmPK.OnCrossRealmPKDailyActionStateChange(isOpen)
+ #仙盟BOSS
+ elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1]:
+ PlayerFamilyBoss.OnAllFamilyBossStateChange(isOpen)
+ #骑宠BOSS
+ elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_HorsePetBoss]:
+ PlayerHorsePetBoss.OnHorsePetBossStateChange(isOpen)
+
return
#-------------------------------------------------------------------------------
--
Gitblit v1.8.0