66 【公会】基础主体-服务端（公会GM命令支持跨服 CreateFamily、Family、Zhenbaoge；跨服公会聊天支持，包含公会聊天缓存；...

hxp

5 天以前 f2cf64ffabcd15d5497aee8914b8d37d8b9a88b0

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/DBStruct.py

@@ -747,6 +747,11 @@
        ('FightPowerEx', ctypes.c_ulong),

        ('EmblemID', ctypes.c_ushort),

        ('EmblemWord', ctypes.c_char * 3),

        ('Extra1', ctypes.c_ulong),

        ('Extra2', ctypes.c_ulong),

        ('Extra3', ctypes.c_ulong),

        ('Extra4', ctypes.c_ulong),

        ('Extra5', ctypes.c_ulong),

        ('ADOResult', ctypes.c_ulong),

    ]



@@ -770,6 +775,11 @@
        self.FightPowerEx = 0

        self.EmblemID = 0

        self.EmblemWord = ''

        self.Extra1 = 0

        self.Extra2 = 0

        self.Extra3 = 0

        self.Extra4 = 0

        self.Extra5 = 0



    def readData(self, buf, pos = 0, length = 0):

        if not pos <= length:

@@ -793,6 +803,11 @@
        self.FightPowerEx, pos = CommFunc.ReadDWORD(buf, pos)

        self.EmblemID, pos = CommFunc.ReadWORD(buf, pos)

        self.EmblemWord, pos = CommFunc.ReadString(buf, pos, 3)

        self.Extra1, pos = CommFunc.ReadDWORD(buf, pos)

        self.Extra2, pos = CommFunc.ReadDWORD(buf, pos)

        self.Extra3, pos = CommFunc.ReadDWORD(buf, pos)

        self.Extra4, pos = CommFunc.ReadDWORD(buf, pos)

        self.Extra5, pos = CommFunc.ReadDWORD(buf, pos)

        return self.getLength()



    def getBuffer(self):

@@ -812,6 +827,11 @@
        buf = CommFunc.WriteDWORD(buf, self.FightPowerEx)

        buf = CommFunc.WriteWORD(buf, self.EmblemID)

        buf = CommFunc.WriteString(buf, sizeof(ctypes.c_char) * 3, self.EmblemWord)

        buf = CommFunc.WriteDWORD(buf, self.Extra1)

        buf = CommFunc.WriteDWORD(buf, self.Extra2)

        buf = CommFunc.WriteDWORD(buf, self.Extra3)

        buf = CommFunc.WriteDWORD(buf, self.Extra4)

        buf = CommFunc.WriteDWORD(buf, self.Extra5)

        return buf



    def getLength(self):

@@ -831,6 +851,11 @@
        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ushort)

        length += sizeof(ctypes.c_char) * 3

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

        return length



    def outputString(self):

@@ -850,6 +875,11 @@
            FightPowerEx = %s,

            EmblemID = %s,

            EmblemWord = %s,

            Extra1 = %s,

            Extra2 = %s,

            Extra3 = %s,

            Extra4 = %s,

            Extra5 = %s,

            ADOResult = %s,

            '''%(

                self.ID,

@@ -867,6 +897,11 @@
                self.FightPowerEx,

                self.EmblemID,

                self.EmblemWord,

                self.Extra1,

                self.Extra2,

                self.Extra3,

                self.Extra4,

                self.Extra5,

                self.ADOResult,

            )

        return output

@@ -907,6 +942,7 @@
        ('ContribDay', ctypes.c_ulong),

        ('DonateCntTotal', ctypes.c_ulong),

        ('DonateCntDay', ctypes.c_ubyte),

        ('TitleID', ctypes.c_ulong),

        ('ADOResult', ctypes.c_ulong),

    ]



@@ -942,6 +978,7 @@
        self.ContribDay, pos = CommFunc.ReadDWORD(buf, pos)

        self.DonateCntTotal, pos = CommFunc.ReadDWORD(buf, pos)

        self.DonateCntDay, pos = CommFunc.ReadBYTE(buf, pos)

        self.TitleID, pos = CommFunc.ReadDWORD(buf, pos)

        return self.getLength()





@@ -973,6 +1010,7 @@
            ContribDay = %s,

            DonateCntTotal = %s,

            DonateCntDay = %s,

            TitleID = %s,

            ADOResult = %s,

            '''%(

                self.PlayerID,

@@ -993,6 +1031,7 @@
                self.ContribDay,

                self.DonateCntTotal,

                self.DonateCntDay,

                self.TitleID,

                self.ADOResult,

            )

        return output

@@ -1148,6 +1187,7 @@
        ('Face', ctypes.c_int),

        ('FacePic', ctypes.c_int),

        ('ModelMark', ctypes.c_ulong),

        ('EquipShowSwitch', ctypes.c_ulong),

        ('FamilyID', ctypes.c_ulong),

        ('FamilyName', ctypes.c_char * 33),

        ('FamilyEmblemID', ctypes.c_ushort),

