From 62f26436a4a204a3919ba7fa98319ee72d66a411 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 22 十月 2018 21:11:02 +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 | 156 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 116 insertions(+), 40 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 d919299..a4adcd0 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):
## 获取神兽装备位对应的索引
@@ -82,57 +87,68 @@
#{
# tagHead Head;
# BYTE DogzID; // 神兽ID
-# BYTE EquipIndex; //神兽装备所在神兽背包索引
+# BYTE EquipIndexCount;
+# BYTE EquipIndexList[EquipIndexCount]; //神兽装备所在神兽背包索引列表
#};
def OnDogzEquipItem(index, clientData, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
playerID = curPlayer.GetPlayerID()
dogzID = clientData.DogzID
- equipIndex = clientData.EquipIndex
+ equipIndexList = clientData.EquipIndexList
ipyData = IpyGameDataPY.GetIpyGameData("Dogz", dogzID)
if not ipyData:
return
- dogzItemPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzItem)
- curEquip = dogzItemPack.GetAt(equipIndex)
- if not ItemCommon.CheckItemCanUse(curEquip):
- GameWorld.DebugLog("物品不可用: equipIndex=%s" % equipIndex)
- return
- if not ItemCommon.GetIsDogzEquip(curEquip):
- GameWorld.DebugLog("非神兽装备: equipIndex=%s" % equipIndex)
+ GameWorld.DebugLog("神兽穿戴装备: dogzID=%s,equipIndexList=%s" % (dogzID, equipIndexList), playerID)
+ if not equipIndexList:
return
- equipPlace = curEquip.GetEquipPlace()
- equipPlaceIndex = GetDogzEquipPlaceIndex(equipPlace)
- equipPlaceColorList = ipyData.GetEquipPlaceColorList()
- if equipPlaceIndex < 0 or equipPlaceIndex >= len(equipPlaceColorList):
- GameWorld.ErrLog("神兽装备位异常: equipPlace=%s,equipPlaceIndex=%s" % (equipPlace, equipPlaceIndex))
- return
+ succIndexList = []
+ for equipIndex in equipIndexList:
+ dogzItemPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzItem)
+ curEquip = dogzItemPack.GetAt(equipIndex)
+ if not ItemCommon.CheckItemCanUse(curEquip):
+ GameWorld.DebugLog("物品为空或不可用: equipIndex=%s" % equipIndex, playerID)
+ continue
+ if not ItemCommon.GetIsDogzEquip(curEquip):
+ GameWorld.DebugLog("非神兽装备: equipIndex=%s" % equipIndex, playerID)
+ continue
+
+ equipPlace = curEquip.GetEquipPlace()
+ equipPlaceIndex = GetDogzEquipPlaceIndex(equipPlace)
+ equipPlaceColorList = ipyData.GetEquipPlaceColorList()
+ if equipPlaceIndex < 0 or equipPlaceIndex >= len(equipPlaceColorList):
+ GameWorld.ErrLog("神兽装备位异常: equipIndex=%s,equipPlace=%s,equipPlaceIndex=%s"
+ % (equipIndex, equipPlace, equipPlaceIndex), playerID)
+ continue
+
+ dogzEquipPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzEquip)
+ equipPackIndex = GetDogzEquipPackIndex(dogzID, equipPlaceIndex)
+ if equipPackIndex < 0 or equipPackIndex >= dogzEquipPack.GetCount():
+ GameWorld.ErrLog("神兽装备背包索引异常: dogzID=%s,equipIndex=%s,equipPlace=%s,equipPackIndex=%s"
+ % (dogzID, equipIndex, equipPlace, equipPackIndex), playerID)
+ continue
+
+ equipColor = curEquip.GetItemColor()
+ limitColor = equipPlaceColorList[equipPlaceIndex]
+ if equipColor < limitColor:
+ GameWorld.Log("神兽装备位穿戴颜色限制：dogzID=%s,equipIndex=%s,equipPlaceIndex=%s,limitColor=%s > equipColor=%s"
+ % (dogzID, equipIndex, equipPlaceIndex, limitColor, equipColor), playerID)
+ continue
+
+ destEquip = dogzEquipPack.GetAt(equipPackIndex)
+ if ItemCommon.DoLogicSwitchItem(curPlayer, curEquip, destEquip, ShareDefine.rptDogzEquip):
+ succIndexList.append(equipIndex)
- dogzEquipPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzEquip)
- equipPackIndex = GetDogzEquipPackIndex(dogzID, equipPlaceIndex)
- if equipPackIndex < 0 or equipPackIndex >= dogzEquipPack.GetCount():
- GameWorld.ErrLog("神兽装备背包索引异常: dogzID=%s,equipPlace=%s,equipPackIndex=%s" % (dogzID, equipPlace, equipPackIndex))
- return
-
- equipColor = curEquip.GetItemColor()
- limitColor = equipPlaceColorList[equipPlaceIndex]
- if equipColor < limitColor:
- GameWorld.Log("神兽装备位穿戴颜色限制：dogzID=%s,equipPlaceIndex=%s,limitColor=%s > equipColor=%s"
- % (dogzID, equipPlaceIndex, limitColor, equipColor), playerID)
- return
-
- destEquip = dogzEquipPack.GetAt(equipPackIndex)
- isOK = ItemCommon.DoLogicSwitchItem(curPlayer, curEquip, destEquip, ShareDefine.rptDogzEquip)
- if not isOK:
+ GameWorld.DebugLog(" 穿戴成功索引列表: %s" % succIndexList, playerID)
+ if not succIndexList:
return
# 助战状态换装需要刷属性
if GetDogzIsHelpFight(curPlayer, dogzID):
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
-
return
@@ -207,7 +223,7 @@
# 助战状态换装需要刷属性
if GetDogzIsHelpFight(curPlayer, dogzID):
SetDogzIsHelpFight(curPlayer, dogzID, False) # 因为脱下了状态，所以必须设置为非助战状态
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
return
@@ -223,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
@@ -265,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
@@ -308,6 +336,7 @@
GameWorld.DebugLog("购买神兽助战位! updBuyCount=%s" % updBuyCount, playerID)
Sync_DogzInfo(curPlayer)
+ PlayerControl.WorldNotify(0, "DogzNumberUp", [curPlayer.GetPlayerName(), needItemID, curHelpFightCount + 1])
return
@@ -448,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)
@@ -476,9 +505,9 @@
return retLV, retExp
-def RefreshDogzAttr(curPlayer):
+def RefreshDogzAttr(curPlayer, isUpdateSucc=False):
## 刷新神兽属性
-
+ totalPlusLv = 0 #出战神兽装备总强化等级
fightPowerEx = 0
allAttrList = [{} for _ in range(4)]
@@ -526,6 +555,7 @@
# 强化属性
curPlusLV = curEquip.GetUserAttrByIndex(ShareDefine.Def_IudetDogzEquipPlus, 0)
+ totalPlusLv += curPlusLV
plusIpyData = IpyGameDataPY.GetIpyGameData("DogzEquipPlus", curEquip.GetEquipPlace(), curPlusLV)
if plusIpyData:
plusAttrTypeList = plusIpyData.GetPlusAttrTypes()
@@ -549,8 +579,34 @@
# 技能属性，从Def_CalcAttrFunc_Dogz获取
skillAttrList = CalcDogzBattleSkillAttr(curPlayer)
- PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_HorseSkill, skillAttrList)
+ 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):
@@ -573,6 +629,26 @@
curEffect = curSkill.GetEffect(effectIndex)
SkillShell.CalcBuffEffAttr(curPlayer, curEffect, skillAttrList)
+ # Def_SkillType_AttrSkillNoLearn 非学习属性技能 叠加属性计算
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for i in xrange(ipyDataMgr.GetDogzCount()):
+ ipyData = ipyDataMgr.GetDogzByIndex(i)
+ if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_DogzFightState, i):
+ #未助战
+ continue
+
+ for skillID in ipyData.GetHelpBattleSkills():
+
+ skillData = GameWorld.GetGameData().GetSkillBySkillID(skillID)
+ if not skillData:
+ continue
+ # 同技能类型ID可多个叠加的属性时直接取表
+ if skillData.GetSkillType() != ChConfig.Def_SkillType_AttrSkillNoLearn:
+ continue
+
+ for effectIndex in xrange(skillData.GetEffectCount()):
+ curEffect = skillData.GetEffect(effectIndex)
+ SkillShell.CalcBuffEffAttr(curPlayer, curEffect, skillAttrList)
#GameWorld.DebugLog("神兽技能属性: skillFPEx=%s, %s" % ( skillFPEx, skillAttrList))
return skillAttrList
--
Gitblit v1.8.0