From 2e3bfd7836c318ee39e4cdafd33ca2c50d6a7c1d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 19 十二月 2018 13:37:19 +0800
Subject: [PATCH] 5512 子 【开发】【1.4】跨服竞技场 / 【后端】【1.4】跨服竞技场开发 - 跨服接口和新增跨服竞技副本

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 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 efae88c..8880a52 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
@@ -29,6 +29,7 @@
 import PlayerMagicWeapon
 import IPY_GameWorld
 import OpenServerCampaign
+import DataRecordPack
 
 g_runeLVExpDict = {}
 
@@ -133,6 +134,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:
@@ -201,18 +205,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')
-    for floor, typeList in towerRuneTypeDict.items():
-        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
 
@@ -291,11 +287,12 @@
         if emptyIndex == -1:
             GameWorld.DebugLog("符印背包已满,无法摘下! ", curPlayer.GetPlayerID())
             return True
-        
+        desRuneData = 0
         # 摘下设置孔数据为0
         PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_Data % srcRuneNum, 0)
         ItemControler.SetVPackItemKeyData(curPlayer, ShareDefine.rptRune, emptyIndex, srcRuneData)
-    
+    dataDict = {'desBackPack':desBackPack, 'srcRuneData':srcRuneData, 'desRuneData':desRuneData}
+    DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_Rune, dataDict)
     RefreshRuneAttr(curPlayer)
     PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
     Sync_RuneInfo(curPlayer)
@@ -600,7 +597,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()
@@ -611,6 +612,7 @@
     curItem.SetUserAttr(ShareDefine.Def_IudetRuneSource, ChConfig.Item_Source_Compound)
     PlayerItemControler = ItemControler.PlayerItemControler(curPlayer)
     PlayerItemControler.PutInItem(ShareDefine.rptRune, curItem, event=[ChConfig.ItemGive_RuneCompound, False, {'indexList1':indexList1,'indexList2':indexList2}])
+    curPlayer.Sync_MakeItemAnswer(ShareDefine.Def_mitRuneCompound, 1)
     return
 
 

--
Gitblit v1.8.0