From 28cf96828011304cd74254017a1af7a0cc8df0be Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 10 九月 2018 10:23:35 +0800
Subject: [PATCH] 3245 【后端】开服限时活动定制; 增加设置开服是星期几的GM命令: SetOpenServerWeekday

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py |   68 +++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 908d399..2d5268a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -311,60 +311,78 @@
 #A0 05 同步开服天数 #tagOpenServerDay
 
 class  tagOpenServerDay(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("Day", c_ushort),    # 已开服天数,从0开始
-                  ("IsMixServer", c_ubyte),    #是否是合服服务器
-                  ("MixDay", c_ushort),    # 已合服天数,从0开始
-                  ]
+    Head = tagHead()
+    Day = 0    #(WORD Day)// 已开服天数,从0开始
+    IsMixServer = 0    #(BYTE IsMixServer)//是否是合服服务器
+    MixDay = 0    #(WORD MixDay)// 已合服天数,从0开始
+    OpenServerTime = ""    #(char OpenServerTime[19])//开服时间yyyy-MM-dd HH:mm:ss
+    data = None
 
     def __init__(self):
         self.Clear()
-        self.Cmd = 0xA0
-        self.SubCmd = 0x05
+        self.Head.Cmd = 0xA0
+        self.Head.SubCmd = 0x05
         return
 
-    def ReadData(self, stringData, _pos=0, _len=0):
+    def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.Day,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.IsMixServer,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.MixDay,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.OpenServerTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
+        return _pos
 
     def Clear(self):
-        self.Cmd = 0xA0
-        self.SubCmd = 0x05
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA0
+        self.Head.SubCmd = 0x05
         self.Day = 0
         self.IsMixServer = 0
         self.MixDay = 0
+        self.OpenServerTime = ""
         return
 
     def GetLength(self):
-        return sizeof(tagOpenServerDay)
+        length = 0
+        length += self.Head.GetLength()
+        length += 2
+        length += 1
+        length += 2
+        length += 19
+
+        return length
 
     def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteWORD(data, self.Day)
+        data = CommFunc.WriteBYTE(data, self.IsMixServer)
+        data = CommFunc.WriteWORD(data, self.MixDay)
+        data = CommFunc.WriteString(data, 19, self.OpenServerTime)
+        return data
 
     def OutputString(self):
-        DumpString = '''//A0 05 同步开服天数 //tagOpenServerDay:
-                                Cmd:%s,
-                                SubCmd:%s,
+        DumpString = '''
+                                Head:%s,
                                 Day:%d,
                                 IsMixServer:%d,
-                                MixDay:%d
+                                MixDay:%d,
+                                OpenServerTime:%s
                                 '''\
                                 %(
-                                self.Cmd,
-                                self.SubCmd,
+                                self.Head.OutputString(),
                                 self.Day,
                                 self.IsMixServer,
-                                self.MixDay
+                                self.MixDay,
+                                self.OpenServerTime
                                 )
         return DumpString
 
 
 m_NAtagOpenServerDay=tagOpenServerDay()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagOpenServerDay.Cmd,m_NAtagOpenServerDay.SubCmd))] = m_NAtagOpenServerDay
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagOpenServerDay.Head.Cmd,m_NAtagOpenServerDay.Head.SubCmd))] = m_NAtagOpenServerDay
 
 
 #------------------------------------------------------

--
Gitblit v1.8.0