Project_SG_ServerCode.git

parent: bc5f3f1c | 补丁 | 提交 | ignore whitespace

hxp

4 天以前 a0dd1dc92bb2f6eb7067a624df20a9c326ecde87

66 【公会】基础主体-服务端（修改A619，A523封包结构；）

3个文件已修改

	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -7573,7 +7573,7 @@
                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("FamilyID", c_int),    

                  ("ServerID", c_int),    #公会服务器ID，发0默认本服公会

                  ("DataServerID", c_int),    #数据所在服务器ID

                  ]



    def __init__(self):

@@ -7591,7 +7591,7 @@
        self.Cmd = 0xA6

        self.SubCmd = 0x19

        self.FamilyID = 0

        self.ServerID = 0

        self.DataServerID = 0

        return



    def GetLength(self):

@@ -7605,13 +7605,13 @@
                                Cmd:%s,

                                SubCmd:%s,

                                FamilyID:%d,

                                ServerID:%d

                                DataServerID:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.FamilyID,

                                self.ServerID

                                self.DataServerID

                                )

        return DumpString




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

@@ -10988,6 +10988,7 @@
    LeaderID = 0    #(DWORD LeaderID)//族长ID

    LeaderNameLen = 0    #(BYTE LeaderNameLen)

    LeaderName = ""    #(String LeaderName)//size = LeaderNameLen

    LeaderServerID = 0    #(DWORD LeaderServerID)//族长服务器ID

    FamilyLV = 0    #(BYTE FamilyLV)//家族等级

    JoinReview = 0    #(BYTE JoinReview)//成员加入是否需要审核，默认0自动加入

    JoinLVMin = 0    #(WORD JoinLVMin)//限制最低可加入的玩家等级

@@ -11012,6 +11013,7 @@
        self.LeaderID,_pos = CommFunc.ReadDWORD(_lpData, _pos)

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

        self.LeaderName,_pos = CommFunc.ReadString(_lpData, _pos,self.LeaderNameLen)

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

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

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

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

@@ -11031,6 +11033,7 @@
        self.LeaderID = 0

        self.LeaderNameLen = 0

        self.LeaderName = ""

        self.LeaderServerID = 0

        self.FamilyLV = 0

        self.JoinReview = 0

        self.JoinLVMin = 0

@@ -11051,6 +11054,7 @@
        length += 4

        length += 1

        length += len(self.LeaderName)

        length += 4

        length += 1

        length += 1

        length += 2

@@ -11072,6 +11076,7 @@
        data = CommFunc.WriteDWORD(data, self.LeaderID)

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

        data = CommFunc.WriteString(data, self.LeaderNameLen, self.LeaderName)

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

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

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

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

@@ -11092,6 +11097,7 @@
                                LeaderID:%d,

                                LeaderNameLen:%d,

                                LeaderName:%s,

                                LeaderServerID:%d,

                                FamilyLV:%d,

                                JoinReview:%d,

                                JoinLVMin:%d,

@@ -11110,6 +11116,7 @@
                                self.LeaderID,

                                self.LeaderNameLen,

                                self.LeaderName,

                                self.LeaderServerID,

                                self.FamilyLV,

                                self.JoinReview,

                                self.JoinLVMin,

@@ -11133,7 +11140,6 @@
    FamilyCount = 0    #(BYTE FamilyCount)

    FamilyList = list()    #(vector<tagMCFamilyView> FamilyList)//本页家族信息列表

    Rank = 0    #(DWORD Rank)//玩家公会所在名次，0-没有公会或没有在榜上；>0-对应排名

    DataServerID = 0    #(DWORD DataServerID)//数据所在服务器ID

    data = None



    def __init__(self):

@@ -11156,7 +11162,6 @@
            _pos = temFamilyList.ReadData(_lpData, _pos)

            self.FamilyList.append(temFamilyList)

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

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

        return _pos



    def Clear(self):

@@ -11172,7 +11177,6 @@
        self.FamilyCount = 0

        self.FamilyList = list()

        self.Rank = 0

        self.DataServerID = 0

        return



    def GetLength(self):

