From 78882065bd4a4ed7fb45327e766606dd81bbaf16 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 15 十月 2024 17:03:12 +0800
Subject: [PATCH] 5328 【越南】【英文】【砍树】神兽装备格子拓展(扩展为150格)

---
 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py |  668 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 629 insertions(+), 39 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 54a6785..d511bef 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -1180,6 +1180,7 @@
     Job = 0    #(BYTE Job)// 玩家职业
     RealmLV = 0    #(WORD RealmLV)// 玩家境界等级
     Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -1198,6 +1199,7 @@
         self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -1212,6 +1214,7 @@
         self.Job = 0
         self.RealmLV = 0
         self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -1223,6 +1226,7 @@
         length += 2
         length += 1
         length += 2
+        length += 4
         length += 4
 
         return length
@@ -1237,6 +1241,7 @@
         data = CommFunc.WriteBYTE(data, self.Job)
         data = CommFunc.WriteWORD(data, self.RealmLV)
         data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -1248,7 +1253,8 @@
                                 LV:%d,
                                 Job:%d,
                                 RealmLV:%d,
-                                Face:%d
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.Head.OutputString(),
@@ -1258,7 +1264,8 @@
                                 self.LV,
                                 self.Job,
                                 self.RealmLV,
-                                self.Face
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -1740,6 +1747,8 @@
     NameLen = 0    #(BYTE NameLen)
     Name = ""    #(String Name)//名字
     PlayeJob = 0    #(BYTE PlayeJob)//玩家职业
+    Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     MoneyNum = 0    #(DWORD MoneyNum)//金钱数量
     data = None
 
@@ -1752,6 +1761,8 @@
         self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.Name,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
         self.PlayeJob,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.MoneyNum,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
@@ -1759,6 +1770,8 @@
         self.NameLen = 0
         self.Name = ""
         self.PlayeJob = 0
+        self.Face = 0
+        self.FacePic = 0
         self.MoneyNum = 0
         return
 
@@ -1768,6 +1781,8 @@
         length += len(self.Name)
         length += 1
         length += 4
+        length += 4
+        length += 4
 
         return length
 
@@ -1776,6 +1791,8 @@
         data = CommFunc.WriteBYTE(data, self.NameLen)
         data = CommFunc.WriteString(data, self.NameLen, self.Name)
         data = CommFunc.WriteBYTE(data, self.PlayeJob)
+        data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         data = CommFunc.WriteDWORD(data, self.MoneyNum)
         return data
 
@@ -1784,12 +1801,16 @@
                                 NameLen:%d,
                                 Name:%s,
                                 PlayeJob:%d,
