From a37eb96d6acab1cee41fbaba5010285099ee0ae7 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 02 七月 2019 16:52:23 +0800
Subject: [PATCH] 7724 【后端】【主干】分解获得仙丹材料的体验优化

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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..672e994 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
@@ -41,6 +41,7 @@
 import CalcNoLineEffect
 import CrossPlayerData
 import CalcLineEffect
+import PlayerActivity
 
 import random
 import math
@@ -106,7 +107,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)
     
@@ -371,6 +371,7 @@
     
     #记录出战的宠物索引 默认+1 0则代表没有
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FightPetIndex, petItemIndex + 1)
+    rolePet.SetSightLevel(curPlayer.GetSightLevel())
     return True
 
 def AutoSummonPet(curPlayer):
@@ -485,7 +486,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 +540,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 +626,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
@@ -710,7 +709,9 @@
             #广播
             sysMark = sysMarkList[i] if i < len(sysMarkList) else 'PetUpLv'
             PlayerControl.WorldNotify(0, sysMark, [playerName, petNPCID, limitPetClassLV, skillid])
-
+            #增加升级活跃点效果
+            PlayerActivity.AddActivityByLVOnLearnSkill(curPlayer, skillid)
+            
         if not learnSkillList and updClassLV + 1 == maxClassLV:
             PlayerControl.WorldNotify(0, 'PetUpLvMax', [playerName, petNPCID])
         # 如果是当前出战的宠物, 则该宠物学习技能

--
Gitblit v1.8.0