From 2351fff64ddfe5171c2fd8a10dd0fdcc781ef7f0 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 08 十二月 2018 17:07:40 +0800
Subject: [PATCH] 4581 上古战场报错修复
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 447 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 422 insertions(+), 25 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 5e1a31c..1f76954 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -80,11 +80,14 @@
("DWORD", "LimitMagicWeapon", 0),
("WORD", "LimiRealmLV", 0),
("DWORD", "LimitMissionID", 0),
+ ("BYTE", "LimitVIPLV", 0),
),
"ItemCompound":(
("WORD", "ID", 1),
+ ("BYTE", "ComposeGroup", 0),
("list", "MakeID", 0),
+ ("BYTE", "IsFirstSuccMakeJobItem", 0),
("list", "UnfixedItemID", 0),
("BYTE", "UnfixedItemCount", 0),
("list", "FixedItemID", 0),
@@ -92,6 +95,7 @@
("DWORD", "NeedMoney", 0),
("WORD", "SuccessRate", 0),
("WORD", "SuccessRateMax", 0),
+ ("list", "SuccessRateIncrease", 0),
("BYTE", "AddonsCountMax", 0),
("char", "SysMark", 0),
("BYTE", "SysMarkParamType", 0),
@@ -133,6 +137,7 @@
("list", "HelpBattleSkills", 0),
("DWORD", "FightPowerEx", 0),
("list", "EquipPlaceColorList", 0),
+ ("list", "HelpBattleNotify", 0),
),
"DogzEquipPlus":(
@@ -146,6 +151,7 @@
"Rune":(
("DWORD", "ID", 1),
("list", "AttrType", 0),
+ ("DWORD", "TowerID", 0),
),
"EquipWash":(
@@ -183,6 +189,7 @@
("BYTE", "FuncID", 0),
("WORD", "MaxUseCnt", 0),
("WORD", "RecycleMoney", 0),
+ ("DWORD", "FightPowerEx", 0),
),
"PetInfo":(
@@ -274,6 +281,7 @@
("DWORD", "RePotionCD", 0),
("DWORD", "AttackEff", 0),
("DWORD", "ReFightPower", 0),
+ ("DWORD", "IceLodeFightPower", 0),
),
"GMAttr":(
@@ -374,6 +382,9 @@
("DWORD", "CftFaintDefRate", 0),
("DWORD", "CftAtkSpeed", 0),
("DWORD", "CftLuckyHit", 0),
+ ("DWORD", "CftSpeedPer", 0),
+ ("DWORD", "CftAtkPer", 0),
+ ("DWORD", "CftMaxHPPer", 0),
),
"NPCDropItem":(
@@ -428,7 +439,9 @@
("DWORD", "ExtraTimesMWPriID", 0),
("BYTE", "GuardPick", 0),
("WORD", "OfflineTime", 0),
+ ("WORD", "FBPoint", 0),
("WORD", "HelpPoint", 0),
+ ("BYTE", "DayHelpCountMax", 0),
),
"FBLine":(
@@ -449,6 +462,17 @@
("eval", "RefreshNPC", 0),
("eval", "GradeInfo", 0),
("eval", "RewardInfo", 0),
+ ),
+
+ "FBHelpBattle":(
+ ("DWORD", "DataMapID", 1),
+ ("BYTE", "LineID", 1),
+ ("DWORD", "FightPowerMin", 0),
+ ("DWORD", "RobotFightPower", 0),
+ ("WORD", "RobotLV", 0),
+ ("DWORD", "RobotBaseHurt", 0),
+ ("WORD", "RobotHPCoefficient", 0),
+ ("dict", "RobotSkillsDict", 0),
),
"NPCCustomRefresh":(
@@ -537,6 +561,7 @@
("DWORD", "ActiveMWID", 0),
("list", "ItemAward", 0),
("DWORD", "ActiveSoulID", 0),
+ ("DWORD", "PowerEx", 0),
),
"TreasurePrivilege":(
@@ -627,11 +652,13 @@
("list", "LimitVIPLV", 0),
("DWORD", "LimitLV", 0),
("list", "LimitCnt", 0),
+ ("DWORD", "ServerLimitCnt", 0),
("BYTE", "MoneyType", 0),
("DWORD", "MoneyNum", 0),
("DWORD", "MoneyOriginal", 0),
("DWORD", "LimitValue", 0),
("char", "NotifyMark", 0),
+ ("char", "MailKey", 0),
),
"ActSpringSale":(
@@ -859,6 +886,7 @@
("WORD", "GainGoldPrize", 0),
("WORD", "FirstGoldPrize", 0),
("list", "GainItemList", 0),
+ ("char", "NotifyMark", 0),
),
"LVAward":(
@@ -977,6 +1005,7 @@
("DWORD", "CfgID", 1),
("WORD", "Multiple", 0),
("WORD", "LVLimit", 0),
+ ("DWORD", "PointLimit", 0),
),
"TrialExchange":(
@@ -1013,6 +1042,91 @@
("DWORD", "SkillID", 1),
("BYTE", "TalentType", 0),
("BYTE", "Series", 0),
+ ),
+
+ "ActFlashSale":(
+ ("DWORD", "CfgID", 1),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("list", "StartTimeList", 0),
+ ("list", "EndTimeList", 0),
+ ("WORD", "AdvanceMinutes", 0),
+ ("WORD", "LVLimit", 0),
+ ("BYTE", "IsDayReset", 0),
+ ("list", "ShopTypeList", 0),
+ ("char", "MailKey", 0),
+ ("list", "MailItemPrize", 0),
+ ),
+
+ "ActWishingWell":(
+ ("DWORD", "CfgID", 1),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("BYTE", "IsDayReset", 0),
+ ("BYTE", "ResetType", 0),
+ ("WORD", "LVLimit", 0),
+ ("BYTE", "TemplateID", 0),
+ ),
+
+ "WishingWell":(
+ ("BYTE", "TemplateID", 1),
+ ("BYTE", "IsFree", 0),
+ ("list", "WorldLVLimit", 0),
+ ("DWORD", "ItemID", 0),
+ ("WORD", "ItemCnt", 0),
+ ("BYTE", "IsBind", 0),
+ ("DWORD", "Weight", 0),
+ ("DWORD", "Mark", 0),
+ ("BYTE", "Rare", 0),
+ ),
+
+ "FunctionForecast":(
+ ("DWORD", "FuncID", 1),
+ ("dict", "Award", 0),
+ ),
+
+ "ChatBubbleBox":(
+ ("BYTE", "BoxID", 1),
+ ("WORD", "NeedLV", 0),
+ ("BYTE", "NeedVIPLVGift", 0),
+ ),
+
+ "ActTotalRecharge":(
+ ("DWORD", "CfgID", 1),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("WORD", "LVLimit", 0),
+ ("BYTE", "IsDayReset", 0),
+ ("list", "TemplateIDList", 0),
+ ),
+
+ "TotalRechargeTemplate":(
+ ("DWORD", "TemplateID", 1),
+ ("DWORD", "NeedGold", 0),
+ ("BYTE", "AwardIndex", 0),
+ ("dict", "AwardItem", 0),
+ ("char", "NotifyKey", 0),
+ ),
+
+ "MagicWeaponFB":(
+ ("DWORD", "MWID", 1),
+ ("BYTE", "LineID", 0),
+ ("BYTE", "Level", 1),
+ ("list", "RefreshNPC", 0),
+ ("dict", "AttrDict", 0),
+ ),
+
+ "IceLodeStarAward":(
+ ("BYTE", "Index", 1),
+ ("BYTE", "Star", 0),
+ ("list", "LVLimit", 0),
+ ("list", "ItemList", 0),
+ ),
+
+ "GodWeaponEffect":(
+ ("BYTE", "GWType", 0),
+ ("WORD", "Level", 0),
+ ("char", "NotifyCode", 0),
),
}
@@ -1113,21 +1227,25 @@
self.LimitLV = 0
self.LimitMagicWeapon = 0
self.LimiRealmLV = 0
- self.LimitMissionID = 0
+ self.LimitMissionID = 0
+ self.LimitVIPLV = 0
return
def GetFuncId(self): return self.FuncId # 功能标识
def GetLimitLV(self): return self.LimitLV # 开启等级
def GetLimitMagicWeapon(self): return self.LimitMagicWeapon # 需要解锁法宝ID
def GetLimiRealmLV(self): return self.LimiRealmLV # 需要境界等级
- def GetLimitMissionID(self): return self.LimitMissionID # 需要完成的任务ID
+ def GetLimitMissionID(self): return self.LimitMissionID # 需要完成的任务ID
+ def GetLimitVIPLV(self): return self.LimitVIPLV # 需要VIP等级
# 合成表
class IPY_ItemCompound():
def __init__(self):
self.ID = 0
+ self.ComposeGroup = 0
self.MakeID = []
+ self.IsFirstSuccMakeJobItem = 0
self.UnfixedItemID = []
self.UnfixedItemCount = 0
self.FixedItemID = []
@@ -1135,13 +1253,16 @@
self.NeedMoney = 0
self.SuccessRate = 0
self.SuccessRateMax = 0
+ self.SuccessRateIncrease = []
self.AddonsCountMax = 0
self.SysMark = ""
self.SysMarkParamType = 0
return
def GetID(self): return self.ID # 合成配置编号ID
+ def GetComposeGroup(self): return self.ComposeGroup # 合成归组类型
def GetMakeID(self): return self.MakeID # 可合成的道具ID，多个则随机一个
+ def GetIsFirstSuccMakeJobItem(self): return self.IsFirstSuccMakeJobItem # 首次成功是否必出本职业
def GetUnfixedItemID(self): return self.UnfixedItemID # 不固定道具ID, 多个ID时则任意一种均可
def GetUnfixedItemCount(self): return self.UnfixedItemCount # 不固定道具消耗数量
def GetFixedItemID(self): return self.FixedItemID # 消耗固定道具ID, 多个ID时代表每个ID均需消耗
@@ -1149,6 +1270,7 @@
def GetNeedMoney(self): return self.NeedMoney # 消耗铜钱
def GetSuccessRate(self): return self.SuccessRate # 成功率万分率
def GetSuccessRateMax(self): return self.SuccessRateMax # 最大成功率万分率
+ def GetSuccessRateIncrease(self): return self.SuccessRateIncrease # 提高成功率道具, 道具ID|个数|提高的概率
def GetAddonsCountMax(self): return self.AddonsCountMax # 最大可附加材料数, 增加概率用, 非必须, 0代表不可附加材料
def GetSysMark(self): return self.SysMark # 提示mark
def GetSysMarkParamType(self): return self.SysMarkParamType # 系统提示参数组合类型
@@ -1224,7 +1346,8 @@
self.BaseAttrValues = []
self.HelpBattleSkills = []
self.FightPowerEx = 0
- self.EquipPlaceColorList = []
+ self.EquipPlaceColorList = []
+ self.HelpBattleNotify = []
return
def GetDogzID(self): return self.DogzID # 神兽ID
@@ -1232,7 +1355,8 @@
def GetBaseAttrValues(self): return self.BaseAttrValues # 基础属性值列表
def GetHelpBattleSkills(self): return self.HelpBattleSkills # 助战技能ID列表
def GetFightPowerEx(self): return self.FightPowerEx # 助战附加战力
- def GetEquipPlaceColorList(self): return self.EquipPlaceColorList # 穿戴装备颜色限制
+ def GetEquipPlaceColorList(self): return self.EquipPlaceColorList # 穿戴装备颜色限制
+ def GetHelpBattleNotify(self): return self.HelpBattleNotify # 助战广播 ["广播key",[参数1,参数2,...],广播CD分钟]
# 神兽强化表
class IPY_DogzEquipPlus():
@@ -1256,11 +1380,13 @@
def __init__(self):
self.ID = 0
- self.AttrType = []
+ self.AttrType = []
+ self.TowerID = 0
return
def GetID(self): return self.ID # 编号ID
- def GetAttrType(self): return self.AttrType # 全身强化激活属性类型
+ def GetAttrType(self): return self.AttrType # 属性类型
+ def GetTowerID(self): return self.TowerID # 解锁符印塔编号
# 洗练表
class IPY_EquipWash():
@@ -1331,13 +1457,15 @@
self.ID = 0
self.FuncID = 0
self.MaxUseCnt = 0
- self.RecycleMoney = 0
+ self.RecycleMoney = 0
+ self.FightPowerEx = 0
return
def GetID(self): return self.ID # 物品ID
def GetFuncID(self): return self.FuncID # 所属功能ID
def GetMaxUseCnt(self): return self.MaxUseCnt # 最大可使用数量
- def GetRecycleMoney(self): return self.RecycleMoney # 回收货币值
+ def GetRecycleMoney(self): return self.RecycleMoney # 回收货币值
+ def GetFightPowerEx(self): return self.FightPowerEx # 附加战斗力
# 灵兽表
class IPY_PetInfo():
@@ -1495,7 +1623,8 @@
self.RePotionReply = 0
self.RePotionCD = 0
self.AttackEff = 0
- self.ReFightPower = 0
+ self.ReFightPower = 0
+ self.IceLodeFightPower = 0
return
def GetLV(self): return self.LV # 玩家等级
@@ -1526,7 +1655,8 @@
def GetRePotionReply(self): return self.RePotionReply # 血瓶恢复量
def GetRePotionCD(self): return self.RePotionCD # 血瓶CD
def GetAttackEff(self): return self.AttackEff # 挂机效率
- def GetReFightPower(self): return self.ReFightPower # 战斗力
+ def GetReFightPower(self): return self.ReFightPower # 战斗力
+ def GetIceLodeFightPower(self): return self.IceLodeFightPower # 冰晶矿脉扫荡战斗力
# GM测试属性表
class IPY_GMAttr():
@@ -1712,7 +1842,10 @@
self.CftIgnoreDefRateReduce = 0
self.CftFaintDefRate = 0
self.CftAtkSpeed = 0
- self.CftLuckyHit = 0
+ self.CftLuckyHit = 0
+ self.CftSpeedPer = 0
+ self.CftAtkPer = 0
+ self.CftMaxHPPer = 0
return
def GetLV(self): return self.LV # 等级
@@ -1734,7 +1867,10 @@
def GetCftIgnoreDefRateReduce(self): return self.CftIgnoreDefRateReduce # 无视防御抗性系数
def GetCftFaintDefRate(self): return self.CftFaintDefRate # 控制抵抗系数
def GetCftAtkSpeed(self): return self.CftAtkSpeed # 攻速系数
- def GetCftLuckyHit(self): return self.CftLuckyHit # 会心一击系数
+ def GetCftLuckyHit(self): return self.CftLuckyHit # 会心一击系数
+ def GetCftSpeedPer(self): return self.CftSpeedPer # 移动速度百分比系数
+ def GetCftAtkPer(self): return self.CftAtkPer # 攻击百分比系数
+ def GetCftMaxHPPer(self): return self.CftMaxHPPer # 生命百分比系数
# NPC掉落表
class IPY_NPCDropItem():
@@ -1833,7 +1969,9 @@
self.ExtraTimesMWPriID = 0
self.GuardPick = 0
self.OfflineTime = 0
- self.HelpPoint = 0
+ self.FBPoint = 0
+ self.HelpPoint = 0
+ self.DayHelpCountMax = 0
return
def GetDataMapID(self): return self.DataMapID # 数据地图ID
@@ -1847,7 +1985,9 @@
def GetExtraTimesMWPriID(self): return self.ExtraTimesMWPriID # 额外次数法宝权限ID
def GetGuardPick(self): return self.GuardPick # 该地图守护是否能拾取
def GetOfflineTime(self): return self.OfflineTime # 离线多久退出副本(秒)
- def GetHelpPoint(self): return self.HelpPoint # 助战积分(0代表不可助战)
+ def GetFBPoint(self): return self.FBPoint # 副本过关仙缘币
+ def GetHelpPoint(self): return self.HelpPoint # 助战仙缘币(0代表不可助战)
+ def GetDayHelpCountMax(self): return self.DayHelpCountMax # 每日手动助战获得仙缘币次数（非镜像）
# 副本功能线路表
class IPY_FBLine():
@@ -1889,6 +2029,29 @@
def GetRefreshNPC(self): return self.RefreshNPC # 标试点刷怪配置
def GetGradeInfo(self): return self.GradeInfo # 评级规则
def GetRewardInfo(self): return self.RewardInfo # 奖励信息
+
+# 副本助战表
+class IPY_FBHelpBattle():
+
+ def __init__(self):
+ self.DataMapID = 0
+ self.LineID = 0
+ self.FightPowerMin = 0
+ self.RobotFightPower = 0
+ self.RobotLV = 0
+ self.RobotBaseHurt = 0
+ self.RobotHPCoefficient = 0
+ self.RobotSkillsDict = {}
+ return
+
+ def GetDataMapID(self): return self.DataMapID # 数据地图ID
+ def GetLineID(self): return self.LineID # 功能线路ID
+ def GetFightPowerMin(self): return self.FightPowerMin # 助战最低战力，也是副本保底战力
+ def GetRobotFightPower(self): return self.RobotFightPower # 助战NPC战力
+ def GetRobotLV(self): return self.RobotLV # 助战NPC等级
+ def GetRobotBaseHurt(self): return self.RobotBaseHurt # 助战NPC保底伤害
+ def GetRobotHPCoefficient(self): return self.RobotHPCoefficient # 助战NPC生命系数
+ def GetRobotSkillsDict(self): return self.RobotSkillsDict # 助战NPC技能, {"职业":[技能列表], ...}
# 副本刷怪标识点表
class IPY_NPCCustomRefresh():
@@ -2060,7 +2223,8 @@
self.UnLockSkill = []
self.ActiveMWID = 0
self.ItemAward = []
- self.ActiveSoulID = 0
+ self.ActiveSoulID = 0
+ self.PowerEx = 0
return
def GetMWID(self): return self.MWID # 法宝ID
@@ -2070,7 +2234,8 @@
def GetUnLockSkill(self): return self.UnLockSkill # 解锁的技能
def GetActiveMWID(self): return self.ActiveMWID # 激活法宝ID
def GetItemAward(self): return self.ItemAward # 物品奖励[itemID,cnt,isbind]
- def GetActiveSoulID(self): return self.ActiveSoulID # 激活魂ID
+ def GetActiveSoulID(self): return self.ActiveSoulID # 激活魂ID
+ def GetPowerEx(self): return self.PowerEx # 额外固定战力
# 法宝特权表
class IPY_TreasurePrivilege():
@@ -2244,11 +2409,13 @@
self.LimitVIPLV = []
self.LimitLV = 0
self.LimitCnt = []
+ self.ServerLimitCnt = 0
self.MoneyType = 0
self.MoneyNum = 0
self.MoneyOriginal = 0
self.LimitValue = 0
- self.NotifyMark = ""
+ self.NotifyMark = ""
+ self.MailKey = ""
return
def GetID(self): return self.ID # ID
@@ -2263,12 +2430,14 @@
def GetRefreshType(self): return self.RefreshType # 刷新类型 0-不重置,1-onWeek0点,2-onWeek5点,3-OnDay0点,4-OnDay5点
def GetLimitVIPLV(self): return self.LimitVIPLV # VIP限制
def GetLimitLV(self): return self.LimitLV # 等级限制
- def GetLimitCnt(self): return self.LimitCnt # 限制数量
+ def GetLimitCnt(self): return self.LimitCnt # 个人限制数量
+ def GetServerLimitCnt(self): return self.ServerLimitCnt # 全服限制数量
def GetMoneyType(self): return self.MoneyType # 金钱类型
def GetMoneyNum(self): return self.MoneyNum # 金钱数量
def GetMoneyOriginal(self): return self.MoneyOriginal # 原价
def GetLimitValue(self): return self.LimitValue # 限制条件
- def GetNotifyMark(self): return self.NotifyMark # 广播提示
+ def GetNotifyMark(self): return self.NotifyMark # 广播提示
+ def GetMailKey(self): return self.MailKey # 背包不足时邮件KEY
# 限时特惠表
class IPY_ActSpringSale():
@@ -2741,7 +2910,8 @@
self.GainGold = 0
self.GainGoldPrize = 0
self.FirstGoldPrize = 0
- self.GainItemList = []
+ self.GainItemList = []
+ self.NotifyMark = ""
return
def GetRecordID(self): return self.RecordID # 记录ID
@@ -2749,7 +2919,8 @@
def GetGainGold(self): return self.GainGold # 获得仙玉数
def GetGainGoldPrize(self): return self.GainGoldPrize # 赠送仙玉数
def GetFirstGoldPrize(self): return self.FirstGoldPrize # 首次充值该档位赠送仙玉
- def GetGainItemList(self): return self.GainItemList # 获得物品列表[[物品ID,个数,是否绑定], ...]
+ def GetGainItemList(self): return self.GainItemList # 获得物品列表[[物品ID,个数,是否绑定], ...]
+ def GetNotifyMark(self): return self.NotifyMark # 广播提示
# 等级奖励表
class IPY_LVAward():
@@ -2993,12 +3164,14 @@
def __init__(self):
self.CfgID = 0
self.Multiple = 0
- self.LVLimit = 0
+ self.LVLimit = 0
+ self.PointLimit = 0
return
def GetCfgID(self): return self.CfgID # 配置ID
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_TrialExchange():
@@ -3076,6 +3249,186 @@
def GetSkillID(self): return self.SkillID # 技能ID
def GetTalentType(self): return self.TalentType # 天赋类型
def GetSeries(self): return self.Series # 天赋系别
+
+# 限时抢购表
+class IPY_ActFlashSale():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.StartDate = ""
+ self.EndDate = ""
+ self.StartTimeList = []
+ self.EndTimeList = []
+ self.AdvanceMinutes = 0
+ self.LVLimit = 0
+ self.IsDayReset = 0
+ self.ShopTypeList = []
+ self.MailKey = ""
+ self.MailItemPrize = []
+ return
+
+ def GetCfgID(self): return self.CfgID # 配置ID
+ def GetStartDate(self): return self.StartDate # 开启日期
+ def GetEndDate(self): return self.EndDate # 结束日期
+ def GetStartTimeList(self): return self.StartTimeList # 开启时间列表, 支持多个时段
+ def GetEndTimeList(self): return self.EndTimeList # 结束时间列表, 支持多个时段
+ def GetAdvanceMinutes(self): return self.AdvanceMinutes # 前端提前X分钟展示活动
+ def GetLVLimit(self): return self.LVLimit # 限制等级
+ def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+ def GetShopTypeList(self): return self.ShopTypeList # 商店类型列表
+ def GetMailKey(self): return self.MailKey # 活动更新时发送邮件key
+ def GetMailItemPrize(self): return self.MailItemPrize # 活动更新时发送邮件奖励物品
+
+# 许愿池活动时间表
+class IPY_ActWishingWell():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.StartDate = ""
+ self.EndDate = ""
+ self.IsDayReset = 0
+ self.ResetType = 0
+ self.LVLimit = 0
+ self.TemplateID = 0
+ return
+
+ def GetCfgID(self): return self.CfgID # 配置ID
+ def GetStartDate(self): return self.StartDate # 开启日期
+ def GetEndDate(self): return self.EndDate # 结束日期
+ def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+ def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
+ def GetLVLimit(self): return self.LVLimit # 限制等级
+ def GetTemplateID(self): return self.TemplateID # 模板编号
+
+# 许愿池库模板表
+class IPY_WishingWell():
+
+ def __init__(self):
+ self.TemplateID = 0
+ self.IsFree = 0
+ self.WorldLVLimit = []
+ self.ItemID = 0
+ self.ItemCnt = 0
+ self.IsBind = 0
+ self.Weight = 0
+ self.Mark = 0
+ self.Rare = 0
+ return
+
+ def GetTemplateID(self): return self.TemplateID # 模板ID
+ def GetIsFree(self): return self.IsFree # 是否免费库
+ def GetWorldLVLimit(self): return self.WorldLVLimit # 世界等级范围
+ def GetItemID(self): return self.ItemID # 物品ID
+ def GetItemCnt(self): return self.ItemCnt # 物品数量
+ def GetIsBind(self): return self.IsBind # 是否绑定
+ def GetWeight(self): return self.Weight # 权重
+ def GetMark(self): return self.Mark # 排序用标识
+ def GetRare(self): return self.Rare # 珍稀值
+
+# 功能预告表
+class IPY_FunctionForecast():
+
+ def __init__(self):
+ self.FuncID = 0
+ self.Award = {}
+ return
+
+ def GetFuncID(self): return self.FuncID # 功能ID
+ def GetAward(self): return self.Award # 属性类型
+
+# 聊天气泡表
+class IPY_ChatBubbleBox():
+
+ def __init__(self):
+ self.BoxID = 0
+ self.NeedLV = 0
+ self.NeedVIPLVGift = 0
+ return
+
+ def GetBoxID(self): return self.BoxID # 气泡框ID
+ def GetNeedLV(self): return self.NeedLV # 所需等级
+ def GetNeedVIPLVGift(self): return self.NeedVIPLVGift # 所需购买VIP等级礼包
+
+# 累计充值活动表
+class IPY_ActTotalRecharge():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.StartDate = ""
+ self.EndDate = ""
+ self.LVLimit = 0
+ self.IsDayReset = 0
+ self.TemplateIDList = []
+ return
+
+ def GetCfgID(self): return self.CfgID # 配置ID
+ def GetStartDate(self): return self.StartDate # 开启日期
+ def GetEndDate(self): return self.EndDate # 结束日期
+ def GetLVLimit(self): return self.LVLimit # 限制等级
+ def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+ def GetTemplateIDList(self): return self.TemplateIDList # 模板ID列表
+
+# 累计充值模板表
+class IPY_TotalRechargeTemplate():
+
+ def __init__(self):
+ self.TemplateID = 0
+ self.NeedGold = 0
+ self.AwardIndex = 0
+ self.AwardItem = {}
+ self.NotifyKey = ""
+ return
+
+ def GetTemplateID(self): return self.TemplateID # 模板ID
+ def GetNeedGold(self): return self.NeedGold # 需要充值仙玉数
+ def GetAwardIndex(self): return self.AwardIndex # 返利奖励索引0~31,同个模板中不重复
+ def GetAwardItem(self): return self.AwardItem # 返利物品信息列表 {职业:[(物品ID,个数,是否绑定),...]}
+ def GetNotifyKey(self): return self.NotifyKey # 全服广播key，默认两个参数(玩家名, 档位额度)
+
+# 法宝副本表
+class IPY_MagicWeaponFB():
+
+ def __init__(self):
+ self.MWID = 0
+ self.LineID = 0
+ self.Level = 0
+ self.RefreshNPC = []
+ self.AttrDict = {}
+ return
+
+ def GetMWID(self): return self.MWID # 法宝ID
+ def GetLineID(self): return self.LineID # 副本功能线路ID
+ def GetLevel(self): return self.Level # 关卡
+ def GetRefreshNPC(self): return self.RefreshNPC # 刷怪配置
+ def GetAttrDict(self): return self.AttrDict # 属性
+
+# 冰晶矿脉星级奖励表
+class IPY_IceLodeStarAward():
+
+ def __init__(self):
+ self.Index = 0
+ self.Star = 0
+ self.LVLimit = []
+ self.ItemList = []
+ return
+
+ def GetIndex(self): return self.Index # 奖励索引
+ def GetStar(self): return self.Star # 星数
+ def GetLVLimit(self): return self.LVLimit # 等级范围
+ def GetItemList(self): return self.ItemList # 奖励
+
+# 神兵特效表
+class IPY_GodWeaponEffect():
+
+ def __init__(self):
+ self.GWType = 0
+ self.Level = 0
+ self.NotifyCode = ""
+ return
+
+ def GetGWType(self): return self.GWType # 神兵类型
+ def GetLevel(self): return self.Level # 神兵等级
+ def GetNotifyCode(self): return self.NotifyCode # 广播
def Log(msg, playerID=0, par=0):
@@ -3171,6 +3524,8 @@
self.ipyFBFuncLen = len(self.ipyFBFuncCache)
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.ipyNPCCustomRefreshCache = self.__LoadFileData("NPCCustomRefresh", IPY_NPCCustomRefresh)
self.ipyNPCCustomRefreshLen = len(self.ipyNPCCustomRefreshCache)
self.ipyDailyActionCache = self.__LoadFileData("DailyAction", IPY_DailyAction)
@@ -3289,6 +3644,26 @@
self.ipyMapEventPointLen = len(self.ipyMapEventPointCache)
self.ipyTalentSkillCache = self.__LoadFileData("TalentSkill", IPY_TalentSkill)
self.ipyTalentSkillLen = len(self.ipyTalentSkillCache)
+ self.ipyActFlashSaleCache = self.__LoadFileData("ActFlashSale", IPY_ActFlashSale)
+ self.ipyActFlashSaleLen = len(self.ipyActFlashSaleCache)
+ self.ipyActWishingWellCache = self.__LoadFileData("ActWishingWell", IPY_ActWishingWell)
+ self.ipyActWishingWellLen = len(self.ipyActWishingWellCache)
+ self.ipyWishingWellCache = self.__LoadFileData("WishingWell", IPY_WishingWell)
+ self.ipyWishingWellLen = len(self.ipyWishingWellCache)
+ self.ipyFunctionForecastCache = self.__LoadFileData("FunctionForecast", IPY_FunctionForecast)
+ self.ipyFunctionForecastLen = len(self.ipyFunctionForecastCache)
+ self.ipyChatBubbleBoxCache = self.__LoadFileData("ChatBubbleBox", IPY_ChatBubbleBox)
+ self.ipyChatBubbleBoxLen = len(self.ipyChatBubbleBoxCache)
+ self.ipyActTotalRechargeCache = self.__LoadFileData("ActTotalRecharge", IPY_ActTotalRecharge)
+ self.ipyActTotalRechargeLen = len(self.ipyActTotalRechargeCache)
+ self.ipyTotalRechargeTemplateCache = self.__LoadFileData("TotalRechargeTemplate", IPY_TotalRechargeTemplate)
+ self.ipyTotalRechargeTemplateLen = len(self.ipyTotalRechargeTemplateCache)
+ self.ipyMagicWeaponFBCache = self.__LoadFileData("MagicWeaponFB", IPY_MagicWeaponFB)
+ self.ipyMagicWeaponFBLen = len(self.ipyMagicWeaponFBCache)
+ self.ipyIceLodeStarAwardCache = self.__LoadFileData("IceLodeStarAward", IPY_IceLodeStarAward)
+ self.ipyIceLodeStarAwardLen = len(self.ipyIceLodeStarAwardCache)
+ self.ipyGodWeaponEffectCache = self.__LoadFileData("GodWeaponEffect", IPY_GodWeaponEffect)
+ self.ipyGodWeaponEffectLen = len(self.ipyGodWeaponEffectCache)
Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
Log("IPY_DataMgr InitOK!")
return
@@ -3525,6 +3900,8 @@
def GetFBFuncByIndex(self, index): return self.ipyFBFuncCache[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 GetNPCCustomRefreshCount(self): return self.ipyNPCCustomRefreshLen
def GetNPCCustomRefreshByIndex(self, index): return self.ipyNPCCustomRefreshCache[index]
def GetDailyActionCount(self): return self.ipyDailyActionLen
@@ -3643,6 +4020,26 @@
def GetMapEventPointByIndex(self, index): return self.ipyMapEventPointCache[index]
def GetTalentSkillCount(self): return self.ipyTalentSkillLen
def GetTalentSkillByIndex(self, index): return self.ipyTalentSkillCache[index]
+ def GetActFlashSaleCount(self): return self.ipyActFlashSaleLen
+ def GetActFlashSaleByIndex(self, index): return self.ipyActFlashSaleCache[index]
+ def GetActWishingWellCount(self): return self.ipyActWishingWellLen
+ def GetActWishingWellByIndex(self, index): return self.ipyActWishingWellCache[index]
+ def GetWishingWellCount(self): return self.ipyWishingWellLen
+ def GetWishingWellByIndex(self, index): return self.ipyWishingWellCache[index]
+ def GetFunctionForecastCount(self): return self.ipyFunctionForecastLen
+ def GetFunctionForecastByIndex(self, index): return self.ipyFunctionForecastCache[index]
+ def GetChatBubbleBoxCount(self): return self.ipyChatBubbleBoxLen
+ def GetChatBubbleBoxByIndex(self, index): return self.ipyChatBubbleBoxCache[index]
+ def GetActTotalRechargeCount(self): return self.ipyActTotalRechargeLen
+ def GetActTotalRechargeByIndex(self, index): return self.ipyActTotalRechargeCache[index]
+ def GetTotalRechargeTemplateCount(self): return self.ipyTotalRechargeTemplateLen
+ def GetTotalRechargeTemplateByIndex(self, index): return self.ipyTotalRechargeTemplateCache[index]
+ def GetMagicWeaponFBCount(self): return self.ipyMagicWeaponFBLen
+ def GetMagicWeaponFBByIndex(self, index): return self.ipyMagicWeaponFBCache[index]
+ def GetIceLodeStarAwardCount(self): return self.ipyIceLodeStarAwardLen
+ def GetIceLodeStarAwardByIndex(self, index): return self.ipyIceLodeStarAwardCache[index]
+ def GetGodWeaponEffectCount(self): return self.ipyGodWeaponEffectLen
+ def GetGodWeaponEffectByIndex(self, index): return self.ipyGodWeaponEffectCache[index]
IPYData = IPY_DataMgr()
def IPY_Data(): return IPYData
@@ -3837,7 +4234,7 @@
'''查询条件下与对应查询字段参考值相近的数据实例；参考值小于配置表最小值时返回none，大于最大值时返回最大值对应的实例
@param dtName: 表名，不含tag
@param keyName: 参考字段名
- @param keyValue: 参考字段值
+ @param keyValue: 参考字段值，大于等于字段值时返回对应数据
@param conditionDict: 查询条件，{查询字段名:字段值, ...}
@return: 找不到数据返回 None ， 否则返回对应的 ipyData 数据实例
'''
@@ -3869,7 +4266,7 @@
for i in xrange(near - 1, low - 1, -1):
nearData = dataList[i]
nearValue = getattr(nearData, "%s" % keyName)
- if nearValue < keyValue:
+ if nearValue <= keyValue:
return nearData
elif keyValue > nearValue:
--
Gitblit v1.8.0