+                                Face:%d,
+                                FacePic:%d,
                                 MoneyNum:%d
                                 '''\
                                 %(
                                 self.NameLen,
                                 self.Name,
                                 self.PlayeJob,
+                                self.Face,
+                                self.FacePic,
                                 self.MoneyNum
                                 )
         return DumpString
@@ -1878,6 +1899,8 @@
     Name = ""    #(String Name)//玩家名字
     Time = 0    #(DWORD Time)//时间
     PlayeJob = 0    #(BYTE PlayeJob)//玩家职业
+    Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     MoneyType = 0    #(BYTE MoneyType)//金钱类型
     MoneyNum = 0    #(DWORD MoneyNum)//金钱数量
     GetWay = 0    #(BYTE GetWay)//获得途径
@@ -1900,6 +1923,8 @@
         self.Name,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
         self.Time,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.PlayeJob,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.MoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.MoneyNum,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.GetWay,_pos = CommFunc.ReadBYTE(_lpData, _pos)
@@ -1917,6 +1942,8 @@
         self.Name = ""
         self.Time = 0
         self.PlayeJob = 0
+        self.Face = 0
+        self.FacePic = 0
         self.MoneyType = 0
         self.MoneyNum = 0
         self.GetWay = 0
@@ -1935,6 +1962,8 @@
         length += len(self.Name)
         length += 4
         length += 1
+        length += 4
+        length += 4
         length += 1
         length += 4
         length += 1
@@ -1954,6 +1983,8 @@
         data = CommFunc.WriteString(data, self.NameLen, self.Name)
         data = CommFunc.WriteDWORD(data, self.Time)
         data = CommFunc.WriteBYTE(data, self.PlayeJob)
+        data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         data = CommFunc.WriteBYTE(data, self.MoneyType)
         data = CommFunc.WriteDWORD(data, self.MoneyNum)
         data = CommFunc.WriteBYTE(data, self.GetWay)
@@ -1972,6 +2003,8 @@
                                 Name:%s,
                                 Time:%d,
                                 PlayeJob:%d,
+                                Face:%d,
+                                FacePic:%d,
                                 MoneyType:%d,
                                 MoneyNum:%d,
                                 GetWay:%d,
@@ -1988,6 +2021,8 @@
                                 self.Name,
                                 self.Time,
                                 self.PlayeJob,
+                                self.Face,
+                                self.FacePic,
                                 self.MoneyType,
                                 self.MoneyNum,
                                 self.GetWay,
@@ -2416,6 +2451,7 @@
     WarRank = 0    #(BYTE WarRank)//联赛排名
     TotalFightPower = 0    #(DWORD TotalFightPower)//总战力,不足1个亿的部分
     TotalFightPowerEx = 0    #(DWORD TotalFightPowerEx)//总战力点,1点=1亿
+    EmblemID = 0    #(BYTE EmblemID)//徽章ID
     data = None
 
     def __init__(self):
@@ -2438,6 +2474,7 @@
         self.WarRank,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.TotalFightPower,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.TotalFightPowerEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.EmblemID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -2455,6 +2492,7 @@
         self.WarRank = 0
         self.TotalFightPower = 0
         self.TotalFightPowerEx = 0
+        self.EmblemID = 0
         return
 
     def GetLength(self):
@@ -2473,6 +2511,7 @@
         length += 1
         length += 4
         length += 4
+        length += 1
 
         return length
 
@@ -2492,6 +2531,7 @@
         data = CommFunc.WriteBYTE(data, self.WarRank)
         data = CommFunc.WriteDWORD(data, self.TotalFightPower)
         data = CommFunc.WriteDWORD(data, self.TotalFightPowerEx)
+        data = CommFunc.WriteBYTE(data, self.EmblemID)
         return data
 
     def OutputString(self):
@@ -2509,7 +2549,8 @@
                                 JoinAccept:%d,
                                 WarRank:%d,
                                 TotalFightPower:%d,
-                                TotalFightPowerEx:%d
+                                TotalFightPowerEx:%d,
+                                EmblemID:%d
                                 '''\
                                 %(
                                 self.FamilyIndex,
@@ -2525,7 +2566,8 @@
                                 self.JoinAccept,
                                 self.WarRank,
                                 self.TotalFightPower,
-                                self.TotalFightPowerEx
+                                self.TotalFightPowerEx,
+                                self.EmblemID
                                 )
         return DumpString
 
@@ -5269,6 +5311,7 @@
     Job = 0    #(BYTE Job)
     RealmLV = 0    #(WORD RealmLV)//境界	
     Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -5283,6 +5326,7 @@
         self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -5292,6 +5336,7 @@
         self.Job = 0
         self.RealmLV = 0
         self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -5301,6 +5346,7 @@
         length += 4
         length += 1
         length += 2
+        length += 4
         length += 4
 
         return length
@@ -5313,6 +5359,7 @@
         data = CommFunc.WriteBYTE(data, self.Job)
         data = CommFunc.WriteWORD(data, self.RealmLV)
         data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -5322,7 +5369,8 @@
                                 LV:%d,
                                 Job:%d,
                                 RealmLV:%d,
-                                Face:%d
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.ID,
@@ -5330,7 +5378,8 @@
                                 self.LV,
                                 self.Job,
                                 self.RealmLV,
-                                self.Face
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -5411,6 +5460,7 @@
     LV = 0    #(WORD LV)//等级
     RealmLV = 0    #(WORD RealmLV)//境界
     Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -5425,6 +5475,7 @@
         self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -5434,6 +5485,7 @@
         self.LV = 0
         self.RealmLV = 0
         self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -5443,6 +5495,7 @@
         length += 1
         length += 2
         length += 2
+        length += 4
         length += 4
 
         return length
