From 88effa2034b78c46426b2e7f7924a9493da9af4f Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 03 十二月 2018 16:22:15 +0800
Subject: [PATCH] 5161 子 【1.3.100】修复在仙盟任务副本中退出仙盟还能继续任务的BUG
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 767623a..431d95b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -24487,7 +24487,10 @@
Head = tagHead()
MapID = 0 #(DWORD MapID)
FuncLineID = 0 #(BYTE FuncLineID)
- XianyuanCoinAdd = 0 #(WORD XianyuanCoinAdd)// 增加的仙缘币，0代表已达上限
+ Relation = 0 #(BYTE Relation)// 当时的关系：0-无，1-好友，2-盟友
+ RelationCoinAdd = 0 #(BYTE RelationCoinAdd)// 社交关系总加成
+ XianyuanCoinAdd = 0 #(WORD XianyuanCoinAdd)// 实际增加的仙缘币
+ Reason = 0 #(BYTE Reason)//仙缘币为0时的原因：1-助战次数上限；2-每日获得上限
CallPlayerID = 0 #(DWORD CallPlayerID)// 助战的玩家ID，有值时代表真实助战，没有值时为自己打的
NameLen = 0 #(BYTE NameLen)
CallPlayerName = "" #(String CallPlayerName)// 助战的玩家名，size = NameLen
@@ -24504,7 +24507,10 @@
_pos = self.Head.ReadData(_lpData, _pos)
self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FuncLineID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.Relation,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RelationCoinAdd,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.XianyuanCoinAdd,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Reason,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.CallPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.CallPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
@@ -24517,7 +24523,10 @@
self.Head.SubCmd = 0x08
self.MapID = 0
self.FuncLineID = 0
+ self.Relation = 0
+ self.RelationCoinAdd = 0
self.XianyuanCoinAdd = 0
+ self.Reason = 0
self.CallPlayerID = 0
self.NameLen = 0
self.CallPlayerName = ""
@@ -24528,7 +24537,10 @@
length += self.Head.GetLength()
length += 4
length += 1
+ length += 1
+ length += 1
length += 2
+ length += 1
length += 4
length += 1
length += len(self.CallPlayerName)
@@ -24540,7 +24552,10 @@
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
data = CommFunc.WriteDWORD(data, self.MapID)
data = CommFunc.WriteBYTE(data, self.FuncLineID)
+ data = CommFunc.WriteBYTE(data, self.Relation)
+ data = CommFunc.WriteBYTE(data, self.RelationCoinAdd)
data = CommFunc.WriteWORD(data, self.XianyuanCoinAdd)
+ data = CommFunc.WriteBYTE(data, self.Reason)
data = CommFunc.WriteDWORD(data, self.CallPlayerID)
data = CommFunc.WriteBYTE(data, self.NameLen)
data = CommFunc.WriteString(data, self.NameLen, self.CallPlayerName)
@@ -24551,7 +24566,10 @@
Head:%s,
MapID:%d,
FuncLineID:%d,
+ Relation:%d,
+ RelationCoinAdd:%d,
XianyuanCoinAdd:%d,
+ Reason:%d,
CallPlayerID:%d,
NameLen:%d,
CallPlayerName:%s
@@ -24560,7 +24578,10 @@
self.Head.OutputString(),
self.MapID,
self.FuncLineID,
+ self.Relation,
+ self.RelationCoinAdd,
self.XianyuanCoinAdd,
+ self.Reason,
self.CallPlayerID,
self.NameLen,
self.CallPlayerName
@@ -24930,6 +24951,7 @@
("SubCmd", c_ubyte),
("ObjID", c_int), # 助战实例ID
("PlayerID", c_int), # 助战镜像ID,大于1小于100代表机器人,如果是机器人前端按顺序自己记录对应实例ID代表已召唤
+ ("Job", c_ubyte), # 职业
]
def __init__(self):
@@ -24948,6 +24970,7 @@
self.SubCmd = 0x06
self.ObjID = 0
self.PlayerID = 0
+ self.Job = 0
return
def GetLength(self):
@@ -24961,13 +24984,15 @@
Cmd:%s,
SubCmd:%s,
ObjID:%d,
- PlayerID:%d
+ PlayerID:%d,
+ Job:%d
'''\
%(
self.Cmd,
self.SubCmd,
self.ObjID,
- self.PlayerID
+ self.PlayerID,
+ self.Job
)
return DumpString
--
Gitblit v1.8.0