From e082d496795bd07657a81714bab4a5a63446e397 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 12 四月 2019 16:41:10 +0800
Subject: [PATCH] 6491 子 【2.0】【开发】打宝界面和境界压制调整 / 【2.0】【后端】打宝界面和境界压制调整

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py |   41 +++--------------------------------------
 1 files changed, 3 insertions(+), 38 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 8880a52..d08833e 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 = {}
 
@@ -37,42 +38,6 @@
 # @param curPlayer 玩家
 # @return None
 def PlayerRuneLogin(curPlayer):
-    if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_RuneSource):
-        GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_RuneSource, 1)
-        runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
-        for RuneNum in xrange(1, runeHoleCnt + 1):
-            RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % RuneNum, 0)
-            if not RuneData:
-                continue
-            RuneItemID = ItemControler.GetRuneItemID(RuneData)
-            ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)
-            if not ipyData:
-                continue
-            RuneSource = ItemControler.GetRuneItemSource(RuneData)
-            if RuneSource != ChConfig.Item_Source_Compound:
-                RuneItemPlusLV = ItemControler.GetRuneItemPlusLV(RuneData)
-                RuneIsLock = ItemControler.GetRuneItemIsLock(RuneData)
-                updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV, RuneIsLock, ChConfig.Item_Source_Compound)
-                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_Data % RuneNum, updRuneData)
-                GameWorld.Log('上线修复双属性符印来源 RuneNum=%s,oldRuneData=%s,updRuneData=%s'%(RuneNum, RuneData, updRuneData))
-        packIndex = ShareDefine.rptRune
-        for place in xrange(ItemCommon.GetVPackCnt(packIndex)):
-            RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_VPackItem % (packIndex, place))
-            if not RuneData:
-                continue
-            RuneItemID = ItemControler.GetRuneItemID(RuneData)
-            ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)
-            if not ipyData:
-                continue
-            RuneSource = ItemControler.GetRuneItemSource(RuneData)
-            if RuneSource != ChConfig.Item_Source_Compound:
-                RuneItemPlusLV = ItemControler.GetRuneItemPlusLV(RuneData)
-                RuneIsLock = ItemControler.GetRuneItemIsLock(RuneData)
-                updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV, RuneIsLock, ChConfig.Item_Source_Compound)
-                ItemControler.SetVPackItemKeyData(curPlayer, ShareDefine.rptRune, place, updRuneData)
-                GameWorld.Log('上线修复双属性符印来源 place=%s,oldRuneData=%s,updRuneData=%s'%(place, RuneData, updRuneData))
-    
-    
     DoUnlockRuneHole(curPlayer, False)
     Sync_RuneInfo(curPlayer)
     return
@@ -399,6 +364,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)
@@ -426,8 +392,7 @@
     totalMJ = 0
     packIndex = ShareDefine.rptRune
     placeList = xrange(ItemCommon.GetVPackCnt(packIndex)) if (isAll or clientData.QualityCnt > 0) else clientData.PlaceIndexList
-    wmpIpyData = PlayerMagicWeapon.GetMagicWeaponPrivilege(curPlayer, ChConfig.MWPrivilege_RuneDecompose)
-    addPer = int(wmpIpyData.GetEffectValue()) if wmpIpyData else 0
+    addPer = 0
     for place in placeList:
         RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_VPackItem % (packIndex, place))
         if not RuneData:

--
Gitblit v1.8.0