@@ -5455,6 +5508,7 @@
         data = CommFunc.WriteWORD(data, self.LV)
         data = CommFunc.WriteWORD(data, self.RealmLV)
         data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -5464,7 +5518,8 @@
                                 Job:%d,
                                 LV:%d,
                                 RealmLV:%d,
-                                Face:%d
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.PlayerID,
@@ -5472,7 +5527,8 @@
                                 self.Job,
                                 self.LV,
                                 self.RealmLV,
-                                self.Face
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -7673,6 +7729,8 @@
     Job = 0    #(BYTE Job)
     LV = 0    #(WORD LV)//等级
     RealmLV = 0    #(BYTE RealmLV)//境界
+    Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     MapID = 0    #(DWORD MapID)
     LineID = 0    #(DWORD LineID)
     NPCID = 0    #(DWORD NPCID)
@@ -7692,6 +7750,8 @@
         self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.LineID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.NPCID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
@@ -7706,6 +7766,8 @@
         self.Job = 0
         self.LV = 0
         self.RealmLV = 0
+        self.Face = 0
+        self.FacePic = 0
         self.MapID = 0
         self.LineID = 0
         self.NPCID = 0
@@ -7724,6 +7786,8 @@
         length += 4
         length += 4
         length += 4
+        length += 4
+        length += 4
         length += 2
         length += len(self.ExData)
 
@@ -7737,6 +7801,8 @@
         data = CommFunc.WriteBYTE(data, self.Job)
         data = CommFunc.WriteWORD(data, self.LV)
         data = CommFunc.WriteBYTE(data, self.RealmLV)
+        data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         data = CommFunc.WriteDWORD(data, self.MapID)
         data = CommFunc.WriteDWORD(data, self.LineID)
         data = CommFunc.WriteDWORD(data, self.NPCID)
@@ -7752,6 +7818,8 @@
                                 Job:%d,
                                 LV:%d,
                                 RealmLV:%d,
+                                Face:%d,
+                                FacePic:%d,
                                 MapID:%d,
                                 LineID:%d,
                                 NPCID:%d,
@@ -7765,6 +7833,8 @@
                                 self.Job,
                                 self.LV,
                                 self.RealmLV,
+                                self.Face,
+                                self.FacePic,
                                 self.MapID,
                                 self.LineID,
                                 self.NPCID,
@@ -8223,6 +8293,8 @@
     Job = 0    #(BYTE Job)
     LV = 0    #(WORD LV)
     RealmLV = 0    #(BYTE RealmLV)//境界
+    Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     MapID = 0    #(DWORD MapID)
     LineID = 0    #(DWORD LineID)
     NPCID = 0    #(DWORD NPCID)
@@ -8247,6 +8319,8 @@
         self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.LineID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.NPCID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
@@ -8267,6 +8341,8 @@
         self.Job = 0
         self.LV = 0
         self.RealmLV = 0
+        self.Face = 0
+        self.FacePic = 0
         self.MapID = 0
         self.LineID = 0
         self.NPCID = 0
@@ -8288,6 +8364,8 @@
         length += 4
         length += 4
         length += 4
+        length += 4
+        length += 4
         length += 2
         length += len(self.ExData)
         length += 19
@@ -8304,6 +8382,8 @@
         data = CommFunc.WriteBYTE(data, self.Job)
         data = CommFunc.WriteWORD(data, self.LV)
         data = CommFunc.WriteBYTE(data, self.RealmLV)
+        data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         data = CommFunc.WriteDWORD(data, self.MapID)
         data = CommFunc.WriteDWORD(data, self.LineID)
         data = CommFunc.WriteDWORD(data, self.NPCID)
@@ -8322,6 +8402,8 @@
                                 Job:%d,
                                 LV:%d,
                                 RealmLV:%d,
+                                Face:%d,
+                                FacePic:%d,
                                 MapID:%d,
                                 LineID:%d,
                                 NPCID:%d,
@@ -8338,6 +8420,8 @@
                                 self.Job,
                                 self.LV,
                                 self.RealmLV,
+                                self.Face,
+                                self.FacePic,
                                 self.MapID,
                                 self.LineID,
                                 self.NPCID,
