8848 【主干】【BT2】【后端】所有活动中，不能配置活动开启等级的，补充该配置(每日礼包AA25、充值返利AA27、累计充值返利仙玉AA29、成长...

hxp

2021-03-10 ba6246e20891cc2ace714653818c5b79ace56b01

8848 【主干】【BT2】【后端】所有活动中，不能配置活动开启等级的，补充该配置(每日礼包AA25、充值返利AA27、累计充值返利仙玉AA29、成长必买AA31、节日登录AA42、节日祝福AA43、节日游历AA46 同步冲突);

 PySysDB/PySysDBPY.h

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

    char        StartDate;    //开启日期

    char        EndDate;    //结束日期

    WORD        LVLimit;    //限制等级

    WORD        GiftbagType;    //礼包模板类型

};



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

    char        StartDate;    //开启日期

    char        EndDate;    //结束日期

    WORD        LVLimit;    //限制等级

    BYTE        IsDayReset;    //是否每天重置

    list        TemplateIDList;    //模板ID列表

};

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

    char        StartDate;    //开启日期

    char        EndDate;    //结束日期

    WORD        LVLimit;    //限制等级

    list        CTGIDGroupList;    //充值编号组列表 [[ctgID, ...], ...]

};



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

    char        StartDate;    //开启日期

    char        EndDate;    //结束日期

    WORD        LVLimit;    //限制等级

    dict        TemplateIDInfo;    //模板信息 {(世界等级A,B):奖励模板编号, ...}

};



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

    char        StartDate;    //开启日期

    char        EndDate;    //结束日期

    WORD        LVLimit;    //限制等级

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

    dict        TemplateIDInfo;    //模板信息 {(世界等级A,B):模板编号, ...}

};

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

    char        StartDate;    //开启日期

    char        EndDate;    //结束日期

    WORD        LVLimit;    //限制等级

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

    dict        TemplateIDInfo;    //模板信息 {(世界等级A,B):模板编号, ...}

};


 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

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

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

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

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

    GroupCount = 0    #(BYTE GroupCount)// 循环购买礼包组数

    GroupList = list()    #(vector<tagMCActGrowupBuyGroup> GroupList)//循环购买礼包组列表

    data = None

@@ -24748,6 +24749,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

        for i in range(self.GroupCount):

            temGroupList = tagMCActGrowupBuyGroup()

@@ -24762,6 +24764,7 @@
        self.Head.SubCmd = 0x31

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.GroupCount = 0

        self.GroupList = list()

        return

@@ -24771,6 +24774,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        for i in range(self.GroupCount):

            length += self.GroupList[i].GetLength()

@@ -24782,6 +24786,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.LimitLV)

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

        for i in range(self.GroupCount):

            data = CommFunc.WriteString(data, self.GroupList[i].GetLength(), self.GroupList[i].GetBuffer())

