From 9c7acc7f02e130a8b742ec21579fdf5e6640d3cc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 16 十一月 2018 15:18:59 +0800
Subject: [PATCH] 2683 支持召唤兽-灵类型可继承主人为NPC的完整属性
---
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 70654d8..0f0d821 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -182,6 +182,7 @@
"ActSpringSale":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -198,6 +199,7 @@
"ActFlashGiftbag":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -214,6 +216,7 @@
"ActExpRate":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -229,6 +232,7 @@
"ActCostRebate":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -241,6 +245,7 @@
"ActBossReborn":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -254,6 +259,7 @@
"ActFairyCeremony":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -272,6 +278,7 @@
"ActRealmPoint":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -285,6 +292,7 @@
"ActFlashSale":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -309,6 +317,7 @@
"ActWishingWell":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -318,6 +327,19 @@
("dict", "NotifyInfoEnd", 0),
("list", "NotifyInfoLoop", 0),
("WORD", "LVLimit", 0),
+ ),
+
+ "ActTotalRecharge":(
+ ("DWORD", "CfgID", 1),
+ ("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
+ ("list", "ServerIDList", 0),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("dict", "NotifyInfoStart", 0),
+ ("dict", "NotifyInfoEnd", 0),
+ ("list", "NotifyInfoLoop", 0),
+ ("BYTE", "IsDayReset", 0),
),
}
@@ -639,6 +661,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -654,6 +677,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -672,6 +696,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -687,6 +712,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -705,6 +731,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -719,6 +746,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -736,6 +764,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -747,6 +776,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -761,6 +791,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -773,6 +804,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -788,6 +820,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -799,10 +832,11 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
- def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
+ def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置；2-5点开始0点结束
def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
def GetLVLimit(self): return self.LVLimit # 限制等级
@@ -826,6 +860,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -838,6 +873,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -853,6 +889,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -869,6 +906,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -903,6 +941,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -916,6 +955,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -925,6 +965,33 @@
def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
def GetLVLimit(self): return self.LVLimit # 限制等级
+
+# 累计充值活动表
+class IPY_ActTotalRecharge():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.ActMark = ""
+ self.PlatformList = []
+ self.ServerIDList = []
+ self.StartDate = ""
+ self.EndDate = ""
+ self.NotifyInfoStart = {}
+ self.NotifyInfoEnd = {}
+ self.NotifyInfoLoop = []
+ self.IsDayReset = 0
+ return
+
+ def GetCfgID(self): return self.CfgID # 配置ID
+ def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+ def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+ def GetStartDate(self): return self.StartDate # 开启日期
+ def GetEndDate(self): return self.EndDate # 结束日期
+ def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
+ def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
+ def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
+ def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
def Log(msg, playerID=0, par=0):
@@ -1006,6 +1073,8 @@
self.ipyStoreLen = len(self.ipyStoreCache)
self.ipyActWishingWellCache = self.__LoadFileData("ActWishingWell", IPY_ActWishingWell)
self.ipyActWishingWellLen = len(self.ipyActWishingWellCache)
+ self.ipyActTotalRechargeCache = self.__LoadFileData("ActTotalRecharge", IPY_ActTotalRecharge)
+ self.ipyActTotalRechargeLen = len(self.ipyActTotalRechargeCache)
Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
Log("IPY_DataMgr InitOK!")
return
@@ -1228,6 +1297,8 @@
def GetStoreByIndex(self, index): return self.ipyStoreCache[index]
def GetActWishingWellCount(self): return self.ipyActWishingWellLen
def GetActWishingWellByIndex(self, index): return self.ipyActWishingWellCache[index]
+ def GetActTotalRechargeCount(self): return self.ipyActTotalRechargeLen
+ def GetActTotalRechargeByIndex(self, index): return self.ipyActTotalRechargeCache[index]
IPYData = IPY_DataMgr()
def IPY_Data(): return IPYData
--
Gitblit v1.8.0