@@ -8922,6 +9006,8 @@
     Job = 0    #(BYTE Job)
     LV = 0    #(WORD LV)
     RealmLV = 0    #(BYTE RealmLV)//境界
+    Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -8935,6 +9021,8 @@
         self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -8943,6 +9031,8 @@
         self.Job = 0
         self.LV = 0
         self.RealmLV = 0
+        self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -8952,6 +9042,8 @@
         length += 1
         length += 2
         length += 1
+        length += 4
+        length += 4
 
         return length
 
@@ -8962,6 +9054,8 @@
         data = CommFunc.WriteBYTE(data, self.Job)
         data = CommFunc.WriteWORD(data, self.LV)
         data = CommFunc.WriteBYTE(data, self.RealmLV)
+        data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -8970,14 +9064,18 @@
                                 PlayerName:%s,
                                 Job:%d,
                                 LV:%d,
-                                RealmLV:%d
+                                RealmLV:%d,
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.PlayerID,
                                 self.PlayerName,
                                 self.Job,
                                 self.LV,
-                                self.RealmLV
+                                self.RealmLV,
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -9307,6 +9405,7 @@
     LV = 0    #(WORD LV)
     RealmLV = 0    #(WORD RealmLV)//境界等级
     Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -9323,6 +9422,7 @@
         self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -9335,6 +9435,7 @@
         self.LV = 0
         self.RealmLV = 0
         self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -9344,6 +9445,7 @@
         length += 33
         length += 2
         length += 2
+        length += 4
         length += 4
 
         return length
@@ -9356,6 +9458,7 @@
         data = CommFunc.WriteWORD(data, self.LV)
         data = CommFunc.WriteWORD(data, self.RealmLV)
         data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -9365,7 +9468,8 @@
                                 Name:%s,
                                 LV:%d,
                                 RealmLV:%d,
-                                Face:%d
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.Head.OutputString(),
@@ -9373,7 +9477,8 @@
                                 self.Name,
                                 self.LV,
                                 self.RealmLV,
-                                self.Face
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -10504,6 +10609,7 @@
     IsInTeam = 0    #(BYTE IsInTeam)//是否有队伍
     ServerGroupID = 0    #(DWORD ServerGroupID)//服务器组ID
     Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -10524,6 +10630,7 @@
         self.IsInTeam,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.ServerGroupID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -10540,6 +10647,7 @@
         self.IsInTeam = 0
         self.ServerGroupID = 0
         self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -10552,6 +10660,7 @@
         length += 2
         length += 1
         length += 1
+        length += 4
         length += 4
         length += 4
 
@@ -10569,6 +10678,7 @@
         data = CommFunc.WriteBYTE(data, self.IsInTeam)
         data = CommFunc.WriteDWORD(data, self.ServerGroupID)
         data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -10582,7 +10692,8 @@
                                 OnlineType:%d,
                                 IsInTeam:%d,
                                 ServerGroupID:%d,
-                                Face:%d
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.Head.OutputString(),
@@ -10594,7 +10705,8 @@
                                 self.OnlineType,
                                 self.IsInTeam,
                                 self.ServerGroupID,
-                                self.Face
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -10670,6 +10782,7 @@
     RealmLV = 0    #(WORD RealmLV)//境界
     OnlineType = 0    #(BYTE OnlineType)//0不在线 1在线 2脱机在线
     Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -10685,6 +10798,7 @@
         self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.OnlineType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -10695,6 +10809,7 @@
         self.RealmLV = 0
         self.OnlineType = 0
         self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -10705,6 +10820,7 @@
         length += 2
         length += 2
         length += 1
+        length += 4
         length += 4
 
         return length
@@ -10718,6 +10834,7 @@
         data = CommFunc.WriteWORD(data, self.RealmLV)
         data = CommFunc.WriteBYTE(data, self.OnlineType)
         data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -10728,7 +10845,8 @@
                                 LV:%d,
                                 RealmLV:%d,
                                 OnlineType:%d,
-                                Face:%d
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.PlayerID,
@@ -10737,7 +10855,8 @@
                                 self.LV,
                                 self.RealmLV,
                                 self.OnlineType,
