From a5a3fae74222495868ae0bcd8483954cf2a4a712 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 03 二月 2019 16:46:54 +0800
Subject: [PATCH] 2906 【1.5.0】【1.5.100】跨服及子服启动未完成优化
---
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index ecae682..6646cd1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -392,13 +392,21 @@
("BYTE", "IsDayReset", 0),
),
- "CrossRealmPKZone":(
+ "CrossZoneComm":(
+ ("char", "CrossZoneName", 1),
+ ("BYTE", "ZoneID", 1),
+ ("list", "ServerGroupIDList", 0),
+ ),
+
+ "CrossZonePK":(
+ ("char", "CrossZoneName", 1),
("BYTE", "ZoneID", 1),
("char", "ZoneName", 0),
("list", "ServerGroupIDList", 0),
),
"CrossRealmPKSeason":(
+ ("char", "CrossZoneName", 1),
("BYTE", "ZoneID", 1),
("BYTE", "SeasonID", 0),
("char", "StartDate", 0),
@@ -412,9 +420,8 @@
("list", "MatchRange", 0),
),
- "CrossPenglaiZone":(
+ "CrossPenglaiZoneMap":(
("BYTE", "ZoneID", 0),
- ("list", "ServerGroupIDList", 0),
("DWORD", "MapID", 1),
("DWORD", "DataMapID", 1),
("BYTE", "CopyMapID", 1),
@@ -1239,15 +1246,30 @@
def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
-# 跨服竞技场赛区表
-class IPY_CrossRealmPKZone():
+# 跨服分区表通用
+class IPY_CrossZoneComm():
def __init__(self):
+ self.CrossZoneName = ""
+ self.ZoneID = 0
+ self.ServerGroupIDList = []
+ return
+
+ def GetCrossZoneName(self): return self.CrossZoneName # 跨服分区名
+ def GetZoneID(self): return self.ZoneID # 赛区ID
+ def GetServerGroupIDList(self): return self.ServerGroupIDList # 赛区服务器组ID列表
+
+# 跨服分区表竞技场
+class IPY_CrossZonePK():
+
+ def __init__(self):
+ self.CrossZoneName = ""
self.ZoneID = 0
self.ZoneName = ""
self.ServerGroupIDList = []
return
+ def GetCrossZoneName(self): return self.CrossZoneName # 跨服分区名
def GetZoneID(self): return self.ZoneID # 赛区ID
def GetZoneName(self): return self.ZoneName # 赛区名字
def GetServerGroupIDList(self): return self.ServerGroupIDList # 赛区服务器组ID列表
@@ -1256,6 +1278,7 @@
class IPY_CrossRealmPKSeason():
def __init__(self):
+ self.CrossZoneName = ""
self.ZoneID = 0
self.SeasonID = 0
self.StartDate = ""
@@ -1263,6 +1286,7 @@
self.EndTime = ""
return
+ def GetCrossZoneName(self): return self.CrossZoneName # 跨服分区名
def GetZoneID(self): return self.ZoneID # 赛区ID
def GetSeasonID(self): return self.SeasonID # 赛季ID
def GetStartDate(self): return self.StartDate # 开始日期 yyyy-MM-dd
@@ -1282,19 +1306,17 @@
def GetLVUpScore(self): return self.LVUpScore # 升段位所需积分
def GetMatchRange(self): return self.MatchRange # 可匹配到的玩家段位区间 [从段位A, 到段位B]，配[]代表只匹配本段位的
-# 跨服Boss蓬莱仙境分区表
-class IPY_CrossPenglaiZone():
+# 跨服Boss蓬莱仙境分区地图表
+class IPY_CrossPenglaiZoneMap():
def __init__(self):
self.ZoneID = 0
- self.ServerGroupIDList = []
self.MapID = 0
self.DataMapID = 0
self.CopyMapID = 0
return
def GetZoneID(self): return self.ZoneID # 分区ID
- def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器组ID列表
def GetMapID(self): return self.MapID # 场景地图ID
def GetDataMapID(self): return self.DataMapID # 数据地图ID
def GetCopyMapID(self): return self.CopyMapID # 虚拟线路ID
@@ -1522,14 +1544,16 @@
self.ipyActWishingWellLen = len(self.ipyActWishingWellCache)
self.ipyActTotalRechargeCache = self.__LoadFileData("ActTotalRecharge", IPY_ActTotalRecharge)
self.ipyActTotalRechargeLen = len(self.ipyActTotalRechargeCache)
- self.ipyCrossRealmPKZoneCache = self.__LoadFileData("CrossRealmPKZone", IPY_CrossRealmPKZone)
- self.ipyCrossRealmPKZoneLen = len(self.ipyCrossRealmPKZoneCache)
+ self.ipyCrossZoneCommCache = self.__LoadFileData("CrossZoneComm", IPY_CrossZoneComm)
+ self.ipyCrossZoneCommLen = len(self.ipyCrossZoneCommCache)
+ self.ipyCrossZonePKCache = self.__LoadFileData("CrossZonePK", IPY_CrossZonePK)
+ self.ipyCrossZonePKLen = len(self.ipyCrossZonePKCache)
self.ipyCrossRealmPKSeasonCache = self.__LoadFileData("CrossRealmPKSeason", IPY_CrossRealmPKSeason)
self.ipyCrossRealmPKSeasonLen = len(self.ipyCrossRealmPKSeasonCache)
self.ipyCrossRealmPKDanCache = self.__LoadFileData("CrossRealmPKDan", IPY_CrossRealmPKDan)
self.ipyCrossRealmPKDanLen = len(self.ipyCrossRealmPKDanCache)
- self.ipyCrossPenglaiZoneCache = self.__LoadFileData("CrossPenglaiZone", IPY_CrossPenglaiZone)
- self.ipyCrossPenglaiZoneLen = len(self.ipyCrossPenglaiZoneCache)
+ self.ipyCrossPenglaiZoneMapCache = self.__LoadFileData("CrossPenglaiZoneMap", IPY_CrossPenglaiZoneMap)
+ self.ipyCrossPenglaiZoneMapLen = len(self.ipyCrossPenglaiZoneMapCache)
self.ipyActWeekPartyCache = self.__LoadFileData("ActWeekParty", IPY_ActWeekParty)
self.ipyActWeekPartyLen = len(self.ipyActWeekPartyCache)
self.ipyActLoginAwardCache = self.__LoadFileData("ActLoginAward", IPY_ActLoginAward)
@@ -1772,14 +1796,16 @@
def GetActWishingWellByIndex(self, index): return self.ipyActWishingWellCache[index]
def GetActTotalRechargeCount(self): return self.ipyActTotalRechargeLen
def GetActTotalRechargeByIndex(self, index): return self.ipyActTotalRechargeCache[index]
- def GetCrossRealmPKZoneCount(self): return self.ipyCrossRealmPKZoneLen
- def GetCrossRealmPKZoneByIndex(self, index): return self.ipyCrossRealmPKZoneCache[index]
+ def GetCrossZoneCommCount(self): return self.ipyCrossZoneCommLen
+ def GetCrossZoneCommByIndex(self, index): return self.ipyCrossZoneCommCache[index]
+ def GetCrossZonePKCount(self): return self.ipyCrossZonePKLen
+ def GetCrossZonePKByIndex(self, index): return self.ipyCrossZonePKCache[index]
def GetCrossRealmPKSeasonCount(self): return self.ipyCrossRealmPKSeasonLen
def GetCrossRealmPKSeasonByIndex(self, index): return self.ipyCrossRealmPKSeasonCache[index]
def GetCrossRealmPKDanCount(self): return self.ipyCrossRealmPKDanLen
def GetCrossRealmPKDanByIndex(self, index): return self.ipyCrossRealmPKDanCache[index]
- def GetCrossPenglaiZoneCount(self): return self.ipyCrossPenglaiZoneLen
- def GetCrossPenglaiZoneByIndex(self, index): return self.ipyCrossPenglaiZoneCache[index]
+ def GetCrossPenglaiZoneMapCount(self): return self.ipyCrossPenglaiZoneMapLen
+ def GetCrossPenglaiZoneMapByIndex(self, index): return self.ipyCrossPenglaiZoneMapCache[index]
def GetActWeekPartyCount(self): return self.ipyActWeekPartyLen
def GetActWeekPartyByIndex(self, index): return self.ipyActWeekPartyCache[index]
def GetActLoginAwardCount(self): return self.ipyActLoginAwardLen
--
Gitblit v1.8.0