SnxxServerCode.git

parent: f8746d12 | 补丁 | 提交 | show whitespace

xdh

2018-10-08 e21e5562aa78b716feb52f78d8cdfccd0affd314

3990 【后端】【主干】仙界盛典开启和关闭时间修改为凌晨5点

5个文件已修改

	PySysDB/PySysDBG.h	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.py	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 PySysDB/PySysDBG.h

@@ -293,6 +293,7 @@
    list        ServerIDList;    //服务器ID列表

    char        StartDate;    //开启日期

    char        EndDate;    //结束日期

    BYTE        ResetType;    //重置类型，0-0点重置；1-5点重置

    dict        NotifyInfoStart;    //全服提示信息 - 相对开始时间

    dict        NotifyInfoEnd;    //全服提示信息 - 相对结束时间

    WORD        LVLimit;    //限制等级


 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

@@ -4510,6 +4510,7 @@
    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d

    WorldLV = 0    #(WORD WorldLV)// 世界等级

    LimitLV = 0    #(WORD LimitLV)// 限制等级

    ResetType = 0    #(BYTE ResetType)// 重置类型 0-0点重置 1-5点重置

    data = None



    def __init__(self):

@@ -4525,6 +4526,7 @@
        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)

        self.WorldLV,_pos = CommFunc.ReadWORD(_lpData, _pos)

        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)

        self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        return _pos



    def Clear(self):

@@ -4536,6 +4538,7 @@
        self.EndtDate = ""

        self.WorldLV = 0

        self.LimitLV = 0

        self.ResetType = 0

        return



    def GetLength(self):

@@ -4545,6 +4548,7 @@
        length += 10

        length += 2

        length += 2

        length += 1



        return length



@@ -4555,6 +4559,7 @@
        data = CommFunc.WriteString(data, 10, self.EndtDate)

        data = CommFunc.WriteWORD(data, self.WorldLV)

        data = CommFunc.WriteWORD(data, self.LimitLV)

        data = CommFunc.WriteBYTE(data, self.ResetType)

        return data



    def OutputString(self):

@@ -4563,14 +4568,16 @@
                                StartDate:%s,

                                EndtDate:%s,

                                WorldLV:%d,

                                LimitLV:%d

                                LimitLV:%d,

                                ResetType:%d

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.WorldLV,

                                self.LimitLV

                                self.LimitLV,

                                self.ResetType

                                )

        return DumpString




 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py

@@ -257,6 +257,7 @@
                        ("list", "ServerIDList", 0),

                        ("char", "StartDate", 0),

                        ("char", "EndDate", 0),

                        ("BYTE", "ResetType", 0),

                        ("dict", "NotifyInfoStart", 0),

                        ("dict", "NotifyInfoEnd", 0),

                        ("WORD", "LVLimit", 0),

@@ -752,6 +753,7 @@
        self.ServerIDList = []

        self.StartDate = ""

        self.EndDate = ""

        self.ResetType = 0

        self.NotifyInfoStart = {}

        self.NotifyInfoEnd = {}

        self.LVLimit = 0
@@ -762,6 +764,7 @@
    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表

    def GetStartDate(self): return self.StartDate # 开启日期

    def GetEndDate(self): return self.EndDate # 结束日期

    def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置

    def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间

    def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间

    def GetLVLimit(self): return self.LVLimit # 限制等级

 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.py

@@ -95,6 +95,7 @@
    fairyCeremonyInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)

    fairyCeremonyInfo.WorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_FairyCeremony)

    fairyCeremonyInfo.LimitLV = ipyData.GetLVLimit()

    fairyCeremonyInfo.ResetType = ipyData.GetResetType()

    if not curPlayer:

        # 全服广播在线玩家

        playerManager = GameWorld.GetPlayerManager()


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py

@@ -4510,6 +4510,7 @@
    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d

    WorldLV = 0    #(WORD WorldLV)// 世界等级

    LimitLV = 0    #(WORD LimitLV)// 限制等级

    ResetType = 0    #(BYTE ResetType)// 重置类型 0-0点重置 1-5点重置

    data = None



    def __init__(self):

@@ -4525,6 +4526,7 @@
        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)

        self.WorldLV,_pos = CommFunc.ReadWORD(_lpData, _pos)

        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)

        self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        return _pos



    def Clear(self):