-                                self.Face
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -14276,6 +14395,8 @@
     Job = 0    #(BYTE Job)// 玩家职业
     JobLevel = 0    #(BYTE JobLevel)// 玩家职业阶级
     RealmLV = 0    #(WORD RealmLV)// 玩家境界等级
+    Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -14291,6 +14412,8 @@
         self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.JobLevel,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -14301,6 +14424,8 @@
         self.Job = 0
         self.JobLevel = 0
         self.RealmLV = 0
+        self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -14312,6 +14437,8 @@
         length += 1
         length += 1
         length += 2
+        length += 4
+        length += 4
 
         return length
 
@@ -14324,6 +14451,8 @@
         data = CommFunc.WriteBYTE(data, self.Job)
         data = CommFunc.WriteBYTE(data, self.JobLevel)
         data = CommFunc.WriteWORD(data, self.RealmLV)
+        data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -14334,7 +14463,9 @@
                                 LV:%d,
                                 Job:%d,
                                 JobLevel:%d,
-                                RealmLV:%d
+                                RealmLV:%d,
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.PlayerID,
@@ -14343,7 +14474,9 @@
                                 self.LV,
                                 self.Job,
                                 self.JobLevel,
-                                self.RealmLV
+                                self.RealmLV,
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -14955,6 +15088,8 @@
     Job = 0    #(BYTE Job)// 玩家职业
     JobLevel = 0    #(BYTE JobLevel)// 玩家职业阶级
     RealmLV = 0    #(WORD RealmLV)// 玩家境界等级
+    Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     PlayerState = 0    #(BYTE PlayerState)// 0: 离线 1:在线
     MapID = 0    #(DWORD MapID)// 地图ID
     LineID = 0    #(BYTE LineID)// 线路ID
@@ -14975,6 +15110,8 @@
         self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.JobLevel,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.PlayerState,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.LineID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
@@ -14990,6 +15127,8 @@
         self.Job = 0
         self.JobLevel = 0
         self.RealmLV = 0
+        self.Face = 0
+        self.FacePic = 0
         self.PlayerState = 0
         self.MapID = 0
         self.LineID = 0
@@ -15006,6 +15145,8 @@
         length += 1
         length += 1
         length += 2
+        length += 4
+        length += 4
         length += 1
         length += 4
         length += 1
@@ -15023,6 +15164,8 @@
         data = CommFunc.WriteBYTE(data, self.Job)
         data = CommFunc.WriteBYTE(data, self.JobLevel)
         data = CommFunc.WriteWORD(data, self.RealmLV)
+        data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         data = CommFunc.WriteBYTE(data, self.PlayerState)
         data = CommFunc.WriteDWORD(data, self.MapID)
         data = CommFunc.WriteBYTE(data, self.LineID)
@@ -15039,6 +15182,8 @@
                                 Job:%d,
                                 JobLevel:%d,
                                 RealmLV:%d,
+                                Face:%d,
+                                FacePic:%d,
                                 PlayerState:%d,
                                 MapID:%d,
                                 LineID:%d
@@ -15053,6 +15198,8 @@
                                 self.Job,
                                 self.JobLevel,
                                 self.RealmLV,
+                                self.Face,
+                                self.FacePic,
                                 self.PlayerState,
                                 self.MapID,
                                 self.LineID
@@ -16028,6 +16175,8 @@
     FightPower = 0    #(DWORD FightPower)// 战力求余亿部分
     FightPowerEx = 0    #(DWORD FightPowerEx)// 战力整除亿部分
     RealmLV = 0    #(WORD RealmLV)
+    Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -16044,6 +16193,8 @@
         self.FightPower,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.FightPowerEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -16055,6 +16206,8 @@
         self.FightPower = 0
         self.FightPowerEx = 0
         self.RealmLV = 0
+        self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -16067,6 +16220,8 @@
         length += 4
         length += 4
         length += 2
+        length += 4
+        length += 4
 
         return length
 
@@ -16080,6 +16235,8 @@
         data = CommFunc.WriteDWORD(data, self.FightPower)
         data = CommFunc.WriteDWORD(data, self.FightPowerEx)
         data = CommFunc.WriteWORD(data, self.RealmLV)
