SnxxServerCode.git

parent: 4d99299a | 补丁 | 提交 | ignore whitespace

10050 【后端】角色（A1 12 玩家初始化 #tagMCDBPlayer 增加同步Face、RoleType）冲突

hxp

2024-09-09 bb5db9b0900b467fee224412a42742cba0f95634

10050 【后端】角色（A1 12 玩家初始化 #tagMCDBPlayer  增加同步Face、RoleType） 冲突

2个文件已修改

	ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

@@ -19088,6 +19088,8 @@
    ExAttr19 = 0    #(DWORD ExAttr19)//预留的扩展属性字段，用来存放项目特定的属性

    ExAttr20 = 0    #(DWORD ExAttr20)//预留的扩展属性字段，用来存放项目特定的属性

    HPEx = 0    #(DWORD HPEx)//当前血量 超过E的记录

    Face = 0    #(DWORD Face)//基本脸型

    RoleType = 0    #(DWORD RoleType)//角色类型（各项目可自定义含义，如种族，与职业区分）

    data = None



    def __init__(self):

@@ -19194,6 +19196,8 @@
        self.ExAttr19,_pos = CommFunc.ReadDWORD(_lpData, _pos)

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

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

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

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

        return _pos



    def Clear(self):

@@ -19296,6 +19300,8 @@
        self.ExAttr19 = 0

        self.ExAttr20 = 0

        self.HPEx = 0

        self.Face = 0

        self.RoleType = 0

        return



    def GetLength(self):

@@ -19388,6 +19394,8 @@
        length += 4

        length += 4

        length += 15

        length += 4

        length += 4

        length += 4

        length += 4

        length += 4

@@ -19497,6 +19505,8 @@
        data = CommFunc.WriteDWORD(data, self.ExAttr19)

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

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

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

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

        return data



    def OutputString(self):

@@ -19596,7 +19606,9 @@
                                ExAttr18:%d,

                                ExAttr19:%d,

                                ExAttr20:%d,

                                HPEx:%d

                                HPEx:%d,

                                Face:%d,

                                RoleType:%d

                                '''\

                                %(

                                self.Head.OutputString(),

@@ -19694,7 +19706,9 @@
                                self.ExAttr18,

                                self.ExAttr19,

                                self.ExAttr20,

                                self.HPEx

                                self.HPEx,

                                self.Face,

                                self.RoleType

                                )

        return DumpString




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

@@ -19088,6 +19088,8 @@
    ExAttr19 = 0    #(DWORD ExAttr19)//预留的扩展属性字段，用来存放项目特定的属性

    ExAttr20 = 0    #(DWORD ExAttr20)//预留的扩展属性字段，用来存放项目特定的属性

    HPEx = 0    #(DWORD HPEx)//当前血量 超过E的记录

    Face = 0    #(DWORD Face)//基本脸型

    RoleType = 0    #(DWORD RoleType)//角色类型（各项目可自定义含义，如种族，与职业区分）

    data = None



    def __init__(self):

@@ -19194,6 +19196,8 @@
        self.ExAttr19,_pos = CommFunc.ReadDWORD(_lpData, _pos)

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

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

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

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

        return _pos



    def Clear(self):

@@ -19296,6 +19300,8 @@
        self.ExAttr19 = 0

        self.ExAttr20 = 0

        self.HPEx = 0

        self.Face = 0

        self.RoleType = 0

        return



    def GetLength(self):

@@ -19388,6 +19394,8 @@
        length += 4

        length += 4

        length += 15

        length += 4

        length += 4

        length += 4

        length += 4

        length += 4

@@ -19497,6 +19505,8 @@
        data = CommFunc.WriteDWORD(data, self.ExAttr19)

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

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

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

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

        return data



    def OutputString(self):

@@ -19596,7 +19606,9 @@
                                ExAttr18:%d,

                                ExAttr19:%d,

                                ExAttr20:%d,

                                HPEx:%d

                                HPEx:%d,

                                Face:%d,

                                RoleType:%d

                                '''\

                                %(

                                self.Head.OutputString(),

@@ -19694,7 +19706,9 @@
                                self.ExAttr18,

                                self.ExAttr19,

                                self.ExAttr20,

                                self.HPEx

                                self.HPEx,

                                self.Face,

                                self.RoleType

                                )

        return DumpString

			@@ -19088,6 +19088,8 @@
			ExAttr19 = 0 #(DWORD ExAttr19)//预留的扩展属性字段，用来存放项目特定的属性
			ExAttr20 = 0 #(DWORD ExAttr20)//预留的扩展属性字段，用来存放项目特定的属性
			HPEx = 0 #(DWORD HPEx)//当前血量超过E的记录
			Face = 0 #(DWORD Face)//基本脸型
			RoleType = 0 #(DWORD RoleType)//角色类型（各项目可自定义含义，如种族，与职业区分）
			data = None

			def __init__(self):
			@@ -19194,6 +19196,8 @@
			self.ExAttr19,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.ExAttr20,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.HPEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.RoleType,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			return _pos

			def Clear(self):
			@@ -19296,6 +19300,8 @@
			self.ExAttr19 = 0
			self.ExAttr20 = 0
			self.HPEx = 0
			self.Face = 0
			self.RoleType = 0
			return

			def GetLength(self):
			@@ -19388,6 +19394,8 @@
			length += 4
			length += 4
			length += 15
			length += 4
			length += 4
			length += 4
			length += 4
			length += 4
			@@ -19497,6 +19505,8 @@
			data = CommFunc.WriteDWORD(data, self.ExAttr19)
			data = CommFunc.WriteDWORD(data, self.ExAttr20)
			data = CommFunc.WriteDWORD(data, self.HPEx)
			data = CommFunc.WriteDWORD(data, self.Face)
			data = CommFunc.WriteDWORD(data, self.RoleType)
			return data

			def OutputString(self):
			@@ -19596,7 +19606,9 @@
			ExAttr18:%d,
			ExAttr19:%d,
			ExAttr20:%d,
			HPEx:%d
			HPEx:%d,
			Face:%d,
			RoleType:%d
			'''\
			%(
			self.Head.OutputString(),
			@@ -19694,7 +19706,9 @@
			self.ExAttr18,
			self.ExAttr19,
			self.ExAttr20,
			self.HPEx
			self.HPEx,
			self.Face,
			self.RoleType
			)
			return DumpString