From 97a175bb2d85221c1fd7ca94388493c87f920b7c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 14 二月 2019 11:28:07 +0800
Subject: [PATCH] 6211 【后端】【1.6】合服任务单（合服日常、限时副本定制支持）
---
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 76 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 0 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 52e00c7..820e263 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -78,6 +78,15 @@
("dict", "NotifyInfo", 0),
),
+ "DailyActionCustomMix":(
+ ("DWORD", "ID", 0),
+ ("DWORD", "MixServerDay", 1),
+ ("BYTE", "DailyID", 0),
+ ("list", "OpenTimeList", 0),
+ ("DWORD", "Duration", 0),
+ ("dict", "NotifyInfo", 0),
+ ),
+
"FBStateTime":(
("DWORD", "ID", 1),
("DWORD", "DataMapID", 0),
@@ -95,6 +104,19 @@
("DWORD", "ID", 0),
("BYTE", "OpenServerWeek", 1),
("DWORD", "OpenServerDay", 0),
+ ("DWORD", "DataMapID", 0),
+ ("BYTE", "StartHour", 0),
+ ("BYTE", "StartMinute", 0),
+ ("BYTE", "EndHour", 0),
+ ("BYTE", "EndMinute", 0),
+ ("BYTE", "CanEnter", 0),
+ ("BYTE", "StateValue", 0),
+ ("dict", "NotifyInfoDict", 0),
+ ),
+
+ "FBStateTimeCustomMix":(
+ ("DWORD", "ID", 0),
+ ("DWORD", "MixServerDay", 1),
("DWORD", "DataMapID", 0),
("BYTE", "StartHour", 0),
("BYTE", "StartMinute", 0),
@@ -588,6 +610,25 @@
def GetDuration(self): return self.Duration # 持续时间, 0为不限制
def GetNotifyInfo(self): return self.NotifyInfo # 广播提示信息
+# 日常活动表定制表合服
+class IPY_DailyActionCustomMix():
+
+ def __init__(self):
+ self.ID = 0
+ self.MixServerDay = 0
+ self.DailyID = 0
+ self.OpenTimeList = []
+ self.Duration = 0
+ self.NotifyInfo = {}
+ return
+
+ def GetID(self): return self.ID # ID
+ def GetMixServerDay(self): return self.MixServerDay # 合服第几天
+ def GetDailyID(self): return self.DailyID # 日常活动ID
+ def GetOpenTimeList(self): return self.OpenTimeList # 开启时间列表
+ def GetDuration(self): return self.Duration # 持续时间, 0为不限制
+ def GetNotifyInfo(self): return self.NotifyInfo # 广播提示信息
+
# 副本状态时间表
class IPY_FBStateTime():
@@ -635,6 +676,33 @@
def GetID(self): return self.ID # ID
def GetOpenServerWeek(self): return self.OpenServerWeek # 开服是周几
def GetOpenServerDay(self): return self.OpenServerDay # 开服第几天
+ def GetDataMapID(self): return self.DataMapID # 所属的玩法数据地图ID
+ def GetStartHour(self): return self.StartHour # 开始时
+ def GetStartMinute(self): return self.StartMinute # 开始分
+ def GetEndHour(self): return self.EndHour # 结束时
+ def GetEndMinute(self): return self.EndMinute # 结束分
+ def GetCanEnter(self): return self.CanEnter # 是否可进入副本
+ def GetStateValue(self): return self.StateValue # 状态值
+ def GetNotifyInfoDict(self): return self.NotifyInfoDict # 广播提示信息
+
+# 副本状态时间定制表合服
+class IPY_FBStateTimeCustomMix():
+
+ def __init__(self):
+ self.ID = 0
+ self.MixServerDay = 0
+ self.DataMapID = 0
+ self.StartHour = 0
+ self.StartMinute = 0
+ self.EndHour = 0
+ self.EndMinute = 0
+ self.CanEnter = 0
+ self.StateValue = 0
+ self.NotifyInfoDict = {}
+ return
+
+ def GetID(self): return self.ID # ID
+ def GetMixServerDay(self): return self.MixServerDay # 合服第几天
def GetDataMapID(self): return self.DataMapID # 所属的玩法数据地图ID
def GetStartHour(self): return self.StartHour # 开始时
def GetStartMinute(self): return self.StartMinute # 开始分
@@ -1481,10 +1549,14 @@
self.ipyDailyActionLen = len(self.ipyDailyActionCache)
self.ipyDailyActionCustomCache = self.__LoadFileData("DailyActionCustom", IPY_DailyActionCustom)
self.ipyDailyActionCustomLen = len(self.ipyDailyActionCustomCache)
+ self.ipyDailyActionCustomMixCache = self.__LoadFileData("DailyActionCustomMix", IPY_DailyActionCustomMix)
+ self.ipyDailyActionCustomMixLen = len(self.ipyDailyActionCustomMixCache)
self.ipyFBStateTimeCache = self.__LoadFileData("FBStateTime", IPY_FBStateTime)
self.ipyFBStateTimeLen = len(self.ipyFBStateTimeCache)
self.ipyFBStateTimeCustomCache = self.__LoadFileData("FBStateTimeCustom", IPY_FBStateTimeCustom)
self.ipyFBStateTimeCustomLen = len(self.ipyFBStateTimeCustomCache)
+ self.ipyFBStateTimeCustomMixCache = self.__LoadFileData("FBStateTimeCustomMix", IPY_FBStateTimeCustomMix)
+ self.ipyFBStateTimeCustomMixLen = len(self.ipyFBStateTimeCustomMixCache)
self.ipyFBFuncCache = self.__LoadFileData("FBFunc", IPY_FBFunc)
self.ipyFBFuncLen = len(self.ipyFBFuncCache)
self.ipyFBLineCache = self.__LoadFileData("FBLine", IPY_FBLine)
@@ -1733,10 +1805,14 @@
def GetDailyActionByIndex(self, index): return self.ipyDailyActionCache[index]
def GetDailyActionCustomCount(self): return self.ipyDailyActionCustomLen
def GetDailyActionCustomByIndex(self, index): return self.ipyDailyActionCustomCache[index]
+ def GetDailyActionCustomMixCount(self): return self.ipyDailyActionCustomMixLen
+ def GetDailyActionCustomMixByIndex(self, index): return self.ipyDailyActionCustomMixCache[index]
def GetFBStateTimeCount(self): return self.ipyFBStateTimeLen
def GetFBStateTimeByIndex(self, index): return self.ipyFBStateTimeCache[index]
def GetFBStateTimeCustomCount(self): return self.ipyFBStateTimeCustomLen
def GetFBStateTimeCustomByIndex(self, index): return self.ipyFBStateTimeCustomCache[index]
+ def GetFBStateTimeCustomMixCount(self): return self.ipyFBStateTimeCustomMixLen
+ def GetFBStateTimeCustomMixByIndex(self, index): return self.ipyFBStateTimeCustomMixCache[index]
def GetFBFuncCount(self): return self.ipyFBFuncLen
def GetFBFuncByIndex(self, index): return self.ipyFBFuncCache[index]
def GetFBLineCount(self): return self.ipyFBLineLen
--
Gitblit v1.8.0