From 83fb126a34c08f737b94c694524a701828901617 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 25 十二月 2018 10:54:37 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（赛季信息封包删除下赛季时间信息）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 26 ++++++++------------------
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 26 ++++++++------------------
2 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 3a2b105..a3c119d 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -8517,8 +8517,6 @@
StartDate = "" #(char StartDate[10])// 开始日期 yyyy-MM-dd
EndDate = "" #(char EndDate[10])// 结束日期 yyyy-MM-dd
EndTime = "" #(char EndTime[5])// 赛季结算时间，赛季奖励该时间后才可领取 hh:mm
- NextStartDate = "" #(char NextStartDate[10])// 下赛季开始日期 yyyy-MM-dd
- NextEndDate = "" #(char NextEndDate[10])// 下赛季结束日期 yyyy-MM-dd
data = None
def __init__(self):
@@ -8531,8 +8529,6 @@
self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.EndDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.EndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
- self.NextStartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
- self.NextEndDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
return _pos
def Clear(self):
@@ -8540,8 +8536,6 @@
self.StartDate = ""
self.EndDate = ""
self.EndTime = ""
- self.NextStartDate = ""
- self.NextEndDate = ""
return
def GetLength(self):
@@ -8550,8 +8544,6 @@
length += 10
length += 10
length += 5
- length += 10
- length += 10
return length
@@ -8561,8 +8553,6 @@
data = CommFunc.WriteString(data, 10, self.StartDate)
data = CommFunc.WriteString(data, 10, self.EndDate)
data = CommFunc.WriteString(data, 5, self.EndTime)
- data = CommFunc.WriteString(data, 10, self.NextStartDate)
- data = CommFunc.WriteString(data, 10, self.NextEndDate)
return data
def OutputString(self):
@@ -8570,17 +8560,13 @@
SeasonID:%d,
StartDate:%s,
EndDate:%s,
- EndTime:%s,
- NextStartDate:%s,
- NextEndDate:%s
+ EndTime:%s
'''\
%(
self.SeasonID,
self.StartDate,
self.EndDate,
- self.EndTime,
- self.NextStartDate,
- self.NextEndDate
+ self.EndTime
)
return DumpString
@@ -13572,6 +13558,7 @@
("Exp", c_int),
("State", c_ubyte), #是否点击法宝认主
("FBPassLV", c_ubyte), #副本关卡
+ ("IsWear", c_ubyte), #是否佩戴(仅适用王者法宝)
]
def __init__(self):
@@ -13589,6 +13576,7 @@
self.Exp = 0
self.State = 0
self.FBPassLV = 0
+ self.IsWear = 0
return
def GetLength(self):
@@ -13603,14 +13591,16 @@
LV:%d,
Exp:%d,
State:%d,
- FBPassLV:%d
+ FBPassLV:%d,
+ IsWear:%d
'''\
%(
self.MWID,
self.LV,
self.Exp,
self.State,
- self.FBPassLV
+ self.FBPassLV,
+ self.IsWear
)
return DumpString
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 3a2b105..a3c119d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -8517,8 +8517,6 @@
StartDate = "" #(char StartDate[10])// 开始日期 yyyy-MM-dd
EndDate = "" #(char EndDate[10])// 结束日期 yyyy-MM-dd
EndTime = "" #(char EndTime[5])// 赛季结算时间，赛季奖励该时间后才可领取 hh:mm
- NextStartDate = "" #(char NextStartDate[10])// 下赛季开始日期 yyyy-MM-dd
- NextEndDate = "" #(char NextEndDate[10])// 下赛季结束日期 yyyy-MM-dd
data = None
def __init__(self):
@@ -8531,8 +8529,6 @@
self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.EndDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.EndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
- self.NextStartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
- self.NextEndDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
return _pos
def Clear(self):
@@ -8540,8 +8536,6 @@
self.StartDate = ""
self.EndDate = ""
self.EndTime = ""
- self.NextStartDate = ""
- self.NextEndDate = ""
return
def GetLength(self):
@@ -8550,8 +8544,6 @@
length += 10
length += 10
length += 5
- length += 10
- length += 10
return length
@@ -8561,8 +8553,6 @@
data = CommFunc.WriteString(data, 10, self.StartDate)
data = CommFunc.WriteString(data, 10, self.EndDate)
data = CommFunc.WriteString(data, 5, self.EndTime)
- data = CommFunc.WriteString(data, 10, self.NextStartDate)
- data = CommFunc.WriteString(data, 10, self.NextEndDate)
return data
def OutputString(self):
@@ -8570,17 +8560,13 @@
SeasonID:%d,
StartDate:%s,
EndDate:%s,
- EndTime:%s,
- NextStartDate:%s,
- NextEndDate:%s
+ EndTime:%s
'''\
%(
self.SeasonID,
self.StartDate,
self.EndDate,
- self.EndTime,
- self.NextStartDate,
- self.NextEndDate
+ self.EndTime
)
return DumpString
@@ -13572,6 +13558,7 @@
("Exp", c_int),
("State", c_ubyte), #是否点击法宝认主
("FBPassLV", c_ubyte), #副本关卡
+ ("IsWear", c_ubyte), #是否佩戴(仅适用王者法宝)
]
def __init__(self):
@@ -13589,6 +13576,7 @@
self.Exp = 0
self.State = 0
self.FBPassLV = 0
+ self.IsWear = 0
return
def GetLength(self):
@@ -13603,14 +13591,16 @@
LV:%d,
Exp:%d,
State:%d,
- FBPassLV:%d
+ FBPassLV:%d,
+ IsWear:%d
'''\
%(
self.MWID,
self.LV,
self.Exp,
self.State,
- self.FBPassLV
+ self.FBPassLV,
+ self.IsWear
)
return DumpString
--
Gitblit v1.8.0