From de41dec1a6518eea70a4ac7f36576cb709af266a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 30 三月 2019 11:54:28 +0800
Subject: [PATCH] 6382 【后端】【2.0】拍品优化调整（定位查询才提示拍品不存在）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 232 ++++++++++++++++------------------------------------------
1 files changed, 64 insertions(+), 168 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 6cf009e..6eb9f28 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -124,12 +124,6 @@
("WORD", "LevelMax", 0),
),
- "ItemPlusSumAttr":(
- ("WORD", "PlusCntNeed", 1),
- ("list", "AttrType", 0),
- ("list", "AttrValue", 0),
- ),
-
"RoleEquipStars":(
("BYTE", "StarsNeed", 1),
("list", "AttrType", 0),
@@ -206,13 +200,6 @@
("DWORD", "CostItemID", 0),
("BYTE", "CostItemCount", 0),
("list", "GoldWashCostList", 0),
- ),
-
- "EquipWashSpec":(
- ("BYTE", "WashTypeNeed", 1),
- ("BYTE", "WashLVNeed", 1),
- ("list", "AddAttrType", 0),
- ("list", "AddAttrValue", 0),
),
"AttrFruit":(
@@ -522,46 +509,20 @@
"EquipGSParam":(
("BYTE", "ClassLV", 1),
("BYTE", "EquipColor", 1),
- ("BYTE", "EquipQualityLV", 1),
- ("DWORD", "AtkPerC", 0),
- ("DWORD", "DamagePerC", 0),
- ("DWORD", "SuperHitRateC", 0),
+ ("BYTE", "IsSuit", 1),
+ ("DWORD", "BaseEquipMaxHPAddPerC", 0),
+ ("DWORD", "BaseEquipAtkAddPerC", 0),
+ ("DWORD", "SuperHitC", 0),
("DWORD", "SuperHitPerC", 0),
- ("DWORD", "DamReducePerC", 0),
- ("DWORD", "MaxHPPerC", 0),
- ("DWORD", "DefPerC", 0),
("DWORD", "LuckyHitRateC", 0),
- ("DWORD", "PetDamPerC", 0),
+ ("DWORD", "LuckyHitRateReduceC", 0),
+ ("DWORD", "LuckPerC", 0),
("DWORD", "PerLVAtkC", 0),
- ("DWORD", "MissRateC", 0),
- ("DWORD", "HitRateC", 0),
- ("DWORD", "DamBackPerC", 0),
("DWORD", "PerLVMaxHPC", 0),
- ("DWORD", "DropEquipPerC", 0),
("DWORD", "DropMoneyPerC", 0),
- ("DWORD", "IgnoreDefRateReduceC", 0),
- ("DWORD", "DamChanceDefC", 0),
("DWORD", "SuperHitReduceC", 0),
- ("DWORD", "SkillAtkRateC", 0),
- ("DWORD", "SpeedPerC", 0),
- ("DWORD", "AtkSpeedC", 0),
- ("DWORD", "SkillAtkRateReduceC", 0),
("DWORD", "HitC", 0),
("DWORD", "MissC", 0),
- ("DWORD", "SkillAddPer1C", 0),
- ("DWORD", "SkillAddPer2C", 0),
- ("DWORD", "SkillAddPer3C", 0),
- ("DWORD", "SkillAddPer4C", 0),
- ("DWORD", "SkillAddPer5C", 0),
- ("DWORD", "SkillAddPer6C", 0),
- ("DWORD", "SkillAddPer7C", 0),
- ("DWORD", "SkillReducePer1C", 0),
- ("DWORD", "SkillReducePer2C", 0),
- ("DWORD", "SkillReducePer3C", 0),
- ("DWORD", "SkillReducePer4C", 0),
- ("DWORD", "SkillReducePer5C", 0),
- ("DWORD", "SkillReducePer6C", 0),
- ("DWORD", "SkillReducePer7C", 0),
),
"Success":(
@@ -583,9 +544,9 @@
("DWORD", "ID", 1),
("BYTE", "TreasureType", 0),
("DWORD", "PreTreasure", 0),
- ("list", "SuccID", 0),
- ("list", "Potentials", 0),
- ("list", "SkillPower", 0),
+ ("DWORD", "FBMapID", 0),
+ ("DWORD", "FBLineID", 0),
+ ("DWORD", "NeedLV", 0),
("dict", "NeedItem", 0),
),
@@ -595,9 +556,6 @@
("DWORD", "NeedExp", 0),
("dict", "AddAttr", 0),
("list", "UnLockSkill", 0),
- ("DWORD", "ActiveMWID", 0),
- ("list", "ItemAward", 0),
- ("DWORD", "ActiveSoulID", 0),
("DWORD", "PowerEx", 0),
),
@@ -1401,13 +1359,22 @@
"FamilyBossAward":(
("list", "WorldLV", 0),
("list", "Rank", 0),
- ("list", "Award", 0),
+ ("list", "Award1", 0),
+ ("dict", "Award2", 0),
),
"ItemWashMax":(
("BYTE", "Type", 1),
("BYTE", "Star", 1),
("WORD", "LevelMax", 0),
+ ),
+
+ "HorsePetBossAward":(
+ ("BYTE", "LineID", 1),
+ ("list", "WorldLV", 0),
+ ("list", "Rank", 0),
+ ("list", "Award1", 0),
+ ("dict", "Award2", 0),
),
}
@@ -1605,19 +1572,6 @@
def GetStar(self): return self.Star # 装备星数
def GetLevelMax(self): return self.LevelMax # 强化等级上限
-# 装备全身强化属性
-class IPY_ItemPlusSumAttr():
-
- def __init__(self):
- self.PlusCntNeed = 0
- self.AttrType = []
- self.AttrValue = []
- return
-
- def GetPlusCntNeed(self): return self.PlusCntNeed # 全身强化等级
- def GetAttrType(self): return self.AttrType # 全身强化激活属性类型
- def GetAttrValue(self): return self.AttrValue # 全身强化激活属性值
-
# 装备全身星数属性
class IPY_RoleEquipStars():
@@ -1782,21 +1736,6 @@
def GetCostItemID(self): return self.CostItemID # 固定消耗物品ID
def GetCostItemCount(self): return self.CostItemCount # 固定消耗物品个数
def GetGoldWashCostList(self): return self.GoldWashCostList # 仙玉洗练条数对应消耗
-
-# 洗练特殊属性表
-class IPY_EquipWashSpec():
-
- def __init__(self):
- self.WashTypeNeed = 0
- self.WashLVNeed = 0
- self.AddAttrType = []
- self.AddAttrValue = []
- return
-
- def GetWashTypeNeed(self): return self.WashTypeNeed # 所需装备归组类型
- def GetWashLVNeed(self): return self.WashLVNeed # 所需洗练等级
- def GetAddAttrType(self): return self.AddAttrType # 激活加成属性类型
- def GetAddAttrValue(self): return self.AddAttrValue # 激活加成属性值
# 属性果实表
class IPY_AttrFruit():
@@ -2434,90 +2373,38 @@
def __init__(self):
self.ClassLV = 0
self.EquipColor = 0
- self.EquipQualityLV = 0
- self.AtkPerC = 0
- self.DamagePerC = 0
- self.SuperHitRateC = 0
+ self.IsSuit = 0
+ self.BaseEquipMaxHPAddPerC = 0
+ self.BaseEquipAtkAddPerC = 0
+ self.SuperHitC = 0
self.SuperHitPerC = 0
- self.DamReducePerC = 0
- self.MaxHPPerC = 0
- self.DefPerC = 0
self.LuckyHitRateC = 0
- self.PetDamPerC = 0
+ self.LuckyHitRateReduceC = 0
+ self.LuckPerC = 0
self.PerLVAtkC = 0
- self.MissRateC = 0
- self.HitRateC = 0
- self.DamBackPerC = 0
self.PerLVMaxHPC = 0
- self.DropEquipPerC = 0
self.DropMoneyPerC = 0
- self.IgnoreDefRateReduceC = 0
- self.DamChanceDefC = 0
self.SuperHitReduceC = 0
- self.SkillAtkRateC = 0
- self.SpeedPerC = 0
- self.AtkSpeedC = 0
- self.SkillAtkRateReduceC = 0
self.HitC = 0
- self.MissC = 0
- self.SkillAddPer1C = 0
- self.SkillAddPer2C = 0
- self.SkillAddPer3C = 0
- self.SkillAddPer4C = 0
- self.SkillAddPer5C = 0
- self.SkillAddPer6C = 0
- self.SkillAddPer7C = 0
- self.SkillReducePer1C = 0
- self.SkillReducePer2C = 0
- self.SkillReducePer3C = 0
- self.SkillReducePer4C = 0
- self.SkillReducePer5C = 0
- self.SkillReducePer6C = 0
- self.SkillReducePer7C = 0
+ self.MissC = 0
return
def GetClassLV(self): return self.ClassLV # 装备阶级
def GetEquipColor(self): return self.EquipColor # 装备颜色
- def GetEquipQualityLV(self): return self.EquipQualityLV # 装备星级
- def GetAtkPerC(self): return self.AtkPerC # 攻击百分比系数
- def GetDamagePerC(self): return self.DamagePerC # 增加伤害系数
- def GetSuperHitRateC(self): return self.SuperHitRateC # 暴击率系数
+ def GetIsSuit(self): return self.IsSuit # 是否套装
+ def GetBaseEquipMaxHPAddPerC(self): return self.BaseEquipMaxHPAddPerC # 基础防具生命百分比系数
+ def GetBaseEquipAtkAddPerC(self): return self.BaseEquipAtkAddPerC # 基础武器攻击百分比系数
+ def GetSuperHitC(self): return self.SuperHitC # 暴击值系数
def GetSuperHitPerC(self): return self.SuperHitPerC # 暴击值百分比系数
- def GetDamReducePerC(self): return self.DamReducePerC # 减少伤害系数
- def GetMaxHPPerC(self): return self.MaxHPPerC # 生命上限百分比系数
- def GetDefPerC(self): return self.DefPerC # 防御力百分比系数
def GetLuckyHitRateC(self): return self.LuckyHitRateC # 会心一击率系数
- def GetPetDamPerC(self): return self.PetDamPerC # 灵宠伤害增加百分比系数
+ def GetLuckyHitRateReduceC(self): return self.LuckyHitRateReduceC # 会心一击抗性系数
+ def GetLuckPerC(self): return self.LuckPerC # 气运百分比系数
def GetPerLVAtkC(self): return self.PerLVAtkC # 每级增加攻击力系数
- def GetMissRateC(self): return self.MissRateC # 闪避值百分比系数
- def GetHitRateC(self): return self.HitRateC # 命中力百分比系数
- def GetDamBackPerC(self): return self.DamBackPerC # 伤害反射百分比系数
def GetPerLVMaxHPC(self): return self.PerLVMaxHPC # 每级增加生命值系数
- def GetDropEquipPerC(self): return self.DropEquipPerC # 增加装备掉落几率系数
def GetDropMoneyPerC(self): return self.DropMoneyPerC # 增加掉落金币量百分比系数
- def GetIgnoreDefRateReduceC(self): return self.IgnoreDefRateReduceC # 无视防御抗性百分比系数
- def GetDamChanceDefC(self): return self.DamChanceDefC # 抵御百分比系数
def GetSuperHitReduceC(self): return self.SuperHitReduceC # 暴击抗性百分比系数
- 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 GetHitC(self): return self.HitC # 命中系数
- def GetMissC(self): return self.MissC # 闪避系数
- def GetSkillAddPer1C(self): return self.SkillAddPer1C # 技能伤害增强1系数
- def GetSkillAddPer2C(self): return self.SkillAddPer2C # 技能伤害增强2系数
- def GetSkillAddPer3C(self): return self.SkillAddPer3C # 技能伤害增强3系数
- def GetSkillAddPer4C(self): return self.SkillAddPer4C # 技能伤害增强4系数
- def GetSkillAddPer5C(self): return self.SkillAddPer5C # 技能伤害增强5系数
- def GetSkillAddPer6C(self): return self.SkillAddPer6C # 技能伤害增强6系数
- def GetSkillAddPer7C(self): return self.SkillAddPer7C # 技能伤害增强7系数
- def GetSkillReducePer1C(self): return self.SkillReducePer1C # 受到技能伤害减少1系数
- def GetSkillReducePer2C(self): return self.SkillReducePer2C # 受到技能伤害减少2系数
- def GetSkillReducePer3C(self): return self.SkillReducePer3C # 受到技能伤害减少3系数
- def GetSkillReducePer4C(self): return self.SkillReducePer4C # 受到技能伤害减少4系数
- def GetSkillReducePer5C(self): return self.SkillReducePer5C # 受到技能伤害减少5系数
- def GetSkillReducePer6C(self): return self.SkillReducePer6C # 受到技能伤害减少6系数
- def GetSkillReducePer7C(self): return self.SkillReducePer7C # 受到技能伤害减少7系数
+ def GetMissC(self): return self.MissC # 闪避系数
# 成就表
class IPY_Success():
@@ -2557,18 +2444,18 @@
self.ID = 0
self.TreasureType = 0
self.PreTreasure = 0
- self.SuccID = []
- self.Potentials = []
- self.SkillPower = []
+ self.FBMapID = 0
+ self.FBLineID = 0
+ self.NeedLV = 0
self.NeedItem = {}
return
def GetID(self): return self.ID # ID
def GetTreasureType(self): return self.TreasureType # 法宝类型
def GetPreTreasure(self): return self.PreTreasure # 前置法宝
- def GetSuccID(self): return self.SuccID # 成就ID
- def GetPotentials(self): return self.Potentials # 技能潜力升级
- def GetSkillPower(self): return self.SkillPower # 技能解锁战力
+ def GetFBMapID(self): return self.FBMapID # 副本ID
+ def GetFBLineID(self): return self.FBLineID # 副本线路ID
+ def GetNeedLV(self): return self.NeedLV # 需要等级
def GetNeedItem(self): return self.NeedItem # 需要消耗物品
# 法宝升级表
@@ -2580,9 +2467,6 @@
self.NeedExp = 0
self.AddAttr = {}
self.UnLockSkill = []
- self.ActiveMWID = 0
- self.ItemAward = []
- self.ActiveSoulID = 0
self.PowerEx = 0
return
@@ -2591,9 +2475,6 @@
def GetNeedExp(self): return self.NeedExp # 需要经验
def GetAddAttr(self): return self.AddAttr # 属性
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 GetPowerEx(self): return self.PowerEx # 额外固定战力
# 连续签到奖励表
@@ -4289,12 +4170,14 @@
def __init__(self):
self.WorldLV = []
self.Rank = []
- self.Award = []
+ self.Award1 = []
+ self.Award2 = {}
return
def GetWorldLV(self): return self.WorldLV # 世界等级
def GetRank(self): return self.Rank # 排名
- def GetAward(self): return self.Award # 奖励 [[独立概率万分率,[物品ID,数量,拍品分组]],..]
+ def GetAward1(self): return self.Award1 # 奖励 [[独立概率万分率,[物品ID,数量,是否拍品]],..]
+ def GetAward2(self): return self.Award2 # 饼图奖励{随机次数:[(概率,[物品ID,数量,是否拍品]),..]}
# 装备洗练等级上限
class IPY_ItemWashMax():
@@ -4308,6 +4191,23 @@
def GetType(self): return self.Type # 按装备位对应类型查找
def GetStar(self): return self.Star # 装备星数
def GetLevelMax(self): return self.LevelMax # 洗练等级上限
+
+# 骑宠Boss奖励表
+class IPY_HorsePetBossAward():
+
+ def __init__(self):
+ self.LineID = 0
+ self.WorldLV = []
+ self.Rank = []
+ self.Award1 = []
+ self.Award2 = {}
+ return
+
+ def GetLineID(self): return self.LineID # 线路ID
+ def GetWorldLV(self): return self.WorldLV # 世界等级
+ def GetRank(self): return self.Rank # 排名
+ def GetAward1(self): return self.Award1 # 奖励 [[独立概率万分率,[物品ID,数量,是否拍品]],..]
+ def GetAward2(self): return self.Award2 # 饼图奖励{随机次数:[(概率,[物品ID,数量,是否拍品]),..]}
def Log(msg, playerID=0, par=0):
@@ -4351,8 +4251,6 @@
self.ipyItemPlusLen = len(self.ipyItemPlusCache)
self.ipyItemPlusMaxCache = self.__LoadFileData("ItemPlusMax", IPY_ItemPlusMax)
self.ipyItemPlusMaxLen = len(self.ipyItemPlusMaxCache)
- self.ipyItemPlusSumAttrCache = self.__LoadFileData("ItemPlusSumAttr", IPY_ItemPlusSumAttr)
- self.ipyItemPlusSumAttrLen = len(self.ipyItemPlusSumAttrCache)
self.ipyRoleEquipStarsCache = self.__LoadFileData("RoleEquipStars", IPY_RoleEquipStars)
self.ipyRoleEquipStarsLen = len(self.ipyRoleEquipStarsCache)
self.ipyEquipLegendAttrCountCache = self.__LoadFileData("EquipLegendAttrCount", IPY_EquipLegendAttrCount)
@@ -4371,8 +4269,6 @@
self.ipyRuneLen = len(self.ipyRuneCache)
self.ipyEquipWashCache = self.__LoadFileData("EquipWash", IPY_EquipWash)
self.ipyEquipWashLen = len(self.ipyEquipWashCache)
- self.ipyEquipWashSpecCache = self.__LoadFileData("EquipWashSpec", IPY_EquipWashSpec)
- self.ipyEquipWashSpecLen = len(self.ipyEquipWashSpecCache)
self.ipyAttrFruitCache = self.__LoadFileData("AttrFruit", IPY_AttrFruit)
self.ipyAttrFruitLen = len(self.ipyAttrFruitCache)
self.ipyPetInfoCache = self.__LoadFileData("PetInfo", IPY_PetInfo)
@@ -4615,6 +4511,8 @@
self.ipyFamilyBossAwardLen = len(self.ipyFamilyBossAwardCache)
self.ipyItemWashMaxCache = self.__LoadFileData("ItemWashMax", IPY_ItemWashMax)
self.ipyItemWashMaxLen = len(self.ipyItemWashMaxCache)
+ self.ipyHorsePetBossAwardCache = self.__LoadFileData("HorsePetBossAward", IPY_HorsePetBossAward)
+ self.ipyHorsePetBossAwardLen = len(self.ipyHorsePetBossAwardCache)
Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
Log("IPY_DataMgr InitOK!")
return
@@ -4799,8 +4697,6 @@
def GetItemPlusByIndex(self, index): return self.ipyItemPlusCache[index]
def GetItemPlusMaxCount(self): return self.ipyItemPlusMaxLen
def GetItemPlusMaxByIndex(self, index): return self.ipyItemPlusMaxCache[index]
- def GetItemPlusSumAttrCount(self): return self.ipyItemPlusSumAttrLen
- def GetItemPlusSumAttrByIndex(self, index): return self.ipyItemPlusSumAttrCache[index]
def GetRoleEquipStarsCount(self): return self.ipyRoleEquipStarsLen
def GetRoleEquipStarsByIndex(self, index): return self.ipyRoleEquipStarsCache[index]
def GetEquipLegendAttrCountCount(self): return self.ipyEquipLegendAttrCountLen
@@ -4819,8 +4715,6 @@
def GetRuneByIndex(self, index): return self.ipyRuneCache[index]
def GetEquipWashCount(self): return self.ipyEquipWashLen
def GetEquipWashByIndex(self, index): return self.ipyEquipWashCache[index]
- def GetEquipWashSpecCount(self): return self.ipyEquipWashSpecLen
- def GetEquipWashSpecByIndex(self, index): return self.ipyEquipWashSpecCache[index]
def GetAttrFruitCount(self): return self.ipyAttrFruitLen
def GetAttrFruitByIndex(self, index): return self.ipyAttrFruitCache[index]
def GetPetInfoCount(self): return self.ipyPetInfoLen
@@ -5063,6 +4957,8 @@
def GetFamilyBossAwardByIndex(self, index): return self.ipyFamilyBossAwardCache[index]
def GetItemWashMaxCount(self): return self.ipyItemWashMaxLen
def GetItemWashMaxByIndex(self, index): return self.ipyItemWashMaxCache[index]
+ def GetHorsePetBossAwardCount(self): return self.ipyHorsePetBossAwardLen
+ def GetHorsePetBossAwardByIndex(self, index): return self.ipyHorsePetBossAwardCache[index]
IPYData = IPY_DataMgr()
def IPY_Data(): return IPYData
--
Gitblit v1.8.0