From f343dfb9ea6b20d6ce1e5e1ee468a79539b12fe0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 01 十一月 2018 14:05:18 +0800
Subject: [PATCH] 4504 【后端】【1.2】组队仙界秘境材料不足时弹框
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 68 ++++++++++++++++++++++
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py | 6 ++
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 68 ++++++++++++++++++++++
3 files changed, 138 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 0fbfd19..9d6d46a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -6585,6 +6585,66 @@
#------------------------------------------------------
+# B9 13 进入组队副本失败原因 #tagGCEnterTeamFBFailReason
+
+class tagGCEnterTeamFBFailReason(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("MapID", c_int), # 请求进入的地图ID
+ ("AskType", c_ubyte), # 请求类型： 0-匹配请求；1-进入请求
+ ("Reason", c_ubyte), # 失败原因：
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB9
+ self.SubCmd = 0x13
+ 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.Cmd = 0xB9
+ self.SubCmd = 0x13
+ self.MapID = 0
+ self.AskType = 0
+ self.Reason = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagGCEnterTeamFBFailReason)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B9 13 进入组队副本失败原因 //tagGCEnterTeamFBFailReason:
+ Cmd:%s,
+ SubCmd:%s,
+ MapID:%d,
+ AskType:%d,
+ Reason:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.MapID,
+ self.AskType,
+ self.Reason
+ )
+ return DumpString
+
+
+m_NAtagGCEnterTeamFBFailReason=tagGCEnterTeamFBFailReason()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCEnterTeamFBFailReason.Cmd,m_NAtagGCEnterTeamFBFailReason.SubCmd))] = m_NAtagGCEnterTeamFBFailReason
+
+
+#------------------------------------------------------
# B9 01 收到邀请加入队伍信息 #tagGCInviteJoinTeamInfo
class tagGCInviteJoinTeamInfo(Structure):
@@ -17204,6 +17264,7 @@
("Value3", c_int), # 自定义值3
("Value4", c_int), # 自定义值4
("Value5", c_int), # 自定义值5
+ ("Value6", c_int), # 自定义值6
]
def __init__(self):
@@ -17222,6 +17283,7 @@
self.Value3 = 0
self.Value4 = 0
self.Value5 = 0
+ self.Value6 = 0
return
def GetLength(self):
@@ -17237,7 +17299,8 @@
Value2:%d,
Value3:%d,
Value4:%d,
- Value5:%d
+ Value5:%d,
+ Value6:%d
'''\
%(
self.SetNum,
@@ -17245,7 +17308,8 @@
self.Value2,
self.Value3,
self.Value4,
- self.Value5
+ self.Value5,
+ self.Value6
)
return DumpString
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
index 50b3640..06b53bd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
@@ -2781,6 +2781,12 @@
if memPlayerID in causePlayerDict:
PlayerControl.NotifyCode(memPlayer, notifyList[0], [askMapID])
+ if notifyRet in [ShareDefine.EntFBAskRet_NoEnterCnt, ShareDefine.EntFBAskRet_EnterCD, ShareDefine.EntFBAskRet_NoTicket]:
+ failPack = ChPyNetSendPack.tagGCEnterTeamFBFailReason()
+ failPack.MapID = askMapID
+ failPack.AskType = retAskType
+ failPack.Reason = notifyRet
+ NetPackCommon.SendFakePack(memPlayer, failPack)
else:
PlayerControl.NotifyCode(memPlayer, notifyList[1], [askMapID, causePlayerName])
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 0fbfd19..9d6d46a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -6585,6 +6585,66 @@
#------------------------------------------------------
+# B9 13 进入组队副本失败原因 #tagGCEnterTeamFBFailReason
+
+class tagGCEnterTeamFBFailReason(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("MapID", c_int), # 请求进入的地图ID
+ ("AskType", c_ubyte), # 请求类型： 0-匹配请求；1-进入请求
+ ("Reason", c_ubyte), # 失败原因：
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB9
+ self.SubCmd = 0x13
+ 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.Cmd = 0xB9
+ self.SubCmd = 0x13
+ self.MapID = 0
+ self.AskType = 0
+ self.Reason = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagGCEnterTeamFBFailReason)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B9 13 进入组队副本失败原因 //tagGCEnterTeamFBFailReason:
+ Cmd:%s,
+ SubCmd:%s,
+ MapID:%d,
+ AskType:%d,
+ Reason:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.MapID,
+ self.AskType,
+ self.Reason
+ )
+ return DumpString
+
+
+m_NAtagGCEnterTeamFBFailReason=tagGCEnterTeamFBFailReason()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCEnterTeamFBFailReason.Cmd,m_NAtagGCEnterTeamFBFailReason.SubCmd))] = m_NAtagGCEnterTeamFBFailReason
+
+
+#------------------------------------------------------
# B9 01 收到邀请加入队伍信息 #tagGCInviteJoinTeamInfo
class tagGCInviteJoinTeamInfo(Structure):
@@ -17204,6 +17264,7 @@
("Value3", c_int), # 自定义值3
("Value4", c_int), # 自定义值4
("Value5", c_int), # 自定义值5
+ ("Value6", c_int), # 自定义值6
]
def __init__(self):
@@ -17222,6 +17283,7 @@
self.Value3 = 0
self.Value4 = 0
self.Value5 = 0
+ self.Value6 = 0
return
def GetLength(self):
@@ -17237,7 +17299,8 @@
Value2:%d,
Value3:%d,
Value4:%d,
- Value5:%d
+ Value5:%d,
+ Value6:%d
'''\
%(
self.SetNum,
@@ -17245,7 +17308,8 @@
self.Value2,
self.Value3,
self.Value4,
- self.Value5
+ self.Value5,
+ self.Value6
)
return DumpString
--
Gitblit v1.8.0