@@ -1176,6 +1216,7 @@
        self.Face = 0

        self.FacePic = 0

        self.ModelMark = 0

        self.EquipShowSwitch = 0

        self.FamilyID = 0

        self.FamilyName = ''

        self.FamilyEmblemID = 0

@@ -1203,6 +1244,7 @@
        self.Face, pos = CommFunc.ReadDWORD(buf, pos)

        self.FacePic, pos = CommFunc.ReadDWORD(buf, pos)

        self.ModelMark, pos = CommFunc.ReadDWORD(buf, pos)

        self.EquipShowSwitch, pos = CommFunc.ReadDWORD(buf, pos)

        self.FamilyID, pos = CommFunc.ReadDWORD(buf, pos)

        self.FamilyName, pos = CommFunc.ReadString(buf, pos, 33)

        self.FamilyEmblemID, pos = CommFunc.ReadWORD(buf, pos)

@@ -1228,6 +1270,7 @@
        buf = CommFunc.WriteDWORD(buf, self.Face)

        buf = CommFunc.WriteDWORD(buf, self.FacePic)

        buf = CommFunc.WriteDWORD(buf, self.ModelMark)

        buf = CommFunc.WriteDWORD(buf, self.EquipShowSwitch)

        buf = CommFunc.WriteDWORD(buf, self.FamilyID)

        buf = CommFunc.WriteString(buf, sizeof(ctypes.c_char) * 33, self.FamilyName)

        buf = CommFunc.WriteWORD(buf, self.FamilyEmblemID)

@@ -1253,6 +1296,7 @@
        length += sizeof(ctypes.c_int)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_char) * 33

        length += sizeof(ctypes.c_ushort)

        length += sizeof(ctypes.c_char) * 3

@@ -1276,6 +1320,7 @@
            Face = %s,

            FacePic = %s,

            ModelMark = %s,

            EquipShowSwitch = %s,

            FamilyID = %s,

            FamilyName = %s,

            FamilyEmblemID = %s,

@@ -1298,6 +1343,7 @@
                self.Face,

                self.FacePic,

                self.ModelMark,

                self.EquipShowSwitch,

                self.FamilyID,

                self.FamilyName,

                self.FamilyEmblemID,

@@ -1764,6 +1810,7 @@
        ('CmpValue', ctypes.c_ulong),

        ('CmpValue2', ctypes.c_ulong),

        ('CmpValue3', ctypes.c_ulong),

        ('Time', ctypes.c_ulong),

        ('DataLen', ctypes.c_ushort),

        ('UserData', ctypes.c_char_p),

        ('ADOResult', ctypes.c_ulong),

@@ -1793,6 +1840,7 @@
        self.CmpValue = 0

        self.CmpValue2 = 0

        self.CmpValue3 = 0

        self.Time = 0

        self.DataLen = 0

        self.UserData = ''



@@ -1821,6 +1869,7 @@
        self.CmpValue, pos = CommFunc.ReadDWORD(buf, pos)

        self.CmpValue2, pos = CommFunc.ReadDWORD(buf, pos)

        self.CmpValue3, pos = CommFunc.ReadDWORD(buf, pos)

        self.Time, pos = CommFunc.ReadDWORD(buf, pos)

        self.DataLen, pos = CommFunc.ReadWORD(buf, pos)

        tmp, pos = CommFunc.ReadString(buf, pos, self.DataLen)

        self.UserData = ctypes.c_char_p(tmp)

@@ -1847,6 +1896,7 @@
        buf = CommFunc.WriteDWORD(buf, self.CmpValue)

        buf = CommFunc.WriteDWORD(buf, self.CmpValue2)

        buf = CommFunc.WriteDWORD(buf, self.CmpValue3)

        buf = CommFunc.WriteDWORD(buf, self.Time)

        buf = CommFunc.WriteWORD(buf, self.DataLen)

        buf = CommFunc.WriteString(buf, self.DataLen, self.UserData)

        return buf

@@ -1861,6 +1911,7 @@
        length += sizeof(ctypes.c_char) * 33

        length += sizeof(ctypes.c_char) * 65

        length += sizeof(ctypes.c_ubyte)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

@@ -1897,6 +1948,7 @@
            CmpValue = %s,

            CmpValue2 = %s,

            CmpValue3 = %s,

            Time = %s,

            DataLen = %s,

            UserData = %s,

            ADOResult = %s,

@@ -1920,6 +1972,7 @@
                self.CmpValue,

                self.CmpValue2,

                self.CmpValue3,

                self.Time,

                self.DataLen,

                self.UserData,

                self.ADOResult,