@@ -24792,6 +24797,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                GroupCount:%d,

                                GroupList:%s

                                '''\

@@ -24799,6 +24805,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.GroupCount,

                                "..."

                                )

@@ -25336,6 +25343,7 @@
    Head = tagHead()

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

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

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

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

    PrizeDays = 0    #(BYTE PrizeDays)

    PrizeDayInfo = list()    #(vector<tagMCActRechargePrizeDay> PrizeDayInfo)//每天对应信息; 如果只有一天，但是活动有多天，则代表每天奖励都一样

@@ -25352,6 +25360,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

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

        for i in range(self.PrizeDays):

@@ -25367,6 +25376,7 @@
        self.Head.SubCmd = 0x27

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.IsDayReset = 0

        self.PrizeDays = 0

        self.PrizeDayInfo = list()

@@ -25377,6 +25387,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        length += 1

        for i in range(self.PrizeDays):

@@ -25389,6 +25400,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.LimitLV)

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

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

        for i in range(self.PrizeDays):

@@ -25400,6 +25412,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                IsDayReset:%d,

                                PrizeDays:%d,

                                PrizeDayInfo:%s

@@ -25408,6 +25421,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.IsDayReset,

                                self.PrizeDays,

                                "..."

@@ -27120,6 +27134,7 @@


class  tagMCDailyGiftbagInfo(Structure):

    Head = tagHead()

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

    GiftbagCount = 0    #(BYTE GiftbagCount)// 礼包数

    GiftbagInfo = list()    #(vector<tagMCDailyGiftbag> GiftbagInfo)// 礼包信息

    data = None

@@ -27133,6 +27148,7 @@
    def ReadData(self, _lpData, _pos=0, _Len=0):

        self.Clear()

        _pos = self.Head.ReadData(_lpData, _pos)

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

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

        for i in range(self.GiftbagCount):

            temGiftbagInfo = tagMCDailyGiftbag()

@@ -27145,6 +27161,7 @@
        self.Head.Clear()

        self.Head.Cmd = 0xAA

        self.Head.SubCmd = 0x25

        self.LimitLV = 0

        self.GiftbagCount = 0

        self.GiftbagInfo = list()

        return

@@ -27152,6 +27169,7 @@
    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 2

        length += 1

        for i in range(self.GiftbagCount):

            length += self.GiftbagInfo[i].GetLength()

@@ -27161,6 +27179,7 @@
    def GetBuffer(self):

        data = ''

        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())

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

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

        for i in range(self.GiftbagCount):

            data = CommFunc.WriteString(data, self.GiftbagInfo[i].GetLength(), self.GiftbagInfo[i].GetBuffer())

@@ -27169,11 +27188,13 @@
    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                LimitLV:%d,

                                GiftbagCount:%d,

                                GiftbagInfo:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.LimitLV,

                                self.GiftbagCount,

                                "..."

                                )

@@ -27451,6 +27472,7 @@
    Head = tagHead()

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

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

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

    DayCount = 0    #(BYTE DayCount)// 总共几天

    DayAwardList = list()    #(vector<tagMCFeastLoginDayAward> DayAwardList)//登录天奖励列表

    data = None

@@ -27466,6 +27488,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

        for i in range(self.DayCount):

            temDayAwardList = tagMCFeastLoginDayAward()

@@ -27480,6 +27503,7 @@
        self.Head.SubCmd = 0x42

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.DayCount = 0

        self.DayAwardList = list()

        return

@@ -27489,6 +27513,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        for i in range(self.DayCount):

            length += self.DayAwardList[i].GetLength()

@@ -27500,6 +27525,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.LimitLV)

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

        for i in range(self.DayCount):

            data = CommFunc.WriteString(data, self.DayAwardList[i].GetLength(), self.DayAwardList[i].GetBuffer())

@@ -27510,6 +27536,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                DayCount:%d,

                                DayAwardList:%s

                                '''\

@@ -27517,6 +27544,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.DayCount,

                                "..."

                                )

@@ -27751,6 +27779,7 @@
    Head = tagHead()

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

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

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

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

    TravelTaskCount = 0    #(BYTE TravelTaskCount)// 游历任务数

    TravelTaskList = list()    #(vector<tagMCFeastTravelTask> TravelTaskList)//游历任务信息列表

@@ -27769,6 +27798,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

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

        for i in range(self.TravelTaskCount):

@@ -27789,6 +27819,7 @@
        self.Head.SubCmd = 0x46

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.ResetType = 0

        self.TravelTaskCount = 0

        self.TravelTaskList = list()

@@ -27801,6 +27832,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        length += 1

        for i in range(self.TravelTaskCount):

@@ -27816,6 +27848,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.LimitLV)

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

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

        for i in range(self.TravelTaskCount):

@@ -27830,6 +27863,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                ResetType:%d,

                                TravelTaskCount:%d,

                                TravelTaskList:%s,

@@ -27840,6 +27874,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.ResetType,

                                self.TravelTaskCount,

                                "...",

