SnxxServerCode.git

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

xdh

2019-01-14 e463972e32a6c06dd215a55e1d7799be2bc6f1c5

5768 【后端】【1.5】新增8-14天活动功能(增加提前显示）

7个文件已修改

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

 PySysDB/PySysDBG.h

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

    char        StartDate;    //开启日期

    char        EndDate;    //结束日期

    WORD        AdvanceMinutes;    //前端提前X分钟展示活动

    BYTE        IsDayReset;    //是否每天重置

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

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


 PySysDB/PySysDBPY.h

@@ -1524,6 +1524,7 @@
    DWORD        _CfgID;    //配置ID

    char        StartDate;    //开启日期

    char        EndDate;    //结束日期

    WORD        AdvanceMinutes;    //前端提前X分钟展示活动

    BYTE        IsDayReset;    //是否每天重置

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

    WORD        LVLimit;    //限制等级


 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

@@ -23199,7 +23199,7 @@
class  tagMCWeekPartyAction(Structure):

    TemplateID = 0    #(DWORD TemplateID)// 模板ID

    ActionType = 0    #(WORD ActionType)// 活动类别

    TotalTimes = 0    #(BYTE TotalTimes)// 可完成的总次数，0表示不限次数

    TotalTimes = 0    #(DWORD TotalTimes)// 可完成的总次数，0表示不限次数

    SingleTimes = 0    #(DWORD SingleTimes)// 单次领奖需要的次数

    Point = 0    #(DWORD Point)// 单次领奖积分

    Count = 0    #(BYTE Count)// 物品数

@@ -23214,7 +23214,7 @@
        self.Clear()

        self.TemplateID,_pos = CommFunc.ReadDWORD(_lpData, _pos)

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

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

        self.TotalTimes,_pos = CommFunc.ReadDWORD(_lpData, _pos)

        self.SingleTimes,_pos = CommFunc.ReadDWORD(_lpData, _pos)

        self.Point,_pos = CommFunc.ReadDWORD(_lpData, _pos)

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

@@ -23238,7 +23238,7 @@
        length = 0

        length += 4

        length += 2

        length += 1

        length += 4

        length += 4

        length += 4

        length += 1

@@ -23251,7 +23251,7 @@
        data = ''

        data = CommFunc.WriteDWORD(data, self.TemplateID)

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

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

        data = CommFunc.WriteDWORD(data, self.TotalTimes)

        data = CommFunc.WriteDWORD(data, self.SingleTimes)

        data = CommFunc.WriteDWORD(data, self.Point)

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

@@ -23352,6 +23352,7 @@
    Head = tagHead()

    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d

    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d

    AdvanceMinutes = 0    #(WORD AdvanceMinutes)// 提前显示分钟

    IsDayReset = 0    #(BYTE IsDayReset)//是否每天重置

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

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

@@ -23372,6 +23373,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)

        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)

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

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

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

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

@@ -23394,6 +23396,7 @@
        self.Head.SubCmd = 0x0A

        self.StartDate = ""

        self.EndtDate = ""

        self.AdvanceMinutes = 0

        self.IsDayReset = 0

        self.ResetType = 0

        self.LimitLV = 0

@@ -23408,6 +23411,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        length += 1

        length += 2

@@ -23425,6 +23429,7 @@
        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())

        data = CommFunc.WriteString(data, 10, self.StartDate)

        data = CommFunc.WriteString(data, 10, self.EndtDate)

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

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

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

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

@@ -23441,6 +23446,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                AdvanceMinutes:%d,

                                IsDayReset:%d,

                                ResetType:%d,

                                LimitLV:%d,

@@ -23453,6 +23459,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.AdvanceMinutes,

                                self.IsDayReset,

                                self.ResetType,

                                self.LimitLV,


 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py

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

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

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

                        ("WORD", "AdvanceMinutes", 0),

                        ("BYTE", "IsDayReset", 0),

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

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

