From e84f8a63b4d3bd8ee4722f6bb8f40865f09d967c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 22 一月 2019 20:29:31 +0800
Subject: [PATCH] 5931 【后端】【1.5.100】诛仙装备开发(套装属性、诛仙背包整理、装备总评分、穿戴绑定)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
index 0de7a49..8d5137f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
@@ -30,6 +30,7 @@
 import IPY_GameWorld
 import OpenServerCampaign
 import DataRecordPack
+import PlayerWeekParty
 
 g_runeLVExpDict = {}
 
@@ -134,6 +135,9 @@
         qualityPerDict = IpyGameDataPY.GetFuncEvalCfg(keyStr, 2, {})
         if itemColor in qualityPerDict:
             value *= float(qualityPerDict[itemColor])
+        extraValueDict = IpyGameDataPY.GetFuncEvalCfg(keyStr, 4, {})
+        value += extraValueDict.get(itemColor, 0)
+        
         if isSpecial:
             specialPer = IpyGameDataPY.GetFuncCfg(keyStr, 3)
             if specialPer:
@@ -202,21 +206,10 @@
 
 ## 获取符印是否已解锁
 def GetIsOpenByRuneID(curPlayer, itemid):
-    itemData = GameWorld.GetGameData().GetItemByTypeID(itemid)
-    if not itemData:
-        return
-    curPassLV = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_TrialTower_PassLV)
-    curEff = itemData.GetEffectByIndex(0)
-    curRuneType = curEff.GetEffectID()
-    floorCnt = IpyGameDataPY.GetFuncCfg('TowerRuneType', 2)
-    towerRuneTypeDict = IpyGameDataPY.GetFuncEvalCfg('TowerRuneType')
-    floorList = [int(i) for i in towerRuneTypeDict]
-    floorList.sort()
-    for floor in floorList:
-        typeList = towerRuneTypeDict[str(floor)]
-        if curRuneType in typeList:
-            floorkey = (int(floor) - 1)*100+ floorCnt if int(floor) > 1 else 0
-            return curPassLV >= floorkey
+    ipyData = GetRuneIpyData(itemid)
+    if ipyData:
+        curPassLV = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_TrialTower_PassLV)
+        return curPassLV >= ipyData.GetTowerID()
     # 没配置限制层数解锁的默认解锁
     return True
 
@@ -407,6 +400,7 @@
         runeItemPlusLV = ItemControler.GetRuneItemPlusLV(runeData) + 1 #客户端1开始
         totalLV += runeItemPlusLV
         PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_InlayRune, 1, [itemColor])
+        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Rune, itemColor, False)
     PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_RuneLvUp, totalLV)
     # 开服活动数据
     OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RuneLV, totalLV)
@@ -605,7 +599,11 @@
         ItemCommon.DelVPackItem(curPlayer, ShareDefine.rptRune, indexList1, ChConfig.ItemDel_Rune)
     if indexList2:
         for index in indexList2:
+            srcRuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % index, 0)
             PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_Data % index, 0)
+            dataDict = {'doType':'RuneCompound', 'srcRuneData':srcRuneData, 'desRuneData':0}
+            DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_Rune, dataDict)
+            
         Sync_RuneInfo(curPlayer)
         RefreshRuneAttr(curPlayer)
         PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()

--
Gitblit v1.8.0