From 7e061666ff94ee05d08028ab0e4ac41afd3d4419 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 07 十一月 2018 11:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 14 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 cd9df55..79917ff 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
@@ -28,6 +28,9 @@
import PassiveBuffEffMng
import SkillCommon
import SkillShell
+import PlayerSuccess
+
+import time
'''
神兽编号: 1~20，上线后不可修改
@@ -39,6 +42,8 @@
'''
DogzEquipCount = 5 # 神兽装备位数量，固定5个，策划说打死也不改
+
+g_helpBattleNotifyTimeDict = {} # 助战广播时间记录 {神兽ID:广播time, ...}
def GetDogzEquipPlaceIndex(equipPlace):
## 获取神兽装备位对应的索引
@@ -142,9 +147,8 @@
# 助战状态换装需要刷属性
if GetDogzIsHelpFight(curPlayer, dogzID):
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
-
return
@@ -219,7 +223,7 @@
# 助战状态换装需要刷属性
if GetDogzIsHelpFight(curPlayer, dogzID):
SetDogzIsHelpFight(curPlayer, dogzID, False) # 因为脱下了状态，所以必须设置为非助战状态
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
return
@@ -235,6 +239,8 @@
# BYTE BatteState; //助战状态，0-召回，1-助战
#};
def OnDogzBattleStateChange(index, clientData, tick):
+ global g_helpBattleNotifyTimeDict
+
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
playerID = curPlayer.GetPlayerID()
dogzID = clientData.DogzID
@@ -277,12 +283,22 @@
if curItem.IsEmpty():
GameWorld.DebugLog("神兽有装备未穿戴，无法助战！dogzID=%s,packIndex=%s" % (dogzID, i), playerID)
return
-
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DogzBattle, 1, [dogzID])
+
isFight = True if batteState else False
GameWorld.DebugLog("神兽助战状态变更！dogzID=%s,isFight=%s" % (dogzID, isFight), playerID)
SetDogzIsHelpFight(curPlayer, dogzID, isFight)
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
+
+ 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, [playerName] + notifyParamList)
+ g_helpBattleNotifyTimeDict[dogzID] = curTime
return
@@ -320,6 +336,7 @@
GameWorld.DebugLog("购买神兽助战位! updBuyCount=%s" % updBuyCount, playerID)
Sync_DogzInfo(curPlayer)
+ PlayerControl.WorldNotify(0, "DogzNumberUp", [curPlayer.GetPlayerName(), needItemID, curHelpFightCount + 1])
return
@@ -460,7 +477,7 @@
% (curPlusLV, curPlusExpTotal, addExpTotal, updPlusLV, updPlusExpTotal), playerID)
if isRefreshAtrr:
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
curPlayer.Sync_MakeItemAnswer(ShareDefine.Def_mitDogzEquipPlus, 1)
@@ -488,11 +505,14 @@
return retLV, retExp
-def RefreshDogzAttr(curPlayer):
+def RefreshDogzAttr(curPlayer, isUpdateSucc=False):
## 刷新神兽属性
-
+ 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()
@@ -523,6 +543,8 @@
if curEquip.IsEmpty():
continue
+ equipScoreTotal += ItemCommon.GetEquipGearScore(curEquip)
+
#itemID = curEquip.GetItemTypeID()
# 装备基础属性
for effIndex in xrange(curEquip.GetEffectCount()):
@@ -533,11 +555,12 @@
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)
+ totalPlusLv += curPlusLV
plusIpyData = IpyGameDataPY.GetIpyGameData("DogzEquipPlus", curEquip.GetEquipPlace(), curPlusLV)
if plusIpyData:
plusAttrTypeList = plusIpyData.GetPlusAttrTypes()
@@ -545,25 +568,57 @@
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获取
skillAttrList = CalcDogzBattleSkillAttr(curPlayer)
PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_DogzBattleSkill, skillAttrList)
+ #成就
+ if isUpdateSucc:
+ PlayerSuccess.ResetSuccessByType(curPlayer, ShareDefine.SuccType_DogzEquipPlus)
+ 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