@@ -1213,6 +1214,7 @@
        self.ServerIDList = []

        self.StartDate = ""

        self.EndDate = ""

        self.AdvanceMinutes = 0

        self.IsDayReset = 0

        self.ResetType = 0

        self.NotifyInfoStart = {}

@@ -1226,6 +1228,7 @@
    def GetServerIDList(self): return self.ServerIDList # 服务器ID列表

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

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

    def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动

    def GetIsDayReset(self): return self.IsDayReset # 是否每天重置

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

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


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

@@ -23199,7 +23199,7 @@
class  tagMCWeekPartyAction(Structure):

    TemplateID = 0    #(DWORD TemplateID)// 模板ID

    ActionType = 0    #(WORD ActionType)// 活动类别

    TotalTimes = 0    #(BYTE TotalTimes)// 可完成的总次数，0表示不限次数

    TotalTimes = 0    #(DWORD TotalTimes)// 可完成的总次数，0表示不限次数

    SingleTimes = 0    #(DWORD SingleTimes)// 单次领奖需要的次数

    Point = 0    #(DWORD Point)// 单次领奖积分

    Count = 0    #(BYTE Count)// 物品数

@@ -23214,7 +23214,7 @@
        self.Clear()

        self.TemplateID,_pos = CommFunc.ReadDWORD(_lpData, _pos)

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

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

        self.TotalTimes,_pos = CommFunc.ReadDWORD(_lpData, _pos)

        self.SingleTimes,_pos = CommFunc.ReadDWORD(_lpData, _pos)

        self.Point,_pos = CommFunc.ReadDWORD(_lpData, _pos)

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

@@ -23238,7 +23238,7 @@
        length = 0

        length += 4

        length += 2

        length += 1

        length += 4

        length += 4

        length += 4

        length += 1

@@ -23251,7 +23251,7 @@
        data = ''

        data = CommFunc.WriteDWORD(data, self.TemplateID)

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

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

        data = CommFunc.WriteDWORD(data, self.TotalTimes)

        data = CommFunc.WriteDWORD(data, self.SingleTimes)

        data = CommFunc.WriteDWORD(data, self.Point)

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

@@ -23352,6 +23352,7 @@
    Head = tagHead()

    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d

    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d

    AdvanceMinutes = 0    #(WORD AdvanceMinutes)// 提前显示分钟

    IsDayReset = 0    #(BYTE IsDayReset)//是否每天重置

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

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

@@ -23372,6 +23373,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)

        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)

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

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

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

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

@@ -23394,6 +23396,7 @@
        self.Head.SubCmd = 0x0A

        self.StartDate = ""

        self.EndtDate = ""

        self.AdvanceMinutes = 0

        self.IsDayReset = 0

        self.ResetType = 0

        self.LimitLV = 0

@@ -23408,6 +23411,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        length += 1

        length += 2

@@ -23425,6 +23429,7 @@
        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())

        data = CommFunc.WriteString(data, 10, self.StartDate)

        data = CommFunc.WriteString(data, 10, self.EndtDate)

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

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

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

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

@@ -23441,6 +23446,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                AdvanceMinutes:%d,

                                IsDayReset:%d,

                                ResetType:%d,

                                LimitLV:%d,

@@ -23453,6 +23459,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.AdvanceMinutes,

                                self.IsDayReset,

                                self.ResetType,

                                self.LimitLV,


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

@@ -1197,6 +1197,7 @@
                        ("DWORD", "CfgID", 1),

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

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

                        ("WORD", "AdvanceMinutes", 0),

                        ("BYTE", "IsDayReset", 0),

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

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

@@ -3657,6 +3658,7 @@
        self.CfgID = 0

        self.StartDate = ""

        self.EndDate = ""

        self.AdvanceMinutes = 0

        self.IsDayReset = 0

        self.ResetType = 0

        self.LVLimit = 0

