From b6ba2976a06e9d288c740e8ab83186b7feb5dcea Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 08:03:05 +0800
Subject: [PATCH] 860312 buff封包补齐

---
 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py |  142 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 124 insertions(+), 18 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 3a2b105..666190f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -8517,8 +8517,6 @@
     StartDate = ""    #(char StartDate[10])// 开始日期 yyyy-MM-dd
     EndDate = ""    #(char EndDate[10])// 结束日期 yyyy-MM-dd
     EndTime = ""    #(char EndTime[5])// 赛季结算时间,赛季奖励该时间后才可领取 hh:mm
-    NextStartDate = ""    #(char NextStartDate[10])// 下赛季开始日期 yyyy-MM-dd
-    NextEndDate = ""    #(char NextEndDate[10])// 下赛季结束日期 yyyy-MM-dd
     data = None
 
     def __init__(self):
@@ -8531,8 +8529,6 @@
         self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
         self.EndDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
         self.EndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.NextStartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.NextEndDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
         return _pos
 
     def Clear(self):
@@ -8540,8 +8536,6 @@
         self.StartDate = ""
         self.EndDate = ""
         self.EndTime = ""
-        self.NextStartDate = ""
-        self.NextEndDate = ""
         return
 
     def GetLength(self):
@@ -8550,8 +8544,6 @@
         length += 10
         length += 10
         length += 5
-        length += 10
-        length += 10
 
         return length
 
@@ -8561,8 +8553,6 @@
         data = CommFunc.WriteString(data, 10, self.StartDate)
         data = CommFunc.WriteString(data, 10, self.EndDate)
         data = CommFunc.WriteString(data, 5, self.EndTime)
-        data = CommFunc.WriteString(data, 10, self.NextStartDate)
-        data = CommFunc.WriteString(data, 10, self.NextEndDate)
         return data
 
     def OutputString(self):
@@ -8570,17 +8560,13 @@
                                 SeasonID:%d,
                                 StartDate:%s,
                                 EndDate:%s,
-                                EndTime:%s,
-                                NextStartDate:%s,
-                                NextEndDate:%s
+                                EndTime:%s
                                 '''\
                                 %(
                                 self.SeasonID,
                                 self.StartDate,
                                 self.EndDate,
-                                self.EndTime,
-                                self.NextStartDate,
-                                self.NextEndDate
+                                self.EndTime
                                 )
         return DumpString
 
@@ -13572,6 +13558,7 @@
                   ("Exp", c_int),    
                   ("State", c_ubyte),    #是否点击法宝认主
                   ("FBPassLV", c_ubyte),    #副本关卡
+                  ("IsWear", c_ubyte),    #是否佩戴(仅适用王者法宝)
                   ]
 
     def __init__(self):
@@ -13589,6 +13576,7 @@
         self.Exp = 0
         self.State = 0
         self.FBPassLV = 0
+        self.IsWear = 0
         return
 
     def GetLength(self):
@@ -13603,14 +13591,16 @@
                                 LV:%d,
                                 Exp:%d,
                                 State:%d,
-                                FBPassLV:%d
+                                FBPassLV:%d,
+                                IsWear:%d
                                 '''\
                                 %(
                                 self.MWID,
                                 self.LV,
                                 self.Exp,
                                 self.State,
-                                self.FBPassLV
+                                self.FBPassLV,
+                                self.IsWear
                                 )
         return DumpString
 
@@ -27740,6 +27730,122 @@
 
 
 #------------------------------------------------------
+# C1 03 跨服PK玩家历史赛季信息 #tagMCCrossRealmPKPlayerHisSeasonInfo
+
+class  tagMCCrossRealmPKPlayerHisSeason(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("SeasonID", c_ushort),    # 赛季ID
+                  ("Order", c_ushort),    # 名次
+                  ("DanLV", c_ubyte),    # 段位
+                  ("AwardLV", 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.SeasonID = 0
+        self.Order = 0
+        self.DanLV = 0
+        self.AwardLV = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCCrossRealmPKPlayerHisSeason)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// C1 03 跨服PK玩家历史赛季信息 //tagMCCrossRealmPKPlayerHisSeasonInfo:
+                                SeasonID:%d,
+                                Order:%d,
+                                DanLV:%d,
+                                AwardLV:%d
+                                '''\
+                                %(
+                                self.SeasonID,
+                                self.Order,
+                                self.DanLV,
+                                self.AwardLV
+                                )
+        return DumpString
+
+
+class  tagMCCrossRealmPKPlayerHisSeasonInfo(Structure):
+    Head = tagHead()
+    Count = 0    #(WORD Count)// 赛季个数
+    SeasonList = list()    #(vector<tagMCCrossRealmPKPlayerHisSeason> SeasonList)// 赛季信息列表
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xC1
+        self.Head.SubCmd = 0x03
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        for i in range(self.Count):
+            temSeasonList = tagMCCrossRealmPKPlayerHisSeason()
+            _pos = temSeasonList.ReadData(_lpData, _pos)
+            self.SeasonList.append(temSeasonList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xC1
+        self.Head.SubCmd = 0x03
+        self.Count = 0
+        self.SeasonList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 2
+        for i in range(self.Count):
+            length += self.SeasonList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteWORD(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.SeasonList[i].GetLength(), self.SeasonList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Count:%d,
+                                SeasonList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCCrossRealmPKPlayerHisSeasonInfo=tagMCCrossRealmPKPlayerHisSeasonInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossRealmPKPlayerHisSeasonInfo.Head.Cmd,m_NAtagMCCrossRealmPKPlayerHisSeasonInfo.Head.SubCmd))] = m_NAtagMCCrossRealmPKPlayerHisSeasonInfo
+
+
+#------------------------------------------------------
 # C1 01 跨服PK玩家信息 #tagMCCrossRealmPKPlayerInfo
 
 class  tagMCCrossRealmPKPlayerInfo(Structure):

--
Gitblit v1.8.0