From b4ba68e227370e3dc9dfca06ce5b9c8225bf4faa Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 00:13:49 +0800
Subject: [PATCH] 4997 【后端】【1.3】冰晶矿脉AI--技能指定NPCID使用

---
 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py |  112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 70654d8..c6a03fb 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -128,6 +128,15 @@
                         ("DWORD", "MapID", 0),
                         ),
 
+                "FBHelpBattle":(
+                        ("DWORD", "DataMapID", 1),
+                        ("BYTE", "LineID", 1),
+                        ("DWORD", "FightPowerMin", 0),
+                        ("DWORD", "FightPowerMax", 0),
+                        ("WORD", "LVLimit", 0),
+                        ("list", "DayFreeHelpCount", 0),
+                        ),
+
                 "ChinMap":(
                         ("DWORD", "MapID", 1),
                         ("char", "MapName", 0),
@@ -182,6 +191,7 @@
                 "ActSpringSale":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
@@ -198,6 +208,7 @@
                 "ActFlashGiftbag":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
@@ -214,6 +225,7 @@
                 "ActExpRate":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
@@ -229,6 +241,7 @@
                 "ActCostRebate":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
@@ -241,6 +254,7 @@
                 "ActBossReborn":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
@@ -254,6 +268,7 @@
                 "ActFairyCeremony":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
@@ -272,6 +287,7 @@
                 "ActRealmPoint":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
@@ -280,11 +296,13 @@
                         ("dict", "NotifyInfoEnd", 0),
                         ("WORD", "Multiple", 0),
                         ("WORD", "LVLimit", 0),
+                        ("DWORD", "PointLimit", 0),
                         ),
 
                 "ActFlashSale":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
@@ -309,6 +327,7 @@
                 "ActWishingWell":(
                         ("DWORD", "CfgID", 1),
                         ("char", "ActMark", 0),
+                        ("list", "PlatformList", 0),
                         ("list", "ServerIDList", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
@@ -318,6 +337,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),
                         ),
                 }
 
@@ -524,6 +556,25 @@
     def GetLineID(self): return self.LineID # 功能线路ID
     def GetMapID(self): return self.MapID # 场景地图ID
 
+# 副本助战表
+class IPY_FBHelpBattle():
+    
+    def __init__(self):
+        self.DataMapID = 0
+        self.LineID = 0
+        self.FightPowerMin = 0
+        self.FightPowerMax = 0
+        self.LVLimit = 0
+        self.DayFreeHelpCount = []
+        return
+        
+    def GetDataMapID(self): return self.DataMapID # 数据地图ID
+    def GetLineID(self): return self.LineID # 功能线路ID
+    def GetFightPowerMin(self): return self.FightPowerMin # 助战最低战力,也是副本战力
+    def GetFightPowerMax(self): return self.FightPowerMax # 助战最高战力,0为不限制
+    def GetLVLimit(self): return self.LVLimit # 助战等级限制, 0为不限制
+    def GetDayFreeHelpCount(self): return self.DayFreeHelpCount # 每日免费助战次数,[每日免费助战次数, 是否所有层通用]
+
 # 地图表
 class IPY_ChinMap():
     
@@ -639,6 +690,7 @@
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
+        self.PlatformList = []
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
@@ -654,6 +706,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 +725,7 @@
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
+        self.PlatformList = []
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
@@ -687,6 +741,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 +760,7 @@
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
+        self.PlatformList = []
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
@@ -719,6 +775,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 +793,7 @@
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
+        self.PlatformList = []
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
@@ -747,6 +805,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 +820,7 @@
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
+        self.PlatformList = []
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
@@ -773,6 +833,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 +849,7 @@
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
+        self.PlatformList = []
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
@@ -799,10 +861,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 +889,7 @@
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
+        self.PlatformList = []
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
@@ -833,11 +897,13 @@
         self.NotifyInfoStart = {}
         self.NotifyInfoEnd = {}
         self.Multiple = 0
-        self.LVLimit = 0
+        self.LVLimit = 0
+        self.PointLimit = 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 # 结束日期
@@ -845,7 +911,8 @@
     def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
     def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
     def GetMultiple(self): return self.Multiple # 倍数
-    def GetLVLimit(self): return self.LVLimit # 限制等级
+    def GetLVLimit(self): return self.LVLimit # 限制等级
+    def GetPointLimit(self): return self.PointLimit # 限制额外修行点
 
 # 限时抢购表
 class IPY_ActFlashSale():
@@ -853,6 +920,7 @@
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
+        self.PlatformList = []
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
@@ -869,6 +937,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 +972,7 @@
     def __init__(self):
         self.CfgID = 0
         self.ActMark = ""
+        self.PlatformList = []
         self.ServerIDList = []
         self.StartDate = ""
         self.EndDate = ""
@@ -916,6 +986,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 +996,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):
@@ -970,6 +1068,8 @@
         self.ipyFBStateTimeCustomLen = len(self.ipyFBStateTimeCustomCache)
         self.ipyFBLineCache = self.__LoadFileData("FBLine", IPY_FBLine)
         self.ipyFBLineLen = len(self.ipyFBLineCache)
+        self.ipyFBHelpBattleCache = self.__LoadFileData("FBHelpBattle", IPY_FBHelpBattle)
+        self.ipyFBHelpBattleLen = len(self.ipyFBHelpBattleCache)
         self.ipyChinMapCache = self.__LoadFileData("ChinMap", IPY_ChinMap)
         self.ipyChinMapLen = len(self.ipyChinMapCache)
         self.ipyBOSSInfoCache = self.__LoadFileData("BOSSInfo", IPY_BOSSInfo)
@@ -1006,6 +1106,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
@@ -1192,6 +1294,8 @@
     def GetFBStateTimeCustomByIndex(self, index): return self.ipyFBStateTimeCustomCache[index]
     def GetFBLineCount(self): return self.ipyFBLineLen
     def GetFBLineByIndex(self, index): return self.ipyFBLineCache[index]
+    def GetFBHelpBattleCount(self): return self.ipyFBHelpBattleLen
+    def GetFBHelpBattleByIndex(self, index): return self.ipyFBHelpBattleCache[index]
     def GetChinMapCount(self): return self.ipyChinMapLen
     def GetChinMapByIndex(self, index): return self.ipyChinMapCache[index]
     def GetBOSSInfoCount(self): return self.ipyBOSSInfoLen
@@ -1228,6 +1332,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