From 999d67cffaf12233b98103b513309d5a3a8b6311 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 15 十一月 2018 16:17:48 +0800
Subject: [PATCH] 2357 【主干】仙盟boss被击杀后，其他玩家进入副本，评级显示错误
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
index 0a68d1a..79917ff 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
@@ -293,10 +293,11 @@
if isFight and ipyData.GetHelpBattleNotify():
curTime = int(time.time())
+ playerName = curPlayer.GetPlayerName()
notifyKey, notifyParamList, notifyCD = ipyData.GetHelpBattleNotify()
lastNotifyTime = g_helpBattleNotifyTimeDict.get(dogzID, 0)
if curTime - lastNotifyTime >= notifyCD * 60:
- PlayerControl.WorldNotify(0, notifyKey, notifyParamList)
+ PlayerControl.WorldNotify(0, notifyKey, [playerName] + notifyParamList)
g_helpBattleNotifyTimeDict[dogzID] = curTime
return
@@ -335,6 +336,7 @@
GameWorld.DebugLog("购买神兽助战位! updBuyCount=%s" % updBuyCount, playerID)
Sync_DogzInfo(curPlayer)
+ PlayerControl.WorldNotify(0, "DogzNumberUp", [curPlayer.GetPlayerName(), needItemID, curHelpFightCount + 1])
return
@@ -508,6 +510,9 @@
totalPlusLv = 0 #出战神兽装备总强化等级
fightPowerEx = 0
allAttrList = [{} for _ in range(4)]
+ allAttrListEquip = [{} for _ in range(4)]
+ allAttrListEquipPlus = [{} for _ in range(4)]
+ equipScoreTotal = 0 #为解决装备评分、战力不一致的情况，装备战力改为由评分作为参数计算战力
dogzEquipPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzEquip)
equipPackCount = dogzEquipPack.GetCount()
@@ -538,6 +543,8 @@
if curEquip.IsEmpty():
continue
+ equipScoreTotal += ItemCommon.GetEquipGearScore(curEquip)
+
#itemID = curEquip.GetItemTypeID()
# 装备基础属性
for effIndex in xrange(curEquip.GetEffectCount()):
@@ -548,8 +555,8 @@
if not effID or effID == ChConfig.Def_Effect_DogzEquipPlusExp:
continue
effValue = curEffect.GetEffectValue(0)
- PlayerControl.CalcAttrDict_Type(effID, effValue, allAttrList)
- #GameWorld.DebugLog(" 装备基础: itemID=%s,effID=%s,effValue=%s, %s" % (itemID, effID, effValue, allAttrList))
+ PlayerControl.CalcAttrDict_Type(effID, effValue, allAttrListEquip)
+ #GameWorld.DebugLog(" 装备基础: itemID=%s,effID=%s,effValue=%s, %s" % (itemID, effID, effValue, allAttrListEquip))
# 强化属性
curPlusLV = curEquip.GetUserAttrByIndex(ShareDefine.Def_IudetDogzEquipPlus, 0)
@@ -561,18 +568,25 @@
if plusAttrTypeList and len(plusAttrTypeList) == len(plusAttrValueList):
for plusIndex, plusAttrID in enumerate(plusAttrTypeList):
plusAttrValue = plusAttrValueList[plusIndex]
- PlayerControl.CalcAttrDict_Type(plusAttrID, plusAttrValue, allAttrList)
- #GameWorld.DebugLog(" 装备强化: itemID=%s,plusAttrID=%s, plusAttrValue=%s, %s" % (itemID, plusAttrID, plusAttrValue, allAttrList))
+ PlayerControl.CalcAttrDict_Type(plusAttrID, plusAttrValue, allAttrListEquipPlus)
+ #GameWorld.DebugLog(" 装备强化: itemID=%s,plusAttrID=%s, plusAttrValue=%s, %s" % (itemID, plusAttrID, plusAttrValue, allAttrListEquipPlus))
# 传奇属性
- ChEquip.CalcAttr_LegendAttr(curPlayer, curEquip, allAttrList)
- #GameWorld.DebugLog(" 装备传奇: itemID=%s,%s" % (itemID, allAttrList))
+ ChEquip.CalcAttr_LegendAttr(curPlayer, curEquip, allAttrListEquip)
+ #GameWorld.DebugLog(" 装备传奇: itemID=%s,%s" % (itemID, allAttrListEquip))
# 附加战力
fightPowerEx += ipyData.GetFightPowerEx()
# 保存计算值
PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_Dogz, allAttrList)
+ PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_DogzEquip, allAttrListEquip)
+ PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_DogzEquipPlus, allAttrListEquipPlus)
+
+ #计算装备基础属性附加战力 (目前组成: 评分战力 + ...)
+ equipFightPowerEx = eval(IpyGameDataPY.GetFuncCompileCfg("FightpowerFormula", 2))
+ #GameWorld.DebugLog("神兽装备评分战力: equipScoreTotal=%s,equipFightPowerEx=%s" % (equipScoreTotal, equipFightPowerEx))
+ fightPowerEx += equipFightPowerEx
curPlayer.SetDict(ChConfig.Def_PlayerKey_MFPEx % ShareDefine.Def_MFPType_Dogz, fightPowerEx)
# 技能属性，从Def_CalcAttrFunc_Dogz获取
@@ -584,6 +598,27 @@
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DogzEquipPlus, totalPlusLv)
return
+def GetFightDogzTotalPlusLv(curPlayer):
+ #出战的神兽装备总强化等级
+ totalPlusLv = 0
+ dogzEquipPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzEquip)
+ equipPackCount = dogzEquipPack.GetCount()
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for dogzIndex in xrange(ipyDataMgr.GetDogzCount()):
+ if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_DogzFightState, dogzIndex):
+ continue
+ ipyData = ipyDataMgr.GetDogzByIndex(dogzIndex)
+ dogzID = ipyData.GetDogzID()
+ startIndex = (dogzID - 1) * DogzEquipCount
+ for equipIndex in range(startIndex, startIndex + DogzEquipCount):
+ if equipIndex < 0 or equipIndex >= equipPackCount:
+ break
+ curEquip = dogzEquipPack.GetAt(equipIndex)
+ if curEquip.IsEmpty():
+ continue
+ curPlusLV = curEquip.GetUserAttrByIndex(ShareDefine.Def_IudetDogzEquipPlus, 0)
+ totalPlusLv += curPlusLV
+ return totalPlusLv
# 助战神兽技能属性，必须在 SetDogzIsHelpFight后调用
def CalcDogzBattleSkillAttr(curPlayer):
--
Gitblit v1.8.0