+        data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -16091,7 +16248,9 @@
                                 LV:%d,
                                 FightPower:%d,
                                 FightPowerEx:%d,
-                                RealmLV:%d
+                                RealmLV:%d,
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.PlayerID,
@@ -16101,7 +16260,9 @@
                                 self.LV,
                                 self.FightPower,
                                 self.FightPowerEx,
-                                self.RealmLV
+                                self.RealmLV,
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -17049,6 +17210,8 @@
     FightPower = 0    #(DWORD FightPower)// 战力求余亿部分
     FightPowerEx = 0    #(DWORD FightPowerEx)// 战力整除亿部分
     RealmLV = 0    #(WORD RealmLV)
+    Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     data = None
 
     def __init__(self):
@@ -17065,6 +17228,8 @@
         self.FightPower,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.FightPowerEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -17076,6 +17241,8 @@
         self.FightPower = 0
         self.FightPowerEx = 0
         self.RealmLV = 0
+        self.Face = 0
+        self.FacePic = 0
         return
 
     def GetLength(self):
@@ -17088,6 +17255,8 @@
         length += 4
         length += 4
         length += 2
+        length += 4
+        length += 4
 
         return length
 
@@ -17101,6 +17270,8 @@
         data = CommFunc.WriteDWORD(data, self.FightPower)
         data = CommFunc.WriteDWORD(data, self.FightPowerEx)
         data = CommFunc.WriteWORD(data, self.RealmLV)
+        data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         return data
 
     def OutputString(self):
@@ -17112,7 +17283,9 @@
                                 LV:%d,
                                 FightPower:%d,
                                 FightPowerEx:%d,
-                                RealmLV:%d
+                                RealmLV:%d,
+                                Face:%d,
+                                FacePic:%d
                                 '''\
                                 %(
                                 self.PlayerID,
@@ -17122,7 +17295,9 @@
                                 self.LV,
                                 self.FightPower,
                                 self.FightPowerEx,
-                                self.RealmLV
+                                self.RealmLV,
+                                self.Face,
+                                self.FacePic
                                 )
         return DumpString
 
@@ -19103,6 +19278,7 @@
     ExAttr20 = 0    #(DWORD ExAttr20)//预留的扩展属性字段,用来存放项目特定的属性
     HPEx = 0    #(DWORD HPEx)//当前血量 超过E的记录
     Face = 0    #(DWORD Face)//基本脸型
+    FacePic = 0    #(DWORD FacePic)//头像框
     RoleType = 0    #(DWORD RoleType)//角色类型(各项目可自定义含义,如种族,与职业区分)
     data = None
 
@@ -19211,6 +19387,7 @@
         self.ExAttr20,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.HPEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.RoleType,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
@@ -19315,6 +19492,7 @@
         self.ExAttr20 = 0
         self.HPEx = 0
         self.Face = 0
+        self.FacePic = 0
         self.RoleType = 0
         return
 
@@ -19408,6 +19586,7 @@
         length += 4
         length += 4
         length += 15
+        length += 4
         length += 4
         length += 4
         length += 4
@@ -19520,6 +19699,7 @@
         data = CommFunc.WriteDWORD(data, self.ExAttr20)
         data = CommFunc.WriteDWORD(data, self.HPEx)
         data = CommFunc.WriteDWORD(data, self.Face)
+        data = CommFunc.WriteDWORD(data, self.FacePic)
         data = CommFunc.WriteDWORD(data, self.RoleType)
         return data
 
@@ -19622,6 +19802,7 @@
                                 ExAttr20:%d,
                                 HPEx:%d,
                                 Face:%d,
+                                FacePic:%d,
                                 RoleType:%d
                                 '''\
                                 %(
@@ -19722,6 +19903,7 @@
                                 self.ExAttr20,
                                 self.HPEx,
                                 self.Face,
+                                self.FacePic,
                                 self.RoleType
                                 )
         return DumpString
@@ -30580,18 +30762,17 @@
 #------------------------------------------------------
 # A7 17 聊天气泡框状态 #tagMCChatBubbleBoxState
 
-class  tagMCChatBubbleBoxState(Structure):
+class  tagMCChatBubbleBox(Structure):
     _pack_ = 1
     _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("BoxState", c_int),    # 按二进制位存储代表是否已开启,暂支持31位,以后有需要再加
