From 7d74fb08b06e9d5d5236c017e23daf3807dd4d5a Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期六, 24 十一月 2018 15:08:54 +0800 Subject: [PATCH] 4762 副本总表增加助战相关字段;VIP特权表增加助战相关特权; --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 429 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 410 insertions(+), 19 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py index 8e23e21..eadc205 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), @@ -131,7 +135,9 @@ ("list", "BaseAttrTypes", 0), ("list", "BaseAttrValues", 0), ("list", "HelpBattleSkills", 0), + ("DWORD", "FightPowerEx", 0), ("list", "EquipPlaceColorList", 0), + ("list", "HelpBattleNotify", 0), ), "DogzEquipPlus":( @@ -273,6 +279,7 @@ ("DWORD", "RePotionCD", 0), ("DWORD", "AttackEff", 0), ("DWORD", "ReFightPower", 0), + ("DWORD", "IceLodeFightPower", 0), ), "GMAttr":( @@ -290,6 +297,7 @@ ("DWORD", "NPCID", 1), ("BYTE", "IsStrengthenByPlayerCount", 0), ("BYTE", "LVStrengthenType", 0), + ("BYTE", "CmpNPCBaseLV", 0), ("DWORD", "HitTime", 0), ("DWORD", "DefCoefficient", 0), ("DWORD", "AtkCoefficient", 0), @@ -372,6 +380,9 @@ ("DWORD", "CftFaintDefRate", 0), ("DWORD", "CftAtkSpeed", 0), ("DWORD", "CftLuckyHit", 0), + ("DWORD", "CftSpeedPer", 0), + ("DWORD", "CftAtkPer", 0), + ("DWORD", "CftMaxHPPer", 0), ), "NPCDropItem":( @@ -426,7 +437,9 @@ ("DWORD", "ExtraTimesMWPriID", 0), ("BYTE", "GuardPick", 0), ("WORD", "OfflineTime", 0), + ("WORD", "FBPoint", 0), ("WORD", "HelpPoint", 0), + ("BYTE", "DayHelpCountMax", 0), ), "FBLine":( @@ -447,6 +460,14 @@ ("eval", "RefreshNPC", 0), ("eval", "GradeInfo", 0), ("eval", "RewardInfo", 0), + ), + + "FBHelpBattle":( + ("DWORD", "DataMapID", 1), + ("BYTE", "LineID", 1), + ("DWORD", "RobotFightPower", 0), + ("WORD", "RobotLV", 0), + ("dict", "RobotSkillsDict", 0), ), "NPCCustomRefresh":( @@ -497,6 +518,8 @@ ("DWORD", "SpeedPerC", 0), ("DWORD", "AtkSpeedC", 0), ("DWORD", "SkillAtkRateReduceC", 0), + ("DWORD", "HitC", 0), + ("DWORD", "MissC", 0), ), "Success":( @@ -623,11 +646,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":( @@ -793,6 +818,7 @@ ("list", "RandTimeList1", 0), ("list", "RandItemList2", 0), ("list", "RandTimeList2", 0), + ("dict", "RandItemByUseCount", 0), ("list", "JobItemList", 0), ("BYTE", "MoneyType", 0), ("DWORD", "MoneyCount", 0), @@ -972,6 +998,7 @@ ("DWORD", "CfgID", 1), ("WORD", "Multiple", 0), ("WORD", "LVLimit", 0), + ("DWORD", "PointLimit", 0), ), "TrialExchange":( @@ -1002,6 +1029,91 @@ ("WORD", "LowLV", 0), ("WORD", "HighestLV", 0), ("DWORD", "Defense", 0), + ), + + "TalentSkill":( + ("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), ), } @@ -1102,21 +1214,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 = [] @@ -1124,13 +1240,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均需消耗 @@ -1138,6 +1257,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 # 系统提示参数组合类型 @@ -1212,14 +1332,18 @@ self.BaseAttrTypes = [] self.BaseAttrValues = [] self.HelpBattleSkills = [] - self.EquipPlaceColorList = [] + self.FightPowerEx = 0 + self.EquipPlaceColorList = [] + self.HelpBattleNotify = [] return def GetDogzID(self): return self.DogzID # 神兽ID def GetBaseAttrTypes(self): return self.BaseAttrTypes # 基础属性类型列表 def GetBaseAttrValues(self): return self.BaseAttrValues # 基础属性值列表 def GetHelpBattleSkills(self): return self.HelpBattleSkills # 助战技能ID列表 - def GetEquipPlaceColorList(self): return self.EquipPlaceColorList # 穿戴装备颜色限制 + def GetFightPowerEx(self): return self.FightPowerEx # 助战附加战力 + def GetEquipPlaceColorList(self): return self.EquipPlaceColorList # 穿戴装备颜色限制 + def GetHelpBattleNotify(self): return self.HelpBattleNotify # 助战广播 ["广播key",[参数1,参数2,...],广播CD分钟] # 神兽强化表 class IPY_DogzEquipPlus(): @@ -1482,7 +1606,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 # 玩家等级 @@ -1513,7 +1638,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(): @@ -1545,6 +1671,7 @@ self.NPCID = 0 self.IsStrengthenByPlayerCount = 0 self.LVStrengthenType = 0 + self.CmpNPCBaseLV = 0 self.HitTime = 0 self.DefCoefficient = 0 self.AtkCoefficient = 0 @@ -1562,6 +1689,7 @@ def GetNPCID(self): return self.NPCID # NPCID def GetIsStrengthenByPlayerCount(self): return self.IsStrengthenByPlayerCount # 是否根据人数成长 def GetLVStrengthenType(self): return self.LVStrengthenType # 等级成长类型, 0-不按等级成长;1-按玩家平均等级;2-按玩家最大等级;3-按世界等级; + def GetCmpNPCBaseLV(self): return self.CmpNPCBaseLV # 是否比较NPC表等级, 是的话取NPC表配置等级与成长等级中较大等级 def GetHitTime(self): return self.HitTime # 受击次数 def GetDefCoefficient(self): return self.DefCoefficient # 人物防御系数 def GetAtkCoefficient(self): return self.AtkCoefficient # 人物攻击系数 @@ -1697,7 +1825,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 # 等级 @@ -1719,7 +1850,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(): @@ -1818,7 +1952,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 @@ -1832,7 +1968,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(): @@ -1874,6 +2012,23 @@ 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.RobotFightPower = 0 + self.RobotLV = 0 + self.RobotSkillsDict = {} + return + + def GetDataMapID(self): return self.DataMapID # 数据地图ID + def GetLineID(self): return self.LineID # 功能线路ID + def GetRobotFightPower(self): return self.RobotFightPower # 助战NPC战力 + def GetRobotLV(self): return self.RobotLV # 助战NPC等级 + def GetRobotSkillsDict(self): return self.RobotSkillsDict # 助战NPC技能, {"职业":[技能列表], ...} # 副本刷怪标识点表 class IPY_NPCCustomRefresh(): @@ -1948,7 +2103,9 @@ self.SkillAtkRateC = 0 self.SpeedPerC = 0 self.AtkSpeedC = 0 - self.SkillAtkRateReduceC = 0 + self.SkillAtkRateReduceC = 0 + self.HitC = 0 + self.MissC = 0 return def GetClassLV(self): return self.ClassLV # 装备阶级 @@ -1976,7 +2133,9 @@ def GetSkillAtkRateC(self): return self.SkillAtkRateC # 技能伤害百分比系数 def GetSpeedPerC(self): return self.SpeedPerC # 移动速度百分比系数 def GetAtkSpeedC(self): return self.AtkSpeedC # 攻击速度系数 - def GetSkillAtkRateReduceC(self): return self.SkillAtkRateReduceC # 技能减伤百分比系数 + def GetSkillAtkRateReduceC(self): return self.SkillAtkRateReduceC # 技能减伤百分比系数 + def GetHitC(self): return self.HitC # 命中系数 + def GetMissC(self): return self.MissC # 闪避系数 # 成就表 class IPY_Success(): @@ -2225,11 +2384,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 @@ -2244,12 +2405,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(): @@ -2589,6 +2752,7 @@ self.RandTimeList1 = [] self.RandItemList2 = [] self.RandTimeList2 = [] + self.RandItemByUseCount = {} self.JobItemList = [] self.MoneyType = 0 self.MoneyCount = 0 @@ -2603,6 +2767,7 @@ def GetRandTimeList1(self): return self.RandTimeList1 # 随机次数饼图列表1 def GetRandItemList2(self): return self.RandItemList2 # 随机物品饼图列表2 def GetRandTimeList2(self): return self.RandTimeList2 # 随机次数饼图列表2 + def GetRandItemByUseCount(self): return self.RandItemByUseCount # 宝箱开启X次对应特殊产出,与饼图列表2互斥 def GetJobItemList(self): return self.JobItemList # 职业物品列表 def GetMoneyType(self): return self.MoneyType # 货币类型 def GetMoneyCount(self): return self.MoneyCount # 货币数量 @@ -2972,12 +3137,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(): @@ -3042,6 +3209,186 @@ def GetLowLV(self): return self.LowLV # 推荐最低等级 def GetHighestLV(self): return self.HighestLV # 推荐最高等级 def GetDefense(self): return self.Defense # 推荐防御 + +# 天赋技能表 +class IPY_TalentSkill(): + + def __init__(self): + self.SkillID = 0 + self.TalentType = 0 + self.Series = 0 + return + + 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 # 奖励 def Log(msg, playerID=0, par=0): @@ -3137,6 +3484,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) @@ -3253,6 +3602,26 @@ self.ipyAllPeoplePartyAwardLen = len(self.ipyAllPeoplePartyAwardCache) self.ipyMapEventPointCache = self.__LoadFileData("MapEventPoint", IPY_MapEventPoint) 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) Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict)) Log("IPY_DataMgr InitOK!") return @@ -3489,6 +3858,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 @@ -3605,6 +3976,26 @@ def GetAllPeoplePartyAwardByIndex(self, index): return self.ipyAllPeoplePartyAwardCache[index] def GetMapEventPointCount(self): return self.ipyMapEventPointLen 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] IPYData = IPY_DataMgr() def IPY_Data(): return IPYData @@ -3799,7 +4190,7 @@ '''查询条件下与对应查询字段参考值相近的数据实例;参考值小于配置表最小值时返回none,大于最大值时返回最大值对应的实例 @param dtName: 表名,不含tag @param keyName: 参考字段名 - @param keyValue: 参考字段值 + @param keyValue: 参考字段值,大于等于字段值时返回对应数据 @param conditionDict: 查询条件,{查询字段名:字段值, ...} @return: 找不到数据返回 None , 否则返回对应的 ipyData 数据实例 ''' @@ -3831,7 +4222,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