@@ -3667,6 +3669,7 @@
    def GetCfgID(self): return self.CfgID # 配置ID

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

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

    def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动

    def GetIsDayReset(self): return self.IsDayReset # 是否每天重置

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

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


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.py

@@ -325,6 +325,7 @@
    actInfo.Clear()

    actInfo.StartDate = GameWorld.GetOperationActionDateStr(actBossIpyData.GetStartDate(), openServerDay)

    actInfo.EndtDate = GameWorld.GetOperationActionDateStr(actBossIpyData.GetEndDate(), openServerDay)

    actInfo.AdvanceMinutes = actBossIpyData.GetAdvanceMinutes()

    actInfo.IsDayReset = actBossIpyData.GetIsDayReset()

    actInfo.ResetType = actBossIpyData.GetResetType()

    actInfo.LimitLV = actBossIpyData.GetLVLimit()

			@@ -491,6 +491,7 @@
			list ServerIDList; //服务器ID列表
			char StartDate; //开启日期
			char EndDate; //结束日期
			WORD AdvanceMinutes; //前端提前X分钟展示活动
			BYTE IsDayReset; //是否每天重置
			BYTE ResetType; //重置类型，0-0点重置；1-5点重置
			dict NotifyInfoStart; //全服提示信息 - 相对开始时间

			@@ -1524,6 +1524,7 @@
			DWORD _CfgID; //配置ID
			char StartDate; //开启日期
			char EndDate; //结束日期
			WORD AdvanceMinutes; //前端提前X分钟展示活动
			BYTE IsDayReset; //是否每天重置
			BYTE ResetType; //重置类型，0-0点重置；1-5点重置
			WORD LVLimit; //限制等级

			@@ -23199,7 +23199,7 @@
			class tagMCWeekPartyAction(Structure):
			TemplateID = 0 #(DWORD TemplateID)// 模板ID
			ActionType = 0 #(WORD ActionType)// 活动类别
			TotalTimes = 0 #(BYTE TotalTimes)// 可完成的总次数，0表示不限次数
			TotalTimes = 0 #(DWORD TotalTimes)// 可完成的总次数，0表示不限次数
			SingleTimes = 0 #(DWORD SingleTimes)// 单次领奖需要的次数
			Point = 0 #(DWORD Point)// 单次领奖积分
			Count = 0 #(BYTE Count)// 物品数
			@@ -23214,7 +23214,7 @@
			self.Clear()
			self.TemplateID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.ActionType,_pos = CommFunc.ReadWORD(_lpData, _pos)
			self.TotalTimes,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.TotalTimes,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.SingleTimes,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.Point,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			@@ -23238,7 +23238,7 @@
			length = 0
			length += 4
			length += 2
			length += 1
			length += 4
			length += 4
			length += 4
			length += 1
			@@ -23251,7 +23251,7 @@
			data = ''
			data = CommFunc.WriteDWORD(data, self.TemplateID)
			data = CommFunc.WriteWORD(data, self.ActionType)
			data = CommFunc.WriteBYTE(data, self.TotalTimes)
			data = CommFunc.WriteDWORD(data, self.TotalTimes)
			data = CommFunc.WriteDWORD(data, self.SingleTimes)
			data = CommFunc.WriteDWORD(data, self.Point)
			data = CommFunc.WriteBYTE(data, self.Count)
			@@ -23352,6 +23352,7 @@
			Head = tagHead()
			StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
			EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
			AdvanceMinutes = 0 #(WORD AdvanceMinutes)// 提前显示分钟
			IsDayReset = 0 #(BYTE IsDayReset)//是否每天重置
			ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点重置
			LimitLV = 0 #(WORD LimitLV)// 限制等级
			@@ -23372,6 +23373,7 @@
			_pos = self.Head.ReadData(_lpData, _pos)
			self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
			self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
			self.AdvanceMinutes,_pos = CommFunc.ReadWORD(_lpData, _pos)
			self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
			@@ -23394,6 +23396,7 @@
			self.Head.SubCmd = 0x0A
			self.StartDate = ""
			self.EndtDate = ""
			self.AdvanceMinutes = 0
			self.IsDayReset = 0
			self.ResetType = 0
			self.LimitLV = 0
			@@ -23408,6 +23411,7 @@
			length += self.Head.GetLength()
			length += 10
			length += 10
			length += 2
			length += 1
			length += 1
			length += 2
			@@ -23425,6 +23429,7 @@
			data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
			data = CommFunc.WriteString(data, 10, self.StartDate)
			data = CommFunc.WriteString(data, 10, self.EndtDate)
			data = CommFunc.WriteWORD(data, self.AdvanceMinutes)
			data = CommFunc.WriteBYTE(data, self.IsDayReset)
			data = CommFunc.WriteBYTE(data, self.ResetType)
			data = CommFunc.WriteWORD(data, self.LimitLV)
			@@ -23441,6 +23446,7 @@
			Head:%s,
			StartDate:%s,
			EndtDate:%s,
			AdvanceMinutes:%d,
			IsDayReset:%d,
			ResetType:%d,
			LimitLV:%d,
			@@ -23453,6 +23459,7 @@
			self.Head.OutputString(),
			self.StartDate,
			self.EndtDate,
			self.AdvanceMinutes,
			self.IsDayReset,
			self.ResetType,
			self.LimitLV,

			@@ -412,6 +412,7 @@
			("list", "ServerIDList", 0),
			("char", "StartDate", 0),
			("char", "EndDate", 0),
			("WORD", "AdvanceMinutes", 0),
			("BYTE", "IsDayReset", 0),
			("BYTE", "ResetType", 0),
			("dict", "NotifyInfoStart", 0),
			@@ -1213,6 +1214,7 @@
			self.ServerIDList = []
			self.StartDate = ""
			self.EndDate = ""
			self.AdvanceMinutes = 0
			self.IsDayReset = 0
			self.ResetType = 0
			self.NotifyInfoStart = {}
			@@ -1226,6 +1228,7 @@
			def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
			def GetStartDate(self): return self.StartDate # 开启日期
			def GetEndDate(self): return self.EndDate # 结束日期
			def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动
			def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
			def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
			def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间

			@@ -1197,6 +1197,7 @@
			("DWORD", "CfgID", 1),
			("char", "StartDate", 0),
			("char", "EndDate", 0),
			("WORD", "AdvanceMinutes", 0),
			("BYTE", "IsDayReset", 0),
			("BYTE", "ResetType", 0),
			("WORD", "LVLimit", 0),
			@@ -3657,6 +3658,7 @@
			self.CfgID = 0
			self.StartDate = ""
			self.EndDate = ""
			self.AdvanceMinutes = 0
			self.IsDayReset = 0
			self.ResetType = 0
			self.LVLimit = 0
			@@ -3667,6 +3669,7 @@
			def GetCfgID(self): return self.CfgID # 配置ID
			def GetStartDate(self): return self.StartDate # 开启日期
			def GetEndDate(self): return self.EndDate # 结束日期
			def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动
			def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
			def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
			def GetLVLimit(self): return self.LVLimit # 限制等级

			@@ -325,6 +325,7 @@
			actInfo.Clear()
			actInfo.StartDate = GameWorld.GetOperationActionDateStr(actBossIpyData.GetStartDate(), openServerDay)
			actInfo.EndtDate = GameWorld.GetOperationActionDateStr(actBossIpyData.GetEndDate(), openServerDay)
			actInfo.AdvanceMinutes = actBossIpyData.GetAdvanceMinutes()
			actInfo.IsDayReset = actBossIpyData.GetIsDayReset()
			actInfo.ResetType = actBossIpyData.GetResetType()
			actInfo.LimitLV = actBossIpyData.GetLVLimit()