From e7a6f9f5439ed847fa7915de178dd743e51a61b1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十二月 2018 15:11:10 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（修复匹配中匹配状态结束后玩家还被视为匹配中的bug）
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 49baa51..3857fe0 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -8297,6 +8297,7 @@
RoomID = 0 #(WORD RoomID)// 房间ID
NameLen = 0 #(BYTE NameLen)
PlayerName = "" #(String PlayerName)// 跨服名字
+ Number = 0 #(BYTE Number)// 位置编号；1-左，2-右
MatchPlayerCount = 0 #(BYTE MatchPlayerCount)
MatchPlayer = list() #(vector<tagGCCrossRealmPKMatchPlayer> MatchPlayer)// 匹配到的玩家
data = None
@@ -8313,6 +8314,7 @@
self.RoomID,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.PlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
+ self.Number,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.MatchPlayerCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.MatchPlayerCount):
temMatchPlayer = tagGCCrossRealmPKMatchPlayer()
@@ -8328,6 +8330,7 @@
self.RoomID = 0
self.NameLen = 0
self.PlayerName = ""
+ self.Number = 0
self.MatchPlayerCount = 0
self.MatchPlayer = list()
return
@@ -8338,6 +8341,7 @@
length += 2
length += 1
length += len(self.PlayerName)
+ length += 1
length += 1
for i in range(self.MatchPlayerCount):
length += self.MatchPlayer[i].GetLength()
@@ -8350,6 +8354,7 @@
data = CommFunc.WriteWORD(data, self.RoomID)
data = CommFunc.WriteBYTE(data, self.NameLen)
data = CommFunc.WriteString(data, self.NameLen, self.PlayerName)
+ data = CommFunc.WriteBYTE(data, self.Number)
data = CommFunc.WriteBYTE(data, self.MatchPlayerCount)
for i in range(self.MatchPlayerCount):
data = CommFunc.WriteString(data, self.MatchPlayer[i].GetLength(), self.MatchPlayer[i].GetBuffer())
@@ -8361,6 +8366,7 @@
RoomID:%d,
NameLen:%d,
PlayerName:%s,
+ Number:%d,
MatchPlayerCount:%d,
MatchPlayer:%s
'''\
@@ -8369,6 +8375,7 @@
self.RoomID,
self.NameLen,
self.PlayerName,
+ self.Number,
self.MatchPlayerCount,
"..."
)
@@ -26834,6 +26841,7 @@
("SeasonID", c_ushort), # 赛季ID
("Order", c_ushort), # 名次
("DanLV", c_ubyte), # 段位
+ ("Score", c_int), # 积分
("AwardLV", c_ubyte), # 赛季结算奖励等级，比如王者法宝的属性取该等级对应属性
]
@@ -26850,6 +26858,7 @@
self.SeasonID = 0
self.Order = 0
self.DanLV = 0
+ self.Score = 0
self.AwardLV = 0
return
@@ -26864,12 +26873,14 @@
SeasonID:%d,
Order:%d,
DanLV:%d,
+ Score:%d,
AwardLV:%d
'''\
%(
self.SeasonID,
self.Order,
self.DanLV,
+ self.Score,
self.AwardLV
)
return DumpString
--
Gitblit v1.8.0