+                  ("BoxID", c_ubyte),    #气泡ID
+                  ("State", c_ubyte),    #是否已激活
+                  ("EndTime", c_int),    #到期时间戳,0为永久
+                  ("Star", c_ubyte),    #星级
                   ]
 
     def __init__(self):
         self.Clear()
-        self.Cmd = 0xA7
-        self.SubCmd = 0x17
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -30600,33 +30781,98 @@
         return _pos + self.GetLength()
 
     def Clear(self):
-        self.Cmd = 0xA7
-        self.SubCmd = 0x17
-        self.BoxState = 0
+        self.BoxID = 0
+        self.State = 0
+        self.EndTime = 0
+        self.Star = 0
         return
 
     def GetLength(self):
-        return sizeof(tagMCChatBubbleBoxState)
+        return sizeof(tagMCChatBubbleBox)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
         DumpString = '''// A7 17 聊天气泡框状态 //tagMCChatBubbleBoxState:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                BoxState:%d
+                                BoxID:%d,
+                                State:%d,
+                                EndTime:%d,
+                                Star:%d
                                 '''\
                                 %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.BoxState
+                                self.BoxID,
+                                self.State,
+                                self.EndTime,
+                                self.Star
+                                )
+        return DumpString
+
+
+class  tagMCChatBubbleBoxState(Structure):
+    Head = tagHead()
+    Count = 0    #(BYTE Count)
+    BoxList = list()    #(vector<tagMCChatBubbleBox> BoxList)
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA7
+        self.Head.SubCmd = 0x17
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.Count):
+            temBoxList = tagMCChatBubbleBox()
+            _pos = temBoxList.ReadData(_lpData, _pos)
+            self.BoxList.append(temBoxList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA7
+        self.Head.SubCmd = 0x17
+        self.Count = 0
+        self.BoxList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        for i in range(self.Count):
+            length += self.BoxList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.BoxList[i].GetLength(), self.BoxList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Count:%d,
+                                BoxList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Count,
+                                "..."
                                 )
         return DumpString
 
 
 m_NAtagMCChatBubbleBoxState=tagMCChatBubbleBoxState()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCChatBubbleBoxState.Cmd,m_NAtagMCChatBubbleBoxState.SubCmd))] = m_NAtagMCChatBubbleBoxState
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCChatBubbleBoxState.Head.Cmd,m_NAtagMCChatBubbleBoxState.Head.SubCmd))] = m_NAtagMCChatBubbleBoxState
 
 
 #------------------------------------------------------
@@ -30925,6 +31171,118 @@
 
 m_NAtagMCDynamicBarrierState=tagMCDynamicBarrierState()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCDynamicBarrierState.Head.Cmd,m_NAtagMCDynamicBarrierState.Head.SubCmd))] = m_NAtagMCDynamicBarrierState
