From 921ba9c6e954f2f1377cb08d5a8476c9e6c2b30e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 17:44:27 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化(给非拍卖物品为拍品时优化)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |   73 ++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index d157c2e..ed5d401 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -43,16 +43,12 @@
 
                 "Realm":(
                         ("WORD", "Lv", 1),
-                        ("BYTE", "IsBigRealm", 0),
-                        ("DWORD", "NeedPoint", 0),
+                        ("DWORD", "NeedLV", 0),
                         ("DWORD", "NeedItemID", 0),
                         ("WORD", "NeedItemCnt", 0),
-                        ("dict", "NeedActiveTreasure", 0),
                         ("list", "AddAttrType", 0),
                         ("list", "AddAttrNum", 0),
                         ("DWORD", "BossID", 0),
-                        ("dict", "SitTime", 0),
-                        ("dict", "TeamAward", 0),
                         ),
 
                 "GodWeapon":(
@@ -133,16 +129,12 @@
                         ("BYTE", "ItemType", 1),
                         ("BYTE", "ItemColor", 1),
                         ("BYTE", "IsSuit", 1),
-                        ("BYTE", "FixedLegendAttrCount", 0),
-                        ("BYTE", "GoodLegendAttrCount", 0),
-                        ("BYTE", "OtherLegendAttrCount", 0),
+                        ("list", "LegendAttrCountInfo", 0),
                         ),
 
                 "EquipLegendAttrType":(
                         ("BYTE", "ItemType", 1),
-                        ("list", "FixedLegendAttrList", 0),
-                        ("list", "GoodLegendAttrList", 0),
-                        ("list", "CommLegendAttrList", 0),
+                        ("dict", "LegendAttrTypeLib", 0),
                         ),
 
                 "EquipLegendAttrLib":(
@@ -1409,6 +1401,12 @@
                         ("list", "Rank", 0),
                         ("list", "Award", 0),
                         ),
+
+                "ItemWashMax":(
+                        ("BYTE", "Type", 1),
+                        ("BYTE", "Star", 1),
+                        ("WORD", "LevelMax", 0),
+                        ),
                 }
 
 
@@ -1436,29 +1434,21 @@
     
     def __init__(self):
         self.Lv = 0
-        self.IsBigRealm = 0
-        self.NeedPoint = 0
+        self.NeedLV = 0
         self.NeedItemID = 0
         self.NeedItemCnt = 0
-        self.NeedActiveTreasure = {}
         self.AddAttrType = []
         self.AddAttrNum = []
-        self.BossID = 0
-        self.SitTime = {}
-        self.TeamAward = {}
+        self.BossID = 0
         return
         
     def GetLv(self): return self.Lv # 境界等级
-    def GetIsBigRealm(self): return self.IsBigRealm # 是否大境界
-    def GetNeedPoint(self): return self.NeedPoint # 开启渡劫需要修炼点
-    def GetNeedItemID(self): return self.NeedItemID # 开启渡劫需要道具ID
-    def GetNeedItemCnt(self): return self.NeedItemCnt # 开启渡劫消耗的道具数量
-    def GetNeedActiveTreasure(self): return self.NeedActiveTreasure # 开启渡劫需要激活法宝条件
+    def GetNeedLV(self): return self.NeedLV # 需要等级
+    def GetNeedItemID(self): return self.NeedItemID # 需要道具ID
+    def GetNeedItemCnt(self): return self.NeedItemCnt # 消耗的道具数量
     def GetAddAttrType(self): return self.AddAttrType # 境界加成属性类型
     def GetAddAttrNum(self): return self.AddAttrNum # 境界加成属性值
-    def GetBossID(self): return self.BossID # 渡劫bossid
-    def GetSitTime(self): return self.SitTime # 打坐时间
-    def GetTeamAward(self): return self.TeamAward # 组队帮打的人的奖励
+    def GetBossID(self): return self.BossID # 渡劫bossid
 
 # 神兵表
 class IPY_GodWeapon():
@@ -1623,32 +1613,24 @@
         self.ItemType = 0
         self.ItemColor = 0
         self.IsSuit = 0
-        self.FixedLegendAttrCount = 0
-        self.GoodLegendAttrCount = 0
-        self.OtherLegendAttrCount = 0
+        self.LegendAttrCountInfo = []
         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 # 其他随机传奇属性条数
+    def GetLegendAttrCountInfo(self): return self.LegendAttrCountInfo # 传奇属性条数信息 [[条数, [属性类型库编号, ...]], ...]
 
 # 装备传奇属性类型表
 class IPY_EquipLegendAttrType():
     
     def __init__(self):
         self.ItemType = 0
-        self.FixedLegendAttrList = []
-        self.GoodLegendAttrList = []
-        self.CommLegendAttrList = []
+        self.LegendAttrTypeLib = {}
         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 # 一般传奇属性列表
+    def GetLegendAttrTypeLib(self): return self.LegendAttrTypeLib # 传奇属性类型库 {属性类型库编号:[属性ID,...], ...}
 
 # 装备传奇属性值库表
 class IPY_EquipLegendAttrLib():
@@ -4307,6 +4289,19 @@
     def GetWorldLV(self): return self.WorldLV # 世界等级
     def GetRank(self): return self.Rank # 排名
     def GetAward(self): return self.Award # 奖励 [[独立概率万分率,[物品ID,数量,拍品分组]],..]
+
+# 装备洗练等级上限
+class IPY_ItemWashMax():
+    
+    def __init__(self):
+        self.Type = 0
+        self.Star = 0
+        self.LevelMax = 0
+        return
+        
+    def GetType(self): return self.Type # 按装备位对应类型查找
+    def GetStar(self): return self.Star #  装备星数
+    def GetLevelMax(self): return self.LevelMax # 洗练等级上限
 
 
 def Log(msg, playerID=0, par=0):
@@ -4612,6 +4607,8 @@
         self.ipyEquipPlusEvolveLen = len(self.ipyEquipPlusEvolveCache)
         self.ipyFamilyBossAwardCache = self.__LoadFileData("FamilyBossAward", IPY_FamilyBossAward)
         self.ipyFamilyBossAwardLen = len(self.ipyFamilyBossAwardCache)
+        self.ipyItemWashMaxCache = self.__LoadFileData("ItemWashMax", IPY_ItemWashMax)
+        self.ipyItemWashMaxLen = len(self.ipyItemWashMaxCache)
         Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
         Log("IPY_DataMgr InitOK!")
         return
@@ -5058,6 +5055,8 @@
     def GetEquipPlusEvolveByIndex(self, index): return self.ipyEquipPlusEvolveCache[index]
     def GetFamilyBossAwardCount(self): return self.ipyFamilyBossAwardLen
     def GetFamilyBossAwardByIndex(self, index): return self.ipyFamilyBossAwardCache[index]
+    def GetItemWashMaxCount(self): return self.ipyItemWashMaxLen
+    def GetItemWashMaxByIndex(self, index): return self.ipyItemWashMaxCache[index]
 
 IPYData = IPY_DataMgr()
 def IPY_Data(): return IPYData

--
Gitblit v1.8.0