@@ -11186,7 +11190,6 @@
        length += 1

        for i in range(self.FamilyCount):

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

        length += 4

        length += 4



        return length

@@ -11203,7 +11206,6 @@
        for i in range(self.FamilyCount):

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

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

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

        return data



    def OutputString(self):

@@ -11216,8 +11218,7 @@
                                TotalPage:%d,

                                FamilyCount:%d,

                                FamilyList:%s,

                                Rank:%d,

                                DataServerID:%d

                                Rank:%d

                                '''\

                                %(

                                self.Head.OutputString(),

@@ -11228,8 +11229,7 @@
                                self.TotalPage,

                                self.FamilyCount,

                                "...",

                                self.Rank,

                                self.DataServerID

                                self.Rank

                                )

        return DumpString




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

@@ -1739,6 +1739,7 @@
        leaderMember = family.FindMember(familyView.LeaderID)

        familyView.LeaderName = leaderMember.GetPlayerName() if leaderMember else ""

        familyView.LeaderNameLen = len(familyView.LeaderName)

        familyView.LeaderServerID = leaderMember.GetServerID() if leaderMember else family.GetServerID()

        familyView.FamilyLV = family.GetLV()

        familyView.JoinReview = family.GetJoinReview()

        familyView.JoinLVMin = family.GetJoinLVMin()

@@ -1752,7 +1753,6 @@
        clientPack.FamilyCount = len(clientPack.FamilyList)

        if clientPack.FamilyCount >= showCount:

            break

    clientPack.DataServerID = GameWorld.GetGameWorld().GetServerID()

    CrossPlayer.SendFakePack(crossPlayer, clientPack)

    return

			@@ -7573,7 +7573,7 @@
			("Cmd", c_ubyte),
			("SubCmd", c_ubyte),
			("FamilyID", c_int),
			("ServerID", c_int), #公会服务器ID，发0默认本服公会
			("DataServerID", c_int), #数据所在服务器ID
			]

			def __init__(self):
			@@ -7591,7 +7591,7 @@
			self.Cmd = 0xA6
			self.SubCmd = 0x19
			self.FamilyID = 0
			self.ServerID = 0
			self.DataServerID = 0
			return

			def GetLength(self):
			@@ -7605,13 +7605,13 @@
			Cmd:%s,
			SubCmd:%s,
			FamilyID:%d,
			ServerID:%d
			DataServerID:%d
			'''\
			%(
			self.Cmd,
			self.SubCmd,
			self.FamilyID,
			self.ServerID
			self.DataServerID
			)
			return DumpString

			@@ -10988,6 +10988,7 @@
			LeaderID = 0 #(DWORD LeaderID)//族长ID
			LeaderNameLen = 0 #(BYTE LeaderNameLen)
			LeaderName = "" #(String LeaderName)//size = LeaderNameLen
			LeaderServerID = 0 #(DWORD LeaderServerID)//族长服务器ID
			FamilyLV = 0 #(BYTE FamilyLV)//家族等级
			JoinReview = 0 #(BYTE JoinReview)//成员加入是否需要审核，默认0自动加入
			JoinLVMin = 0 #(WORD JoinLVMin)//限制最低可加入的玩家等级
			@@ -11012,6 +11013,7 @@
			self.LeaderID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.LeaderNameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.LeaderName,_pos = CommFunc.ReadString(_lpData, _pos,self.LeaderNameLen)
			self.LeaderServerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.FamilyLV,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.JoinReview,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.JoinLVMin,_pos = CommFunc.ReadWORD(_lpData, _pos)
			@@ -11031,6 +11033,7 @@
			self.LeaderID = 0
			self.LeaderNameLen = 0
			self.LeaderName = ""
			self.LeaderServerID = 0
			self.FamilyLV = 0
			self.JoinReview = 0
			self.JoinLVMin = 0
			@@ -11051,6 +11054,7 @@
			length += 4
			length += 1
			length += len(self.LeaderName)
			length += 4
			length += 1
			length += 1
			length += 2
			@@ -11072,6 +11076,7 @@
			data = CommFunc.WriteDWORD(data, self.LeaderID)
			data = CommFunc.WriteBYTE(data, self.LeaderNameLen)
			data = CommFunc.WriteString(data, self.LeaderNameLen, self.LeaderName)
			data = CommFunc.WriteDWORD(data, self.LeaderServerID)
			data = CommFunc.WriteBYTE(data, self.FamilyLV)
			data = CommFunc.WriteBYTE(data, self.JoinReview)
			data = CommFunc.WriteWORD(data, self.JoinLVMin)
			@@ -11092,6 +11097,7 @@
			LeaderID:%d,
			LeaderNameLen:%d,
			LeaderName:%s,
			LeaderServerID:%d,
			FamilyLV:%d,
			JoinReview:%d,
			JoinLVMin:%d,
			@@ -11110,6 +11116,7 @@
			self.LeaderID,
			self.LeaderNameLen,
			self.LeaderName,
			self.LeaderServerID,
			self.FamilyLV,
			self.JoinReview,
			self.JoinLVMin,
			@@ -11133,7 +11140,6 @@
			FamilyCount = 0 #(BYTE FamilyCount)
			FamilyList = list() #(vector<tagMCFamilyView> FamilyList)//本页家族信息列表
			Rank = 0 #(DWORD Rank)//玩家公会所在名次，0-没有公会或没有在榜上；>0-对应排名
			DataServerID = 0 #(DWORD DataServerID)//数据所在服务器ID
			data = None

			def __init__(self):
			@@ -11156,7 +11162,6 @@
			_pos = temFamilyList.ReadData(_lpData, _pos)
			self.FamilyList.append(temFamilyList)
			self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.DataServerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			return _pos

			def Clear(self):
			@@ -11172,7 +11177,6 @@
			self.FamilyCount = 0
			self.FamilyList = list()
			self.Rank = 0
			self.DataServerID = 0
			return

			def GetLength(self):
			@@ -11186,7 +11190,6 @@
			length += 1
			for i in range(self.FamilyCount):
			length += self.FamilyList[i].GetLength()
			length += 4
			length += 4

			return length
			@@ -11203,7 +11206,6 @@
			for i in range(self.FamilyCount):
			data = CommFunc.WriteString(data, self.FamilyList[i].GetLength(), self.FamilyList[i].GetBuffer())
			data = CommFunc.WriteDWORD(data, self.Rank)
			data = CommFunc.WriteDWORD(data, self.DataServerID)
			return data

			def OutputString(self):
			@@ -11216,8 +11218,7 @@
			TotalPage:%d,
			FamilyCount:%d,
			FamilyList:%s,
			Rank:%d,
			DataServerID:%d
			Rank:%d
			'''\
			%(
			self.Head.OutputString(),
			@@ -11228,8 +11229,7 @@
			self.TotalPage,
			self.FamilyCount,
			"...",
			self.Rank,
			self.DataServerID
			self.Rank
			)
			return DumpString

			@@ -1739,6 +1739,7 @@
			leaderMember = family.FindMember(familyView.LeaderID)
			familyView.LeaderName = leaderMember.GetPlayerName() if leaderMember else ""
			familyView.LeaderNameLen = len(familyView.LeaderName)
			familyView.LeaderServerID = leaderMember.GetServerID() if leaderMember else family.GetServerID()
			familyView.FamilyLV = family.GetLV()
			familyView.JoinReview = family.GetJoinReview()
			familyView.JoinLVMin = family.GetJoinLVMin()
			@@ -1752,7 +1753,6 @@
			clientPack.FamilyCount = len(clientPack.FamilyList)
			if clientPack.FamilyCount >= showCount:
			break
			clientPack.DataServerID = GameWorld.GetGameWorld().GetServerID()
			CrossPlayer.SendFakePack(crossPlayer, clientPack)
			return