Merge remote-tracking branch 'remotes/origin/master'

hxp

2018-08-21 676d0d627868fc1c2e04bcdf7e43396d283d88b5

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py

@@ -62,6 +62,7 @@
                        ("list", "AttrType", 0),

                        ("list", "AttrNum", 0),

                        ("DWORD", "SkillID", 0),

                        ("char", "SysMark", 0),

                        ),



                "FuncConfig":(

@@ -124,6 +125,22 @@
                        ("list", "AttrValue", 0),

                        ),



                "Dogz":(

                        ("BYTE", "DogzID", 1),

                        ("list", "BaseAttrTypes", 0),

                        ("list", "BaseAttrValues", 0),

                        ("list", "HelpBattleSkills", 0),

                        ("list", "EquipPlaceColorList", 0),

                        ),



                "DogzEquipPlus":(

                        ("BYTE", "EquipPlace", 1),

                        ("BYTE", "PlusLV", 1),

                        ("list", "PlusAttrTypes", 0),

                        ("list", "PlusAttrValues", 0),

                        ("DWORD", "PlusLVUPTotalExp", 0),

                        ),



                "Rune":(

                        ("DWORD", "ID", 1),

                        ("list", "AttrType", 0),

@@ -169,6 +186,7 @@
                "PetInfo":(

                        ("DWORD", "ID", 1),

                        ("BYTE", "Quality", 0),

                        ("char", "UnlockSys", 0),

                        ("DWORD", "UnLockNeedItemID", 0),

                        ("BYTE", "UnLockNeedItemCnt", 0),

                        ("DWORD", "DecomposeExp", 0),

@@ -177,6 +195,7 @@
                        ("WORD", "UseNeedRank", 0),

                        ("list", "SkillID", 0),

                        ("list", "SkillUnLock", 0),

                        ("list", "SkillUnLockSys", 0),

                        ("DWORD", "InitFightPower", 0),

                        ),



@@ -210,6 +229,7 @@
                        ("BYTE", "UseNeedRank", 0),

                        ("BYTE", "Quality", 0),

                        ("DWORD", "InitFightPower", 0),

                        ("char", "UnlockSys", 0),

                        ),



                "HorseUp":(

@@ -219,6 +239,7 @@
                        ("list", "AttrType", 0),

                        ("list", "AttrValue", 0),

                        ("list", "SkillID", 0),

                        ("char", "SysMark", 0),

                        ),



                "PlayerLV":(

@@ -506,7 +527,8 @@
                        ("DWORD", "NeedExp", 0),

                        ("dict", "AddAttr", 0),

                        ("list", "UnLockSkill", 0),

                        ("DWORD", "PrivilegeID", 0),

                        ("DWORD", "ActiveMWID", 0),

                        ("list", "ItemAward", 0),

                        ),



                "TreasurePrivilege":(

@@ -516,6 +538,7 @@
                        ("DWORD", "MaxValue", 0),

                        ("dict", "AddAttr", 0),

                        ("list", "ItemAward", 0),

                        ("list", "SuccessList", 0),

                        ),



                "TreasureSkill":(

@@ -908,7 +931,7 @@


                "TrialExchange":(

                        ("DWORD", "ID", 1),

                        ("DWORD", "ExchangeItemID", 0),

                        ("list", "ExchangeItemIDList", 0),

                        ("DWORD", "ExchangeItemCount", 0),

                        ("DWORD", "ExchangeItemIsBind", 0),

                        ("DWORD", "CostItemID", 0),

@@ -987,7 +1010,8 @@
        self.Exp = 0

        self.AttrType = []

        self.AttrNum = []

        self.SkillID = 0
        self.SkillID = 0

        self.SysMark = ""
        return
        
    def GetType(self): return self.Type # 神兵类型

@@ -995,7 +1019,8 @@
    def GetExp(self): return self.Exp

    def GetAttrType(self): return self.AttrType # 属性类型

    def GetAttrNum(self): return self.AttrNum # 属性值

    def GetSkillID(self): return self.SkillID # 激活技能ID
    def GetSkillID(self): return self.SkillID # 激活技能ID

    def GetSysMark(self): return self.SysMark # 系统提示

# 功能配置表格
class IPY_FuncConfig():
@@ -1124,6 +1149,40 @@
    def GetAttrType(self): return self.AttrType # 属性类型

    def GetAttrValue(self): return self.AttrValue # 属性值

# 神兽表
class IPY_Dogz():
    
    def __init__(self):
        self.DogzID = 0

        self.BaseAttrTypes = []

        self.BaseAttrValues = []

        self.HelpBattleSkills = []

        self.EquipPlaceColorList = []
        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 # 穿戴装备颜色限制

# 神兽强化表
class IPY_DogzEquipPlus():
    
    def __init__(self):
        self.EquipPlace = 0

        self.PlusLV = 0

        self.PlusAttrTypes = []

        self.PlusAttrValues = []

        self.PlusLVUPTotalExp = 0
        return
        
    def GetEquipPlace(self): return self.EquipPlace # 装备位

    def GetPlusLV(self): return self.PlusLV # 强化等级

    def GetPlusAttrTypes(self): return self.PlusAttrTypes # 强化属性类型列表

    def GetPlusAttrValues(self): return self.PlusAttrValues # 强化属性值列表

    def GetPlusLVUPTotalExp(self): return self.PlusLVUPTotalExp # 升级所需累计熟练度总值

# 符印表
class IPY_Rune():
    
@@ -1218,6 +1277,7 @@
    def __init__(self):
        self.ID = 0

        self.Quality = 0

        self.UnlockSys = ""

        self.UnLockNeedItemID = 0

        self.UnLockNeedItemCnt = 0

        self.DecomposeExp = 0

@@ -1226,11 +1286,13 @@
        self.UseNeedRank = 0

        self.SkillID = []

        self.SkillUnLock = []

        self.SkillUnLockSys = []

        self.InitFightPower = 0
        return
        
    def GetID(self): return self.ID # 灵兽NPCID

    def GetQuality(self): return self.Quality # 品质

    def GetUnlockSys(self): return self.UnlockSys # 解锁广播提示

    def GetUnLockNeedItemID(self): return self.UnLockNeedItemID # 解锁灵兽物品ID

    def GetUnLockNeedItemCnt(self): return self.UnLockNeedItemCnt # 解锁所需物品数量

    def GetDecomposeExp(self): return self.DecomposeExp # 分解单个解锁物品可获得升阶经验

@@ -1239,6 +1301,7 @@
    def GetUseNeedRank(self): return self.UseNeedRank # 多少阶可切换外观

    def GetSkillID(self): return self.SkillID # 灵兽技能ID

    def GetSkillUnLock(self): return self.SkillUnLock # 灵兽技能解锁需要阶数

    def GetSkillUnLockSys(self): return self.SkillUnLockSys # 灵兽技能解锁提示

    def GetInitFightPower(self): return self.InitFightPower # 初始战力

# 装备分解属性表
@@ -1296,7 +1359,8 @@
        self.MaxLV = 0

        self.UseNeedRank = 0

        self.Quality = 0

        self.InitFightPower = 0
        self.InitFightPower = 0

        self.UnlockSys = ""
        return
        
    def GetHorseID(self): return self.HorseID # 坐骑编号ID

@@ -1307,7 +1371,8 @@
    def GetMaxLV(self): return self.MaxLV # 坐骑最高等级

    def GetUseNeedRank(self): return self.UseNeedRank # 多少阶可切换外观

    def GetQuality(self): return self.Quality # 坐骑品质

    def GetInitFightPower(self): return self.InitFightPower # 初始战力
    def GetInitFightPower(self): return self.InitFightPower # 初始战力

    def GetUnlockSys(self): return self.UnlockSys # 解锁广播提示

# 坐骑升级表
class IPY_HorseUp():
@@ -1318,7 +1383,8 @@
        self.NeedExp = 0

        self.AttrType = []

        self.AttrValue = []

        self.SkillID = []
        self.SkillID = []

        self.SysMark = ""
        return
        
    def GetHorseID(self): return self.HorseID # 坐骑编号ID

@@ -1326,7 +1392,8 @@
    def GetNeedExp(self): return self.NeedExp # 升级所需经验

    def GetAttrType(self): return self.AttrType # 激活加成属性类型

    def GetAttrValue(self): return self.AttrValue # 激活加成属性值

    def GetSkillID(self): return self.SkillID # 可获得的技能ID
    def GetSkillID(self): return self.SkillID # 可获得的技能ID

    def GetSysMark(self): return self.SysMark # 广播提示

# 玩家等级表
class IPY_PlayerLV():
@@ -1913,7 +1980,8 @@
        self.NeedExp = 0

        self.AddAttr = {}

        self.UnLockSkill = []

        self.PrivilegeID = 0
        self.ActiveMWID = 0

        self.ItemAward = []
        return
        
    def GetMWID(self): return self.MWID # 法宝ID

@@ -1921,7 +1989,8 @@
    def GetNeedExp(self): return self.NeedExp # 需要经验

    def GetAddAttr(self): return self.AddAttr # 属性

    def GetUnLockSkill(self): return self.UnLockSkill # 解锁的技能

    def GetPrivilegeID(self): return self.PrivilegeID # 特权ID
    def GetActiveMWID(self): return self.ActiveMWID # 激活法宝ID

    def GetItemAward(self): return self.ItemAward # 物品奖励[itemID,cnt,isbind]

# 法宝特权表
class IPY_TreasurePrivilege():
@@ -1932,7 +2001,8 @@
        self.SingleValue = 0

        self.MaxValue = 0

        self.AddAttr = {}

        self.ItemAward = []
        self.ItemAward = []

        self.SuccessList = []
        return
        
    def GetPrivilegeID(self): return self.PrivilegeID # 特权ID

@@ -1940,7 +2010,8 @@
    def GetSingleValue(self): return self.SingleValue # 进度

    def GetMaxValue(self): return self.MaxValue # 最大进度

    def GetAddAttr(self): return self.AddAttr # 属性

    def GetItemAward(self): return self.ItemAward # 物品奖励
    def GetItemAward(self): return self.ItemAward # 物品奖励

    def GetSuccessList(self): return self.SuccessList # 需要完成成就

# 法宝技能升级表
class IPY_TreasureSkill():
@@ -2766,7 +2837,7 @@
    
    def __init__(self):
        self.ID = 0

        self.ExchangeItemID = 0

        self.ExchangeItemIDList = []

        self.ExchangeItemCount = 0

        self.ExchangeItemIsBind = 0

        self.CostItemID = 0

@@ -2774,7 +2845,7 @@
        return
        
    def GetID(self): return self.ID # 兑换ID

    def GetExchangeItemID(self): return self.ExchangeItemID # 兑换物品ID

    def GetExchangeItemIDList(self): return self.ExchangeItemIDList # 兑换物品ID

    def GetExchangeItemCount(self): return self.ExchangeItemCount # 兑换物品个数

    def GetExchangeItemIsBind(self): return self.ExchangeItemIsBind # 兑换物品是否绑定

    def GetCostItemID(self): return self.CostItemID # 消耗物品ID

@@ -2852,6 +2923,10 @@
        self.ipyItemPlusSumAttrLen = len(self.ipyItemPlusSumAttrCache)

        self.ipyRoleEquipStarsCache = self.__LoadFileData("RoleEquipStars", IPY_RoleEquipStars)

        self.ipyRoleEquipStarsLen = len(self.ipyRoleEquipStarsCache)

        self.ipyDogzCache = self.__LoadFileData("Dogz", IPY_Dogz)

        self.ipyDogzLen = len(self.ipyDogzCache)

        self.ipyDogzEquipPlusCache = self.__LoadFileData("DogzEquipPlus", IPY_DogzEquipPlus)

        self.ipyDogzEquipPlusLen = len(self.ipyDogzEquipPlusCache)

        self.ipyRuneCache = self.__LoadFileData("Rune", IPY_Rune)

        self.ipyRuneLen = len(self.ipyRuneCache)

        self.ipyEquipWashCache = self.__LoadFileData("EquipWash", IPY_EquipWash)

@@ -3186,6 +3261,10 @@
    def GetItemPlusSumAttrByIndex(self, index): return self.ipyItemPlusSumAttrCache[index]

    def GetRoleEquipStarsCount(self): return self.ipyRoleEquipStarsLen

    def GetRoleEquipStarsByIndex(self, index): return self.ipyRoleEquipStarsCache[index]

    def GetDogzCount(self): return self.ipyDogzLen

    def GetDogzByIndex(self, index): return self.ipyDogzCache[index]

    def GetDogzEquipPlusCount(self): return self.ipyDogzEquipPlusLen

    def GetDogzEquipPlusByIndex(self, index): return self.ipyDogzEquipPlusCache[index]

    def GetRuneCount(self): return self.ipyRuneLen

    def GetRuneByIndex(self, index): return self.ipyRuneCache[index]

    def GetEquipWashCount(self): return self.ipyEquipWashLen