From fa10596d9f3abf523f8e900d7b920e4af8ea6bc5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 07 三月 2019 14:45:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 234 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 157 insertions(+), 77 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index dcbe4b3..313bc13 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -113,8 +113,7 @@
"ItemPlusMax":(
("BYTE", "Type", 1),
- ("BYTE", "ItemRank", 1),
- ("BYTE", "ItemColor", 1),
+ ("BYTE", "Star", 1),
("WORD", "LevelMax", 0),
),
@@ -128,6 +127,35 @@
("BYTE", "StarsNeed", 1),
("list", "AttrType", 0),
("list", "AttrValue", 0),
+ ),
+
+ "EquipLegendAttrCount":(
+ ("BYTE", "ItemType", 1),
+ ("BYTE", "ItemColor", 1),
+ ("BYTE", "IsSuit", 1),
+ ("BYTE", "FixedLegendAttrCount", 0),
+ ("BYTE", "GoodLegendAttrCount", 0),
+ ("BYTE", "OtherLegendAttrCount", 0),
+ ),
+
+ "EquipLegendAttrType":(
+ ("BYTE", "ItemType", 1),
+ ("list", "FixedLegendAttrList", 0),
+ ("list", "GoodLegendAttrList", 0),
+ ("list", "CommLegendAttrList", 0),
+ ),
+
+ "EquipLegendAttrLib":(
+ ("BYTE", "LegendAttrID", 1),
+ ("dict", "LegendAttrLib", 0),
+ ),
+
+ "EquipLegendAttrValue":(
+ ("BYTE", "ItemType", 1),
+ ("BYTE", "ItemClassLV", 1),
+ ("BYTE", "ItemColor", 1),
+ ("BYTE", "IsSuit", 1),
+ ("dict", "LVLegendAttrLibNumInfo", 0),
),
"Dogz":(
@@ -316,28 +344,12 @@
),
"EquipSuitAttr":(
- ("BYTE", "GroupType", 1),
- ("BYTE", "SuiteType", 1),
- ("WORD", "SuiteLV", 1),
- ("BYTE", "Job", 1),
- ("BYTE", "Count1", 0),
- ("list", "AttrType1", 0),
- ("list", "AttrValue1", 0),
- ("BYTE", "Count2", 0),
- ("list", "AttrType2", 0),
- ("list", "AttrValue2", 0),
- ("BYTE", "Count3", 0),
- ("list", "AttrType3", 0),
- ("list", "AttrValue3", 0),
- ),
-
- "EquipSuitCompound":(
- ("BYTE", "SuiteType", 1),
- ("BYTE", "EquipPlace", 1),
- ("WORD", "SuiteLV", 1),
- ("BYTE", "Job", 1),
- ("list", "CostItemID", 0),
- ("list", "CostItemCnt", 0),
+ ("WORD", "SuiteID", 1),
+ ("BYTE", "SuiteCnt", 0),
+ ("BYTE", "Star", 0),
+ ("dict", "AttrInfo", 0),
+ ("DWORD", "SkillID", 0),
+ ("BYTE", "IsNotify", 0),
),
"WingRefineAttr":(
@@ -1391,6 +1403,14 @@
("dict", "StarAttrInfo", 0),
("dict", "BaseAttrInfo", 0),
),
+
+ "EquipPlusEvolve":(
+ ("BYTE", "EquipPlace", 1),
+ ("BYTE", "EvolveLV", 1),
+ ("WORD", "NeedPlusLV", 0),
+ ("dict", "CostItem", 0),
+ ("dict", "Attr", 0),
+ ),
}
@@ -1564,14 +1584,12 @@
def __init__(self):
self.Type = 0
- self.ItemRank = 0
- self.ItemColor = 0
+ self.Star = 0
self.LevelMax = 0
return
def GetType(self): return self.Type # 按装备位对应类型查找
- def GetItemRank(self): return self.ItemRank # 装备阶数
- def GetItemColor(self): return self.ItemColor # 装备颜色 如橙装
+ def GetStar(self): return self.Star # 装备星数
def GetLevelMax(self): return self.LevelMax # 强化等级上限
# 装备全身强化属性
@@ -1599,6 +1617,68 @@
def GetStarsNeed(self): return self.StarsNeed # 全身星数
def GetAttrType(self): return self.AttrType # 属性类型
def GetAttrValue(self): return self.AttrValue # 属性值
+
+# 装备传奇属性条数表
+class IPY_EquipLegendAttrCount():
+
+ def __init__(self):
+ self.ItemType = 0
+ self.ItemColor = 0
+ self.IsSuit = 0
+ self.FixedLegendAttrCount = 0
+ self.GoodLegendAttrCount = 0
+ self.OtherLegendAttrCount = 0
+ return
+
+ def GetItemType(self): return self.ItemType # 物品类型
+ def GetItemColor(self): return self.ItemColor # 物品颜色
+ def GetIsSuit(self): return self.IsSuit # 是否套装
+ def GetFixedLegendAttrCount(self): return self.FixedLegendAttrCount # 固定传奇属性条数
+ def GetGoodLegendAttrCount(self): return self.GoodLegendAttrCount # 追求传奇属性保底条数
+ def GetOtherLegendAttrCount(self): return self.OtherLegendAttrCount # 其他随机传奇属性条数
+
+# 装备传奇属性类型表
+class IPY_EquipLegendAttrType():
+
+ def __init__(self):
+ self.ItemType = 0
+ self.FixedLegendAttrList = []
+ self.GoodLegendAttrList = []
+ self.CommLegendAttrList = []
+ return
+
+ def GetItemType(self): return self.ItemType # 物品类型
+ def GetFixedLegendAttrList(self): return self.FixedLegendAttrList # 固定传奇属性列表
+ def GetGoodLegendAttrList(self): return self.GoodLegendAttrList # 追求传奇属性列表
+ def GetCommLegendAttrList(self): return self.CommLegendAttrList # 一般传奇属性列表
+
+# 装备传奇属性值库表
+class IPY_EquipLegendAttrLib():
+
+ def __init__(self):
+ self.LegendAttrID = 0
+ self.LegendAttrLib = {}
+ return
+
+ def GetLegendAttrID(self): return self.LegendAttrID # 传奇属性ID
+ def GetLegendAttrLib(self): return self.LegendAttrLib # 属性库信息 {库编号:[随机数值, ...], ...}
+
+# 装备传奇属性等级数值表
+class IPY_EquipLegendAttrValue():
+
+ def __init__(self):
+ self.ItemType = 0
+ self.ItemClassLV = 0
+ self.ItemColor = 0
+ self.IsSuit = 0
+ self.LVLegendAttrLibNumInfo = {}
+ return
+
+ def GetItemType(self): return self.ItemType # 物品类型
+ def GetItemClassLV(self): return self.ItemClassLV # 物品阶级
+ def GetItemColor(self): return self.ItemColor # 物品颜色
+ def GetIsSuit(self): return self.IsSuit # 是否套装
+ def GetLVLegendAttrLibNumInfo(self): return self.LVLegendAttrLibNumInfo # 属性ID等级段对应数值库编号 {属性ID:{等级:库编号, ...}}
# 神兽表
class IPY_Dogz():
@@ -1989,53 +2069,20 @@
class IPY_EquipSuitAttr():
def __init__(self):
- self.GroupType = 0
- self.SuiteType = 0
- self.SuiteLV = 0
- self.Job = 0
- self.Count1 = 0
- self.AttrType1 = []
- self.AttrValue1 = []
- self.Count2 = 0
- self.AttrType2 = []
- self.AttrValue2 = []
- self.Count3 = 0
- self.AttrType3 = []
- self.AttrValue3 = []
+ self.SuiteID = 0
+ self.SuiteCnt = 0
+ self.Star = 0
+ self.AttrInfo = {}
+ self.SkillID = 0
+ self.IsNotify = 0
return
- def GetGroupType(self): return self.GroupType # 套装组合类型
- def GetSuiteType(self): return self.SuiteType # 套装类型
- def GetSuiteLV(self): return self.SuiteLV # 套装等级
- def GetJob(self): return self.Job # 职业
- def GetCount1(self): return self.Count1 # 阶段1所需数量
- def GetAttrType1(self): return self.AttrType1 # 阶段1属性类型
- def GetAttrValue1(self): return self.AttrValue1 # 阶段1属性值
- def GetCount2(self): return self.Count2 # 阶段2所需数量
- def GetAttrType2(self): return self.AttrType2 # 阶段2属性类型
- def GetAttrValue2(self): return self.AttrValue2 # 阶段2属性值
- def GetCount3(self): return self.Count3 # 阶段2所需数量
- def GetAttrType3(self): return self.AttrType3 # 阶段2属性类型
- def GetAttrValue3(self): return self.AttrValue3 # 阶段2属性值
-
-# 套装合成表
-class IPY_EquipSuitCompound():
-
- def __init__(self):
- self.SuiteType = 0
- self.EquipPlace = 0
- self.SuiteLV = 0
- self.Job = 0
- self.CostItemID = []
- self.CostItemCnt = []
- return
-
- def GetSuiteType(self): return self.SuiteType # 套装类型
- def GetEquipPlace(self): return self.EquipPlace # 装备部位
- def GetSuiteLV(self): return self.SuiteLV # 套装等级
- def GetJob(self): return self.Job # 职业
- def GetCostItemID(self): return self.CostItemID # 材料ID
- def GetCostItemCnt(self): return self.CostItemCnt # 材料数量
+ def GetSuiteID(self): return self.SuiteID # 套装ID
+ def GetSuiteCnt(self): return self.SuiteCnt # 套装件数
+ def GetStar(self): return self.Star # 星数
+ def GetAttrInfo(self): return self.AttrInfo # 属性
+ def GetSkillID(self): return self.SkillID # 技能ID
+ def GetIsNotify(self): return self.IsNotify # 是否广播
# 羽翼精炼属性表
class IPY_WingRefineAttr():
@@ -4249,6 +4296,23 @@
def GetCostItemDict(self): return self.CostItemDict # 特殊材料
def GetStarAttrInfo(self): return self.StarAttrInfo # 星级属性
def GetBaseAttrInfo(self): return self.BaseAttrInfo # 基础属性增加
+
+# 装备强化进化表
+class IPY_EquipPlusEvolve():
+
+ def __init__(self):
+ self.EquipPlace = 0
+ self.EvolveLV = 0
+ self.NeedPlusLV = 0
+ self.CostItem = {}
+ self.Attr = {}
+ return
+
+ def GetEquipPlace(self): return self.EquipPlace # 装备位
+ def GetEvolveLV(self): return self.EvolveLV # 进化等级
+ def GetNeedPlusLV(self): return self.NeedPlusLV # 需要强化等级
+ def GetCostItem(self): return self.CostItem # 消耗材料
+ def GetAttr(self): return self.Attr # 属性
def Log(msg, playerID=0, par=0):
@@ -4294,6 +4358,14 @@
self.ipyItemPlusSumAttrLen = len(self.ipyItemPlusSumAttrCache)
self.ipyRoleEquipStarsCache = self.__LoadFileData("RoleEquipStars", IPY_RoleEquipStars)
self.ipyRoleEquipStarsLen = len(self.ipyRoleEquipStarsCache)
+ self.ipyEquipLegendAttrCountCache = self.__LoadFileData("EquipLegendAttrCount", IPY_EquipLegendAttrCount)
+ self.ipyEquipLegendAttrCountLen = len(self.ipyEquipLegendAttrCountCache)
+ self.ipyEquipLegendAttrTypeCache = self.__LoadFileData("EquipLegendAttrType", IPY_EquipLegendAttrType)
+ self.ipyEquipLegendAttrTypeLen = len(self.ipyEquipLegendAttrTypeCache)
+ self.ipyEquipLegendAttrLibCache = self.__LoadFileData("EquipLegendAttrLib", IPY_EquipLegendAttrLib)
+ self.ipyEquipLegendAttrLibLen = len(self.ipyEquipLegendAttrLibCache)
+ self.ipyEquipLegendAttrValueCache = self.__LoadFileData("EquipLegendAttrValue", IPY_EquipLegendAttrValue)
+ self.ipyEquipLegendAttrValueLen = len(self.ipyEquipLegendAttrValueCache)
self.ipyDogzCache = self.__LoadFileData("Dogz", IPY_Dogz)
self.ipyDogzLen = len(self.ipyDogzCache)
self.ipyDogzEquipPlusCache = self.__LoadFileData("DogzEquipPlus", IPY_DogzEquipPlus)
@@ -4326,8 +4398,6 @@
self.ipyNPCStrengthenLen = len(self.ipyNPCStrengthenCache)
self.ipyEquipSuitAttrCache = self.__LoadFileData("EquipSuitAttr", IPY_EquipSuitAttr)
self.ipyEquipSuitAttrLen = len(self.ipyEquipSuitAttrCache)
- self.ipyEquipSuitCompoundCache = self.__LoadFileData("EquipSuitCompound", IPY_EquipSuitCompound)
- self.ipyEquipSuitCompoundLen = len(self.ipyEquipSuitCompoundCache)
self.ipyWingRefineAttrCache = self.__LoadFileData("WingRefineAttr", IPY_WingRefineAttr)
self.ipyWingRefineAttrLen = len(self.ipyWingRefineAttrCache)
self.ipyWingRefineExpCache = self.__LoadFileData("WingRefineExp", IPY_WingRefineExp)
@@ -4546,6 +4616,8 @@
self.ipyEquipPlaceIndexMapLen = len(self.ipyEquipPlaceIndexMapCache)
self.ipyEquipStarUpCache = self.__LoadFileData("EquipStarUp", IPY_EquipStarUp)
self.ipyEquipStarUpLen = len(self.ipyEquipStarUpCache)
+ self.ipyEquipPlusEvolveCache = self.__LoadFileData("EquipPlusEvolve", IPY_EquipPlusEvolve)
+ self.ipyEquipPlusEvolveLen = len(self.ipyEquipPlusEvolveCache)
Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
Log("IPY_DataMgr InitOK!")
return
@@ -4732,6 +4804,14 @@
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
+ def GetEquipLegendAttrCountByIndex(self, index): return self.ipyEquipLegendAttrCountCache[index]
+ def GetEquipLegendAttrTypeCount(self): return self.ipyEquipLegendAttrTypeLen
+ def GetEquipLegendAttrTypeByIndex(self, index): return self.ipyEquipLegendAttrTypeCache[index]
+ def GetEquipLegendAttrLibCount(self): return self.ipyEquipLegendAttrLibLen
+ def GetEquipLegendAttrLibByIndex(self, index): return self.ipyEquipLegendAttrLibCache[index]
+ def GetEquipLegendAttrValueCount(self): return self.ipyEquipLegendAttrValueLen
+ def GetEquipLegendAttrValueByIndex(self, index): return self.ipyEquipLegendAttrValueCache[index]
def GetDogzCount(self): return self.ipyDogzLen
def GetDogzByIndex(self, index): return self.ipyDogzCache[index]
def GetDogzEquipPlusCount(self): return self.ipyDogzEquipPlusLen
@@ -4764,8 +4844,6 @@
def GetNPCStrengthenByIndex(self, index): return self.ipyNPCStrengthenCache[index]
def GetEquipSuitAttrCount(self): return self.ipyEquipSuitAttrLen
def GetEquipSuitAttrByIndex(self, index): return self.ipyEquipSuitAttrCache[index]
- def GetEquipSuitCompoundCount(self): return self.ipyEquipSuitCompoundLen
- def GetEquipSuitCompoundByIndex(self, index): return self.ipyEquipSuitCompoundCache[index]
def GetWingRefineAttrCount(self): return self.ipyWingRefineAttrLen
def GetWingRefineAttrByIndex(self, index): return self.ipyWingRefineAttrCache[index]
def GetWingRefineExpCount(self): return self.ipyWingRefineExpLen
@@ -4984,6 +5062,8 @@
def GetEquipPlaceIndexMapByIndex(self, index): return self.ipyEquipPlaceIndexMapCache[index]
def GetEquipStarUpCount(self): return self.ipyEquipStarUpLen
def GetEquipStarUpByIndex(self, index): return self.ipyEquipStarUpCache[index]
+ def GetEquipPlusEvolveCount(self): return self.ipyEquipPlusEvolveLen
+ def GetEquipPlusEvolveByIndex(self, index): return self.ipyEquipPlusEvolveCache[index]
IPYData = IPY_DataMgr()
def IPY_Data(): return IPYData
--
Gitblit v1.8.0