@@ -4536,6 +4538,7 @@
        self.EndtDate = ""

        self.WorldLV = 0

        self.LimitLV = 0

        self.ResetType = 0

        return



    def GetLength(self):

@@ -4545,6 +4548,7 @@
        length += 10

        length += 2

        length += 2

        length += 1



        return length



@@ -4555,6 +4559,7 @@
        data = CommFunc.WriteString(data, 10, self.EndtDate)

        data = CommFunc.WriteWORD(data, self.WorldLV)

        data = CommFunc.WriteWORD(data, self.LimitLV)

        data = CommFunc.WriteBYTE(data, self.ResetType)

        return data



    def OutputString(self):

@@ -4563,14 +4568,16 @@
                                StartDate:%s,

                                EndtDate:%s,

                                WorldLV:%d,

                                LimitLV:%d

                                LimitLV:%d,

                                ResetType:%d

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.WorldLV,

                                self.LimitLV

                                self.LimitLV,

                                self.ResetType

                                )

        return DumpString

			@@ -293,6 +293,7 @@
			list ServerIDList; //服务器ID列表
			char StartDate; //开启日期
			char EndDate; //结束日期
			BYTE ResetType; //重置类型，0-0点重置；1-5点重置
			dict NotifyInfoStart; //全服提示信息 - 相对开始时间
			dict NotifyInfoEnd; //全服提示信息 - 相对结束时间
			WORD LVLimit; //限制等级

			@@ -4510,6 +4510,7 @@
			EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
			WorldLV = 0 #(WORD WorldLV)// 世界等级
			LimitLV = 0 #(WORD LimitLV)// 限制等级
			ResetType = 0 #(BYTE ResetType)// 重置类型 0-0点重置 1-5点重置
			data = None

			def __init__(self):
			@@ -4525,6 +4526,7 @@
			self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
			self.WorldLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
			self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
			self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			return _pos

			def Clear(self):
			@@ -4536,6 +4538,7 @@
			self.EndtDate = ""
			self.WorldLV = 0
			self.LimitLV = 0
			self.ResetType = 0
			return

			def GetLength(self):
			@@ -4545,6 +4548,7 @@
			length += 10
			length += 2
			length += 2
			length += 1

			return length

			@@ -4555,6 +4559,7 @@
			data = CommFunc.WriteString(data, 10, self.EndtDate)
			data = CommFunc.WriteWORD(data, self.WorldLV)
			data = CommFunc.WriteWORD(data, self.LimitLV)
			data = CommFunc.WriteBYTE(data, self.ResetType)
			return data

			def OutputString(self):
			@@ -4563,14 +4568,16 @@
			StartDate:%s,
			EndtDate:%s,
			WorldLV:%d,
			LimitLV:%d
			LimitLV:%d,
			ResetType:%d
			'''\
			%(
			self.Head.OutputString(),
			self.StartDate,
			self.EndtDate,
			self.WorldLV,
			self.LimitLV
			self.LimitLV,
			self.ResetType
			)
			return DumpString

			@@ -257,6 +257,7 @@
			("list", "ServerIDList", 0),
			("char", "StartDate", 0),
			("char", "EndDate", 0),
			("BYTE", "ResetType", 0),
			("dict", "NotifyInfoStart", 0),
			("dict", "NotifyInfoEnd", 0),
			("WORD", "LVLimit", 0),
			@@ -752,6 +753,7 @@
			self.ServerIDList = []
			self.StartDate = ""
			self.EndDate = ""
			self.ResetType = 0
			self.NotifyInfoStart = {}
			self.NotifyInfoEnd = {}
			self.LVLimit = 0
			@@ -762,6 +764,7 @@
			def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
			def GetStartDate(self): return self.StartDate # 开启日期
			def GetEndDate(self): return self.EndDate # 结束日期
			def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
			def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
			def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
			def GetLVLimit(self): return self.LVLimit # 限制等级

			@@ -95,6 +95,7 @@
			fairyCeremonyInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
			fairyCeremonyInfo.WorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_FairyCeremony)
			fairyCeremonyInfo.LimitLV = ipyData.GetLVLimit()
			fairyCeremonyInfo.ResetType = ipyData.GetResetType()
			if not curPlayer:
			# 全服广播在线玩家
			playerManager = GameWorld.GetPlayerManager()