From 22c0a62a2b77f5e9fff6faa1164216d310e73404 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 22 五月 2019 11:04:03 +0800
Subject: [PATCH] 6501 任务状态通知后再触发功能开启
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py | 5 +----
1 files changed, 1 insertions(+), 4 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 bafdac8..9636f84 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
@@ -106,7 +106,6 @@
if not newPetItem:
return
- newPetItem.SetIsBind(True)
newPetItem.SetUserAttr(ShareDefine.Def_IudetPet_NPCID, petNPCID)
newPetItem.SetUserAttr(ShareDefine.Def_IudetPet_State, ShareDefine.Def_PetState_Null)
@@ -485,7 +484,6 @@
if not ItemControler.PlayerItemControler(curPlayer).PutInItem(petPackIndex, newPetItem):
return
- PlayerMagicWeapon.SetMWPrivilegeData(curPlayer, ChConfig.MWPrivilege_Pet, len(GetActivePetID(curPlayer)))
ItemCommon.ReduceItem(curPlayer, itemPack, itemList, needItemCnt, False, ChConfig.ItemDel_Pet)
EventShell.EventRespons_OnActivatePet(curPlayer, petNPCID)
@@ -540,7 +538,6 @@
if not ItemControler.PlayerItemControler(curPlayer).PutInItem(petPackIndex, newPetItem):
return
- PlayerMagicWeapon.SetMWPrivilegeData(curPlayer, ChConfig.MWPrivilege_Pet, len(GetActivePetID(curPlayer)))
SetPetSkillFightPower(curPlayer) # 技能战力重算
petItemIndex = GetPetDataItemIndexByNPCID(curPlayer, petNPCID)
DoChangePetState(curPlayer, petItemIndex, ShareDefine.Def_PetState_Fight)
@@ -627,7 +624,7 @@
for itemIndex in itemIndexList:
curItem = curItemPack.GetAt(itemIndex)
#检查物品
- if not ItemCommon.CheckItemCanUse(curItem):
+ if not ItemCommon.CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):
continue
itemCnt = curItem.GetCount()
nowCnt += itemCnt
--
Gitblit v1.8.0