From c5b0df325fe592a22c885a313eee2219d2ae54b5 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 04 六月 2019 20:21:57 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 被动触发被动的处理
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 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..fb1f598 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
@@ -29,6 +29,9 @@
import SkillCommon
import SkillShell
import PlayerSuccess
+import DataRecordPack
+import PlayerWeekParty
+import ItemControler
import time
@@ -64,6 +67,8 @@
# 设置成功后才能刷技能
PassiveBuffEffMng.PlayerDogzSkill(curPlayer)
+ if not isFight:
+ DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_Dogz, {'dogzID':dogzID})
return
@@ -108,7 +113,7 @@
for equipIndex in equipIndexList:
dogzItemPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzItem)
curEquip = dogzItemPack.GetAt(equipIndex)
- if not ItemCommon.CheckItemCanUse(curEquip):
+ if not ItemCommon.CheckItemCanUse(curEquip) or ItemControler.GetIsAuctionItem(curEquip):
GameWorld.DebugLog("物品为空或不可用: equipIndex=%s" % equipIndex, playerID)
continue
if not ItemCommon.GetIsDogzEquip(curEquip):
@@ -138,8 +143,12 @@
continue
destEquip = dogzEquipPack.GetAt(equipPackIndex)
+ desItemID, desUserData = [0, ''] if destEquip.IsEmpty() else [destEquip.GetItemTypeID(), destEquip.GetUserData()]
+ srcItemID, srcUserData = curEquip.GetItemTypeID(), curEquip.GetUserData()
if ItemCommon.DoLogicSwitchItem(curPlayer, curEquip, destEquip, ShareDefine.rptDogzEquip):
succIndexList.append(equipIndex)
+ dataDict = {'dotype':'EquipDogzItem', 'desItemID':desItemID, 'desUserData':desUserData,'srcItemID':srcItemID,'srcUserData':srcUserData}
+ DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_EquipChange, dataDict)
GameWorld.DebugLog(" 穿戴成功索引列表: %s" % succIndexList, playerID)
if not succIndexList:
@@ -284,6 +293,7 @@
GameWorld.DebugLog("神兽有装备未穿戴，无法助战！dogzID=%s,packIndex=%s" % (dogzID, i), playerID)
return
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DogzBattle, 1, [dogzID])
+ PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Dogz, dogzID, False)
isFight = True if batteState else False
GameWorld.DebugLog("神兽助战状态变更！dogzID=%s,isFight=%s" % (dogzID, isFight), playerID)
@@ -293,10 +303,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 +346,7 @@
GameWorld.DebugLog("购买神兽助战位! updBuyCount=%s" % updBuyCount, playerID)
Sync_DogzInfo(curPlayer)
+ PlayerControl.WorldNotify(0, "DogzNumberUp", [curPlayer.GetPlayerName(), needItemID, curHelpFightCount + 1])
return
@@ -508,6 +520,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 +553,8 @@
if curEquip.IsEmpty():
continue
+ equipScoreTotal += ItemCommon.GetEquipGearScore(curEquip)
+
#itemID = curEquip.GetItemTypeID()
# 装备基础属性
for effIndex in xrange(curEquip.GetEffectCount()):
@@ -548,8 +565,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 +578,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 +608,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