From 01e033a79a5ce63e298015d0783560a77ccffea9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 14 九月 2018 11:46:46 +0800
Subject: [PATCH] fix:3543 【后端】【主干】【1.0.15】开服红包优化 每天赠送次数
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..272f7c9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
@@ -303,20 +303,20 @@
PetControl.DoLogic_PlayerPetLearnSkillList(rolePet, learnSkillList)
#---刷新属性(不通知)---
- #GameWorld.DebugLog("刷前: petID=%s,playerID=%s,npcID=%s,BindType=%s,AIMode=%s,PetIndex=%s,petFinalHurtPer=%s,grade=%s,qualLV=%s,"
+ #GameWorld.DebugLog("刷前: petID=%s,playerID=%s,npcID=%s,BindType=%s,AIMode=%s,PetIndex=%s,grade=%s,qualLV=%s,"
# % (petStruct.PetID, petStruct.PlayerID, petStruct.NPCID, petStruct.BindType, petStruct.AIMode, petStruct.PetIndex,
- # rolePet.GetBattleValEx5(), rolePet.GetGrade(), rolePet.GetQualityLV()))
+ # rolePet.GetGrade(), rolePet.GetQualityLV()))
petControl = NPCCommon.NPCControl(rolePet)
petControl.RefreshNPCState(canSyncClient=False)
- #GameWorld.DebugLog("刷后: petID=%s,playerID=%s,npcID=%s,BindType=%s,AIMode=%s,PetIndex=%s,petFinalHurtPer=%s,grade=%s,qualLV=%s,"
+ #GameWorld.DebugLog("刷后: petID=%s,playerID=%s,npcID=%s,BindType=%s,AIMode=%s,PetIndex=%s,grade=%s,qualLV=%s,"
# % (petStruct.PetID, petStruct.PlayerID, petStruct.NPCID, petStruct.BindType, petStruct.AIMode, petStruct.PetIndex,
- # rolePet.GetBattleValEx5(), rolePet.GetGrade(), rolePet.GetQualityLV()))
+ # rolePet.GetGrade(), rolePet.GetQualityLV()))
#当前血量(不通知)
PetControl.SetPetHP(rolePet, rolePet.GetMaxHP(), False)
#---通知客户端---
- rolePet.Sync_PetInfo()
+ #rolePet.Sync_PetInfo()
#刷新技能栏
rolePet.Sync_SkillList()
@@ -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