4869 【主干】【长尾】【BT】运营活动按周开没有判断时间；（增加可配置活动开始天在开服、合服定制天内时，当定制天结束后可继续开启新活动；）

hxp

2020-11-26 a7386015c169263e9fc32496fddb6bce2bbea376

 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py

@@ -3567,6 +3567,58 @@




#------------------------------------------------------

# B9 11 请求加入队伍 #tagCGRequestJoinTeam



class  tagCGRequestJoinTeam(Structure):

    _pack_ = 1

    _fields_ = [

                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("TeamID", c_int),    # 目标队伍ID

                  ]



    def __init__(self):

        self.Clear()

        self.Cmd = 0xB9

        self.SubCmd = 0x11

        return



    def ReadData(self, stringData, _pos=0, _len=0):

        self.Clear()

        memmove(addressof(self), stringData[_pos:], self.GetLength())

        return _pos + self.GetLength()



    def Clear(self):

        self.Cmd = 0xB9

        self.SubCmd = 0x11

        self.TeamID = 0

        return



    def GetLength(self):

        return sizeof(tagCGRequestJoinTeam)



    def GetBuffer(self):

        return string_at(addressof(self), self.GetLength())



    def OutputString(self):

        DumpString = '''// B9 11 请求加入队伍 //tagCGRequestJoinTeam:

                                Cmd:%s,

                                SubCmd:%s,

                                TeamID:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.TeamID

                                )

        return DumpString





m_NAtagCGRequestJoinTeam=tagCGRequestJoinTeam()

ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGRequestJoinTeam.Cmd,m_NAtagCGRequestJoinTeam.SubCmd))] = m_NAtagCGRequestJoinTeam





#------------------------------------------------------

# B9 09 队员进入副本准备选择 #tagCGTeamMemberPrepare



class  tagCGTeamMemberPrepare(Structure):

@@ -7155,6 +7207,7 @@
                  ("SubCmd", c_ubyte),

                  ("PackType", c_ubyte),    #背包类型

                  ("ItemIndex", c_ubyte),    #物品在背包中索引

                  ("IsAll", c_ubyte),    #是否处理所有过期物品

                  ]



    def __init__(self):

@@ -7173,6 +7226,7 @@
        self.SubCmd = 0x08

        self.PackType = 0

        self.ItemIndex = 0

        self.IsAll = 0

        return



    def GetLength(self):

@@ -7186,13 +7240,15 @@
                                Cmd:%s,

                                SubCmd:%s,

                                PackType:%d,

                                ItemIndex:%d

                                ItemIndex:%d,

                                IsAll:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.PackType,

                                self.ItemIndex

                                self.ItemIndex,

                                self.IsAll

                                )

        return DumpString



@@ -10500,7 +10556,7 @@
    _fields_ = [

                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("UseItemCnt", c_ubyte),    #消耗材料个数

                  ("UseItemCnt", c_ushort),    #消耗材料个数

                  ("IsAutoBuy", c_ubyte),    #是否自动购买

                  ]