@@ -28667,6 +28702,7 @@
    Head = tagHead()

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

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

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

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

    WishPoolShowCount = 0    #(BYTE WishPoolShowCount)//祝福池展示物品数

    WishPoolShowItemList = list()    #(vector<DWORD> WishPoolShowItemList)//祝福池展示物品ID列表

@@ -28685,6 +28721,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

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

        for i in range(self.WishPoolShowCount):

@@ -28704,6 +28741,7 @@
        self.Head.SubCmd = 0x43

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.ResetType = 0

        self.WishPoolShowCount = 0

        self.WishPoolShowItemList = list()

@@ -28716,6 +28754,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        length += 1

        length += 4 * self.WishPoolShowCount

@@ -28730,6 +28769,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.LimitLV)

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

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

        for i in range(self.WishPoolShowCount):

@@ -28744,6 +28784,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                ResetType:%d,

                                WishPoolShowCount:%d,

                                WishPoolShowItemList:%s,

@@ -28754,6 +28795,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.ResetType,

                                self.WishPoolShowCount,

                                "...",


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

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

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

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

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

    GroupCount = 0    #(BYTE GroupCount)// 循环购买礼包组数

    GroupList = list()    #(vector<tagMCActGrowupBuyGroup> GroupList)//循环购买礼包组列表

    data = None

@@ -24748,6 +24749,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

        for i in range(self.GroupCount):

            temGroupList = tagMCActGrowupBuyGroup()

@@ -24762,6 +24764,7 @@
        self.Head.SubCmd = 0x31

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.GroupCount = 0

        self.GroupList = list()

        return

@@ -24771,6 +24774,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        for i in range(self.GroupCount):

            length += self.GroupList[i].GetLength()

@@ -24782,6 +24786,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.LimitLV)

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

        for i in range(self.GroupCount):

            data = CommFunc.WriteString(data, self.GroupList[i].GetLength(), self.GroupList[i].GetBuffer())

@@ -24792,6 +24797,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                GroupCount:%d,

                                GroupList:%s

                                '''\

@@ -24799,6 +24805,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.GroupCount,

                                "..."

                                )

@@ -25336,6 +25343,7 @@
    Head = tagHead()

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

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

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

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

    PrizeDays = 0    #(BYTE PrizeDays)

    PrizeDayInfo = list()    #(vector<tagMCActRechargePrizeDay> PrizeDayInfo)//每天对应信息; 如果只有一天，但是活动有多天，则代表每天奖励都一样

@@ -25352,6 +25360,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

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

        for i in range(self.PrizeDays):

@@ -25367,6 +25376,7 @@
        self.Head.SubCmd = 0x27

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.IsDayReset = 0

        self.PrizeDays = 0

        self.PrizeDayInfo = list()

@@ -25377,6 +25387,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        length += 1

        for i in range(self.PrizeDays):

@@ -25389,6 +25400,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.LimitLV)

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

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

        for i in range(self.PrizeDays):

@@ -25400,6 +25412,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                IsDayReset:%d,

                                PrizeDays:%d,

                                PrizeDayInfo:%s

@@ -25408,6 +25421,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.IsDayReset,

                                self.PrizeDays,

                                "..."

@@ -27120,6 +27134,7 @@


class  tagMCDailyGiftbagInfo(Structure):

    Head = tagHead()

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

    GiftbagCount = 0    #(BYTE GiftbagCount)// 礼包数

    GiftbagInfo = list()    #(vector<tagMCDailyGiftbag> GiftbagInfo)// 礼包信息

    data = None

@@ -27133,6 +27148,7 @@
    def ReadData(self, _lpData, _pos=0, _Len=0):

        self.Clear()

        _pos = self.Head.ReadData(_lpData, _pos)

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

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

        for i in range(self.GiftbagCount):

            temGiftbagInfo = tagMCDailyGiftbag()

@@ -27145,6 +27161,7 @@
        self.Head.Clear()

        self.Head.Cmd = 0xAA

        self.Head.SubCmd = 0x25

        self.LimitLV = 0

        self.GiftbagCount = 0

        self.GiftbagInfo = list()

        return

@@ -27152,6 +27169,7 @@
    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 2

        length += 1

        for i in range(self.GiftbagCount):

            length += self.GiftbagInfo[i].GetLength()

@@ -27161,6 +27179,7 @@
    def GetBuffer(self):

        data = ''

        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())

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

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

        for i in range(self.GiftbagCount):

            data = CommFunc.WriteString(data, self.GiftbagInfo[i].GetLength(), self.GiftbagInfo[i].GetBuffer())

@@ -27169,11 +27188,13 @@
    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                LimitLV:%d,

                                GiftbagCount:%d,

                                GiftbagInfo:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.LimitLV,

                                self.GiftbagCount,

                                "..."

                                )

@@ -27451,6 +27472,7 @@
    Head = tagHead()

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

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

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

    DayCount = 0    #(BYTE DayCount)// 总共几天

    DayAwardList = list()    #(vector<tagMCFeastLoginDayAward> DayAwardList)//登录天奖励列表

    data = None

@@ -27466,6 +27488,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

        for i in range(self.DayCount):

            temDayAwardList = tagMCFeastLoginDayAward()

@@ -27480,6 +27503,7 @@
        self.Head.SubCmd = 0x42

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.DayCount = 0

        self.DayAwardList = list()

        return

@@ -27489,6 +27513,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        for i in range(self.DayCount):

            length += self.DayAwardList[i].GetLength()

@@ -27500,6 +27525,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.LimitLV)

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

        for i in range(self.DayCount):

            data = CommFunc.WriteString(data, self.DayAwardList[i].GetLength(), self.DayAwardList[i].GetBuffer())

@@ -27510,6 +27536,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                DayCount:%d,

                                DayAwardList:%s

                                '''\

