From 733fee071d370d831678dc9b08034bb87e7c5766 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 24 十一月 2018 13:41:08 +0800
Subject: [PATCH] 4710 【1.3】【后端】魔族法宝副本修改(属性刷新修改)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py |   52 +++++++++++++++++++++++++++-------------------------
 1 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
index b5f88c4..a228d01 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
@@ -507,8 +507,8 @@
         treasureIpyData = ipyDataMgr.GetTreasureByIndex(i)
         magicWeaponID = treasureIpyData.GetID()
         isActive = GetIsActiveMagicWeapon(curPlayer, magicWeaponID)
-        if not isActive:
-            continue
+#        if not isActive:
+#            continue
         allAttrDict = {}
         #=======================================================================
         # #铸炼属性
@@ -519,29 +519,31 @@
         #    GameWorld.AddDictValue(allAttrDict, attrDict)
         #=======================================================================
         treasureType = treasureIpyData.GetTreasureType()
-        #等级属性
-        curMWLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponLV % magicWeaponID)
-        for lv in xrange(curMWLV+1):
-            upIpyData = IpyGameDataPY.GetIpyGameDataNotLog('TreasureUp', magicWeaponID, lv)
-            if upIpyData:
-                attrDict = upIpyData.GetAddAttr()
-                GameWorld.AddDictValue(allAttrDict, attrDict)
-                
-        if magicWeaponID == signDayMWID:
-            #签到属性
-            totalSignNum = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TotalSignNum) # 总签到天数
-            addAttr = {}
-            for attid, attnum in IpyGameDataPY.GetFuncEvalCfg('MWSignDayAttr', 1, {}).items():
-                addAttr[int(attid)] = attnum * totalSignNum
-            GameWorld.AddDictValue(allAttrDict, addAttr)
-        fbpasslv = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWFBPassLevel % magicWeaponID)
-        if fbpasslv: #副本关卡属性
-            fbipyData = IpyGameDataPY.GetIpyGameData('MagicWeaponFB', magicWeaponID, fbpasslv)
-            if fbipyData:
-                attrDict = fbipyData.GetAttrDict()
-                for effID, value in attrDict.items():
-                    effID = int(effID)
-                    allAttrDict[effID] = allAttrDict.get(effID, 0) + value
+        if isActive:
+            #等级属性
+            curMWLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponLV % magicWeaponID)
+            for lv in xrange(curMWLV+1):
+                upIpyData = IpyGameDataPY.GetIpyGameDataNotLog('TreasureUp', magicWeaponID, lv)
+                if upIpyData:
+                    attrDict = upIpyData.GetAddAttr()
+                    GameWorld.AddDictValue(allAttrDict, attrDict)
+                    
+            if magicWeaponID == signDayMWID:
+                #签到属性
+                totalSignNum = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TotalSignNum) # 总签到天数
+                addAttr = {}
+                for attid, attnum in IpyGameDataPY.GetFuncEvalCfg('MWSignDayAttr', 1, {}).items():
+                    addAttr[int(attid)] = attnum * totalSignNum
+                GameWorld.AddDictValue(allAttrDict, addAttr)
+        else:
+            fbpasslv = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWFBPassLevel % magicWeaponID)
+            if fbpasslv: #副本关卡属性
+                fbipyData = IpyGameDataPY.GetIpyGameData('MagicWeaponFB', magicWeaponID, fbpasslv)
+                if fbipyData:
+                    attrDict = fbipyData.GetAttrDict()
+                    for effID, value in attrDict.items():
+                        effID = int(effID)
+                        allAttrDict[effID] = allAttrDict.get(effID, 0) + value
                 
                 
         for effID, value in allAttrDict.items():

--
Gitblit v1.8.0