From efb7e570e8aee945dedc80e2be76becca1ea7ba5 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 21 六月 2019 16:43:36 +0800
Subject: [PATCH] 6374 封魔坛、雷罚进入限制

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
index 3df1084..1fdd34e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
@@ -33,6 +33,7 @@
 import ItemCommon
 import PyGameData
 import PlayerTJG
+import SkillShell
 
 import time
 import json
@@ -147,7 +148,7 @@
             itemDict["Stone"] = stoneIDList
             
         #部位洗练数据
-        washLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_EquipWashLV % index) + 1
+        washLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_EquipWashLV % index)
         valueList = []
         for attrNum in xrange(1, Operate_EquipWash.Def_EquipWashMaxAttrCount + 1):
             value = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_EquipWashValue % (index, attrNum))
@@ -173,6 +174,8 @@
     curPlayerPropDict["EquipShowSwitch"] = curPlayer.GetEquipShowSwitch()
     curPlayerPropDict["EquipShowID"] = __GetEquipShowIDList(curPlayer)
     curPlayerPropDict["ServerGroupID"] = PlayerControl.GetPlayerServerGroupID(curPlayer)
+    curPlayerPropDict["LingGenPoint"] = [PlayerControl.GetMetal(curPlayer), PlayerControl.GetWood(curPlayer), PlayerControl.GetWater(curPlayer), 
+                                         PlayerControl.GetFire(curPlayer), PlayerControl.GetEarth(curPlayer)]
     #仙魔之争所需属性
     curPlayerPropDict["MinAtk"] = curPlayer.GetMinAtk()
     curPlayerPropDict["MaxAtk"] = curPlayer.GetMaxAtk()
@@ -210,6 +213,15 @@
             fightPowerDict["%s" % mfpType] = fightPower
     curPlayerPlusDict["FightPowerDict"] = fightPowerDict
     
+    #装备汇总信息
+    curPlayerPlusDict["EquipOrangeCount"] = ChEquip.GetEquipOrangeCount(curPlayer)
+    curPlayerPlusDict["TotalEquipStar"] = ChEquip.GetTotalEquipStars(curPlayer)
+    curPlayerPlusDict["TotalPlusLV"] = ChEquip.GetTotalPlusLV(curPlayer)
+    curPlayerPlusDict["TotalPlusEvolveLV"] = ChEquip.GetTotalPlusEvolveLV(curPlayer)
+    curPlayerPlusDict["TotalStoneLV"] = Operate_EquipStone.GetTotalStoneLV(curPlayer)
+    curPlayerPlusDict["TotalEquipWashLV"] = Operate_EquipWash.GetTotalEquipWashLV(curPlayer)
+    #主动技能总等级
+    curPlayerPlusDict["TotalSkillLV"] = SkillShell.GetAllSkillLV(curPlayer, ChConfig.Def_SkillFuncType_FbSkill)
     #灵宠数据
     curPlayerPlusDict["Pet"] = __GetPetInfo(curPlayer)
     
@@ -286,16 +298,18 @@
 
 ## 符印信息
 def __GetRuneInfo(curPlayer):
-    runeDict = {}
+    #runeDict = {}
+    maxLV = 0
     runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
     for holeNum in xrange(1, runeHoleCnt + 1):
         runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)
         if not runeData:
             continue
-        runeItemID = ItemControler.GetRuneItemID(runeData)
+        #runeItemID = ItemControler.GetRuneItemID(runeData)
         runeItemPlusLV = ItemControler.GetRuneItemPlusLV(runeData)
-        runeDict[holeNum] = [runeItemID, runeItemPlusLV]
-    return len(runeDict)
+        #runeDict[holeNum] = [runeItemID, runeItemPlusLV]
+        maxLV += runeItemPlusLV
+    return maxLV
 
 ## 法宝信息
 def __GetMagicWeaponInfo(curPlayer):

--
Gitblit v1.8.0