From 898494b9c3f767f7da9d02d91db3898bdf9aeffd Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 04 十二月 2019 16:21:27 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统（修改为正在进行中的协助信息, 增加boss伤血榜单通知）
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 165 ++++++++++++++++++++++++++++--------------------------
1 files changed, 86 insertions(+), 79 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index c744f36..3205f14 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -1964,7 +1964,7 @@
class tagCGCancelAssistBoss(Structure):
Head = tagHead()
- GUID = "" #(char GUID[40])
+ AssistGUID = "" #(char AssistGUID[40])//协助GUID
data = None
def __init__(self):
@@ -1976,7 +1976,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
- self.GUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
+ self.AssistGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
return _pos
def Clear(self):
@@ -1984,7 +1984,7 @@
self.Head.Clear()
self.Head.Cmd = 0xB0
self.Head.SubCmd = 0x13
- self.GUID = ""
+ self.AssistGUID = ""
return
def GetLength(self):
@@ -1997,17 +1997,17 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteString(data, 40, self.GUID)
+ data = CommFunc.WriteString(data, 40, self.AssistGUID)
return data
def OutputString(self):
DumpString = '''
Head:%s,
- GUID:%s
+ AssistGUID:%s
'''\
%(
self.Head.OutputString(),
- self.GUID
+ self.AssistGUID
)
return DumpString
@@ -2017,11 +2017,11 @@
#------------------------------------------------------
-# B0 15 领取协助感谢礼物 #tagCGGetAssistGift
+# B0 15 领取协助感谢礼物 #tagCGGetAssistThanksGift
-class tagCGGetAssistGift(Structure):
+class tagCGGetAssistThanksGift(Structure):
Head = tagHead()
- GUID = "" #(char GUID[40])
+ GiftGUID = "" #(char GiftGUID[40])//礼盒GUID
data = None
def __init__(self):
@@ -2033,7 +2033,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
- self.GUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
+ self.GiftGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
return _pos
def Clear(self):
@@ -2041,7 +2041,7 @@
self.Head.Clear()
self.Head.Cmd = 0xB0
self.Head.SubCmd = 0x15
- self.GUID = ""
+ self.GiftGUID = ""
return
def GetLength(self):
@@ -2054,23 +2054,23 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteString(data, 40, self.GUID)
+ data = CommFunc.WriteString(data, 40, self.GiftGUID)
return data
def OutputString(self):
DumpString = '''
Head:%s,
- GUID:%s
+ GiftGUID:%s
'''\
%(
self.Head.OutputString(),
- self.GUID
+ self.GiftGUID
)
return DumpString
-m_NAtagCGGetAssistGift=tagCGGetAssistGift()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGGetAssistGift.Head.Cmd,m_NAtagCGGetAssistGift.Head.SubCmd))] = m_NAtagCGGetAssistGift
+m_NAtagCGGetAssistThanksGift=tagCGGetAssistThanksGift()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGGetAssistThanksGift.Head.Cmd,m_NAtagCGGetAssistThanksGift.Head.SubCmd))] = m_NAtagCGGetAssistThanksGift
#------------------------------------------------------
@@ -2122,68 +2122,11 @@
#------------------------------------------------------
-# B0 14 发送协助感谢礼物 #tagCGSendAssistGift
-
-class tagCGSendAssistGift(Structure):
- Head = tagHead()
- GUID = "" #(char GUID[40])
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xB0
- self.Head.SubCmd = 0x14
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.GUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xB0
- self.Head.SubCmd = 0x14
- self.GUID = ""
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 40
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteString(data, 40, self.GUID)
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- GUID:%s
- '''\
- %(
- self.Head.OutputString(),
- self.GUID
- )
- return DumpString
-
-
-m_NAtagCGSendAssistGift=tagCGSendAssistGift()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGSendAssistGift.Head.Cmd,m_NAtagCGSendAssistGift.Head.SubCmd))] = m_NAtagCGSendAssistGift
-
-
-#------------------------------------------------------
# B0 12 开始协助Boss #tagCGStartAssistBoss
class tagCGStartAssistBoss(Structure):
Head = tagHead()
- GUID = "" #(char GUID[40])
+ AssistGUID = "" #(char AssistGUID[40])//协助GUID
data = None
def __init__(self):
@@ -2195,7 +2138,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
- self.GUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
+ self.AssistGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
return _pos
def Clear(self):
@@ -2203,7 +2146,7 @@
self.Head.Clear()
self.Head.Cmd = 0xB0
self.Head.SubCmd = 0x12
- self.GUID = ""
+ self.AssistGUID = ""
return
def GetLength(self):
@@ -2216,17 +2159,17 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteString(data, 40, self.GUID)
+ data = CommFunc.WriteString(data, 40, self.AssistGUID)
return data
def OutputString(self):
DumpString = '''
Head:%s,
- GUID:%s
+ AssistGUID:%s
'''\
%(
self.Head.OutputString(),
- self.GUID
+ self.AssistGUID
)
return DumpString
@@ -2236,6 +2179,70 @@
#------------------------------------------------------
+# B0 14 使用协助感谢礼盒 #tagCGUseAssistThanksGift
+
+class tagCGUseAssistThanksGift(Structure):
+ Head = tagHead()
+ ItemID = 0 #(DWORD ItemID)
+ GiftGUID = "" #(char GiftGUID[40])//预览时GUID不发，确认使用时需发送预览返回的GUID
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB0
+ self.Head.SubCmd = 0x14
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.ItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.GiftGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB0
+ self.Head.SubCmd = 0x14
+ self.ItemID = 0
+ self.GiftGUID = ""
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 4
+ length += 40
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteDWORD(data, self.ItemID)
+ data = CommFunc.WriteString(data, 40, self.GiftGUID)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ ItemID:%d,
+ GiftGUID:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.ItemID,
+ self.GiftGUID
+ )
+ return DumpString
+
+
+m_NAtagCGUseAssistThanksGift=tagCGUseAssistThanksGift()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGUseAssistThanksGift.Head.Cmd,m_NAtagCGUseAssistThanksGift.Head.SubCmd))] = m_NAtagCGUseAssistThanksGift
+
+
+#------------------------------------------------------
#B3 04 加入黑名单 #tagCGAddBlackList
class tagCGAddBlackList(Structure):
--
Gitblit v1.8.0