+
+
+#------------------------------------------------------
+# A7 21 表情包信息 #tagMCEmojiPackInfo
+
+class  tagMCEmojiPack(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("PackID", c_ubyte),    #表情包ID
+                  ("State", c_ubyte),    #是否已激活
+                  ("EndTime", c_int),    #到期时间戳,0为永久
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        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.PackID = 0
+        self.State = 0
+        self.EndTime = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCEmojiPack)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A7 21 表情包信息 //tagMCEmojiPackInfo:
+                                PackID:%d,
+                                State:%d,
+                                EndTime:%d
+                                '''\
+                                %(
+                                self.PackID,
+                                self.State,
+                                self.EndTime
+                                )
+        return DumpString
+
+
+class  tagMCEmojiPackInfo(Structure):
+    Head = tagHead()
+    Count = 0    #(BYTE Count)
+    EmojiPackList = list()    #(vector<tagMCEmojiPack> EmojiPackList)
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA7
+        self.Head.SubCmd = 0x21
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.Count):
+            temEmojiPackList = tagMCEmojiPack()
+            _pos = temEmojiPackList.ReadData(_lpData, _pos)
+            self.EmojiPackList.append(temEmojiPackList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA7
+        self.Head.SubCmd = 0x21
+        self.Count = 0
+        self.EmojiPackList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        for i in range(self.Count):
+            length += self.EmojiPackList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.EmojiPackList[i].GetLength(), self.EmojiPackList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Count:%d,
+                                EmojiPackList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCEmojiPackInfo=tagMCEmojiPackInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCEmojiPackInfo.Head.Cmd,m_NAtagMCEmojiPackInfo.Head.SubCmd))] = m_NAtagMCEmojiPackInfo
 
 
 #------------------------------------------------------
@@ -49886,6 +50244,238 @@
 
 
 #------------------------------------------------------
+# B1 17 头像信息 #tagMCFaceInfo
+
+class  tagMCFace(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("FaceID", c_int),    #头像ID
+                  ("State", c_ubyte),    #是否已激活
+                  ("EndTime", c_int),    #到期时间戳,0为永久
+                  ("Star", c_ubyte),    #星级
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        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.FaceID = 0
+        self.State = 0
+        self.EndTime = 0
+        self.Star = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCFace)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B1 17 头像信息 //tagMCFaceInfo:
+                                FaceID:%d,
+                                State:%d,
+                                EndTime:%d,
+                                Star:%d
+                                '''\
+                                %(
+                                self.FaceID,
+                                self.State,
+                                self.EndTime,
+                                self.Star
+                                )
+        return DumpString
+
+
+class  tagMCFaceInfo(Structure):
+    Head = tagHead()
+    Count = 0    #(BYTE Count)
+    FaceList = list()    #(vector<tagMCFace> FaceList)
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB1
+        self.Head.SubCmd = 0x17
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.Count):
+            temFaceList = tagMCFace()
+            _pos = temFaceList.ReadData(_lpData, _pos)
+            self.FaceList.append(temFaceList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB1
+        self.Head.SubCmd = 0x17
+        self.Count = 0
+        self.FaceList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        for i in range(self.Count):
+            length += self.FaceList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.FaceList[i].GetLength(), self.FaceList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Count:%d,
+                                FaceList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCFaceInfo=tagMCFaceInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFaceInfo.Head.Cmd,m_NAtagMCFaceInfo.Head.SubCmd))] = m_NAtagMCFaceInfo
+
+
+#------------------------------------------------------
+# B1 18 头像框信息 #tagMCFacePicInfo
+
+class  tagMCFacePic(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("FacePicID", c_int),    #头像框ID
+                  ("State", c_ubyte),    #是否已激活
+                  ("EndTime", c_int),    #到期时间戳,0为永久
+                  ("Star", c_ubyte),    #星级
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        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.FacePicID = 0
+        self.State = 0
+        self.EndTime = 0
+        self.Star = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCFacePic)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B1 18 头像框信息 //tagMCFacePicInfo:
+                                FacePicID:%d,
+                                State:%d,
+                                EndTime:%d,
+                                Star:%d
+                                '''\
+                                %(
+                                self.FacePicID,
+                                self.State,
+                                self.EndTime,
+                                self.Star
+                                )
+        return DumpString
+
+
+class  tagMCFacePicInfo(Structure):
+    Head = tagHead()
+    Count = 0    #(BYTE Count)
+    FacePicList = list()    #(vector<tagMCFacePic> FacePicList)
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB1
+        self.Head.SubCmd = 0x18
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.Count):
+            temFacePicList = tagMCFacePic()
+            _pos = temFacePicList.ReadData(_lpData, _pos)
+            self.FacePicList.append(temFacePicList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB1
+        self.Head.SubCmd = 0x18
+        self.Count = 0
+        self.FacePicList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        for i in range(self.Count):
+            length += self.FacePicList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.FacePicList[i].GetLength(), self.FacePicList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Count:%d,
+                                FacePicList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCFacePicInfo=tagMCFacePicInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFacePicInfo.Head.Cmd,m_NAtagMCFacePicInfo.Head.SubCmd))] = m_NAtagMCFacePicInfo
+
+
+#------------------------------------------------------
 # B1 11 功能系统特权信息 #tagMCFuncSysPrivilegeInfoList
 
 class  tagMCFuncSysPrivilegeInfo(Structure):

--
Gitblit v1.8.0