From 2362341e2a9f8467408ac4b99e1108ace98036fa Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 20 八月 2018 20:13:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
index 6308b40..e79aeea 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
@@ -455,7 +455,8 @@
ItemCommon.ReduceItem(curPlayer, itemPack, itemList, needItemCnt, False, ChConfig.ItemDel_Pet)
EventShell.EventRespons_OnActivatePet(curPlayer, petNPCID)
- PlayerControl.WorldNotify(0, 'GetPet', [curPlayer.GetName(), petNPCID])
+ sysMark = ipyData.GetUnlockSys() or 'GetPet'
+ PlayerControl.WorldNotify(0, sysMark, [curPlayer.GetName(), petNPCID])
rolePet = curPlayer.GetPetMgr().GetFightPet()
if not rolePet:
petItemIndex = GetPetDataItemIndexByNPCID(curPlayer, petNPCID)
@@ -653,6 +654,7 @@
petIpyData = GetPetIpydata(petNPCID)
petSkillList = petIpyData.GetSkillID()
petSkillUnLockList = petIpyData.GetSkillUnLock()
+ sysMarkList = petIpyData.GetSkillUnLockSys()
learnSkillList = []
for i, skillid in enumerate(petSkillList):
limitPetClassLV = petSkillUnLockList[i] # 学习此技能所需宠物阶级
@@ -668,7 +670,8 @@
#被动技能不学
learnSkillList.append(skillid)
#广播
- PlayerControl.WorldNotify(0, 'PetUpLv', [playerName, petNPCID, limitPetClassLV, skillid])
+ sysMark = sysMarkList[i] if i < len(sysMarkList) else 'PetUpLv'
+ PlayerControl.WorldNotify(0, sysMark, [playerName, petNPCID, limitPetClassLV, skillid])
if not learnSkillList and updClassLV + 1 == maxClassLV:
PlayerControl.WorldNotify(0, 'PetUpLvMax', [playerName, petNPCID])
--
Gitblit v1.8.0