From 2494fee14a4cadb85ef89e3d4a48ddbe77cb4fea Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 十一月 2019 14:03:33 +0800
Subject: [PATCH] 1111 货币获得、消费流向命名（升星、boss首杀）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 db3034b..a075bef 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
@@ -194,11 +195,11 @@
maxCnt = FBCommon.GetEnterFBMaxCnt(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss)
curPlayerPropDict['CntMark_%s' % ChConfig.Def_FBMapID_ZhuXianBoss] = max(maxCnt - enterCnt, 0)
# 世界BOSS剩余次数
- curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_World] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_World)
+ curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_World] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_World)[0]
# BOSS之家剩余次数
- curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_Home] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Home)
+ curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_Home] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Home)[0]
# 神兽BOSS剩余次数
- curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_Dogz] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Dogz)
+ curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_Dogz] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Dogz)[0]
#-----------
#扩展属性缓存
@@ -219,7 +220,8 @@
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)
@@ -296,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