@@ -27517,6 +27544,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.DayCount,

                                "..."

                                )

@@ -27751,6 +27779,7 @@
    Head = tagHead()

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

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

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

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

    TravelTaskCount = 0    #(BYTE TravelTaskCount)// 游历任务数

    TravelTaskList = list()    #(vector<tagMCFeastTravelTask> TravelTaskList)//游历任务信息列表

@@ -27769,6 +27798,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

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

        for i in range(self.TravelTaskCount):

@@ -27789,6 +27819,7 @@
        self.Head.SubCmd = 0x46

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.ResetType = 0

        self.TravelTaskCount = 0

        self.TravelTaskList = list()

@@ -27801,6 +27832,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        length += 1

        for i in range(self.TravelTaskCount):

@@ -27816,6 +27848,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.LimitLV)

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

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

        for i in range(self.TravelTaskCount):

@@ -27830,6 +27863,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                ResetType:%d,

                                TravelTaskCount:%d,

                                TravelTaskList:%s,

@@ -27840,6 +27874,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.ResetType,

                                self.TravelTaskCount,

                                "...",

@@ -28667,6 +28702,7 @@
    Head = tagHead()

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

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

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

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

    WishPoolShowCount = 0    #(BYTE WishPoolShowCount)//祝福池展示物品数

    WishPoolShowItemList = list()    #(vector<DWORD> WishPoolShowItemList)//祝福池展示物品ID列表

@@ -28685,6 +28721,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

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

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

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

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

        for i in range(self.WishPoolShowCount):

@@ -28704,6 +28741,7 @@
        self.Head.SubCmd = 0x43

        self.StartDate = ""

        self.EndtDate = ""

        self.LimitLV = 0

        self.ResetType = 0

        self.WishPoolShowCount = 0

        self.WishPoolShowItemList = list()

@@ -28716,6 +28754,7 @@
        length += self.Head.GetLength()

        length += 10

        length += 10

        length += 2

        length += 1

        length += 1

        length += 4 * self.WishPoolShowCount

@@ -28730,6 +28769,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.LimitLV)

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

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

        for i in range(self.WishPoolShowCount):

@@ -28744,6 +28784,7 @@
                                Head:%s,

                                StartDate:%s,

                                EndtDate:%s,

                                LimitLV:%d,

                                ResetType:%d,

                                WishPoolShowCount:%d,

                                WishPoolShowItemList:%s,

@@ -28754,6 +28795,7 @@
                                self.Head.OutputString(),

                                self.StartDate,

                                self.EndtDate,

                                self.LimitLV,

                                self.ResetType,

                                self.WishPoolShowCount,

                                "...",


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

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

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

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

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

                        ("WORD", "GiftbagType", 0),

                        ),



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

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

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

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

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

                        ("list", "TemplateIDList", 0),

                        ),

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

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

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

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

                        ("list", "CTGIDGroupList", 0),

                        ),



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

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

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

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

                        ("dict", "TemplateIDInfo", 0),

                        ),



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

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

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

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

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

                        ("dict", "TemplateIDInfo", 0),

                        ),

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

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

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

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

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

                        ("dict", "TemplateIDInfo", 0),

                        ),

@@ -3936,12 +3942,14 @@
        self.CfgID = 0

        self.StartDate = ""

        self.EndDate = ""

        self.LVLimit = 0

        self.GiftbagType = 0
        return
        
    def GetCfgID(self): return self.CfgID # 配置ID

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

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

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

    def GetGiftbagType(self): return self.GiftbagType # 礼包模板类型

# 每日礼包模板表
@@ -4286,6 +4294,7 @@
        self.CfgID = 0

        self.StartDate = ""

        self.EndDate = ""

        self.LVLimit = 0

        self.IsDayReset = 0

        self.TemplateIDList = []
        return
@@ -4293,6 +4302,7 @@
    def GetCfgID(self): return self.CfgID # 配置ID

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

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

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

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

    def GetTemplateIDList(self): return self.TemplateIDList # 模板ID列表

@@ -4354,12 +4364,14 @@
        self.CfgID = 0

        self.StartDate = ""

        self.EndDate = ""

        self.LVLimit = 0

        self.CTGIDGroupList = []
        return
        
    def GetCfgID(self): return self.CfgID # 配置ID

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

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

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

    def GetCTGIDGroupList(self): return self.CTGIDGroupList # 充值编号组列表 [[ctgID, ...], ...]

# 法宝副本表
@@ -4665,12 +4677,14 @@
        self.CfgID = 0

        self.StartDate = ""

        self.EndDate = ""

        self.LVLimit = 0

        self.TemplateIDInfo = {}
        return
        
    def GetCfgID(self): return self.CfgID # 配置ID

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

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

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

    def GetTemplateIDInfo(self): return self.TemplateIDInfo # 模板信息 {(世界等级A,B):奖励模板编号, ...}

# 节日登录奖励模板表
@@ -4693,6 +4707,7 @@
        self.CfgID = 0

        self.StartDate = ""

        self.EndDate = ""

        self.LVLimit = 0

        self.ResetType = 0

        self.TemplateIDInfo = {}
        return
@@ -4700,6 +4715,7 @@
    def GetCfgID(self): return self.CfgID # 配置ID

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

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

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

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

    def GetTemplateIDInfo(self): return self.TemplateIDInfo # 模板信息 {(世界等级A,B):模板编号, ...}

@@ -4748,6 +4764,7 @@
        self.CfgID = 0

        self.StartDate = ""

        self.EndDate = ""

        self.LVLimit = 0

        self.ResetType = 0

        self.TemplateIDInfo = {}
        return
@@ -4755,6 +4772,7 @@
    def GetCfgID(self): return self.CfgID # 配置ID

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

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

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

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

    def GetTemplateIDInfo(self): return self.TemplateIDInfo # 模板信息 {(世界等级A,B):模板编号, ...}