From d10eb06e8d935a453ad85dc359eab2d8401b2ba9 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 06 十二月 2018 10:31:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/GameActor/GA_Player.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Fight/GameActor/GA_Player.cs b/Fight/GameActor/GA_Player.cs
index 37a16c3..f3181a6 100644
--- a/Fight/GameActor/GA_Player.cs
+++ b/Fight/GameActor/GA_Player.cs
@@ -110,7 +110,11 @@
}
else if (_equipInfo.Place == (int)RoleEquipType.retSpiritAnimal)
{
- SwitchGuard(_equipInfo.ItemID);
+ var _index = BattleEffectPlayRule.Instance.GetIndex(ServerInstID);
+ if (_index != -1 && _index < BattleEffectPlayRule.Instance.petLimit)
+ {
+ SwitchGuard(_equipInfo.ItemID);
+ }
serverGuardId = (int)_equipInfo.ItemID;
}
else if (_equipInfo.Place == (int)RoleEquipType.mount)
@@ -185,9 +189,9 @@
public override void ChangeEquip(EquipInfo equipInfo)
{
// 浼犲叆ID涓�0浠ｈ〃鑴变笅浜嗚澶�
- if(equipInfo.itemID == 0 && equipInfo.place != 0)
+ if (equipInfo.itemID == 0 && equipInfo.place != 0)
{
- if(m_EquipDict.ContainsKey(equipInfo.place))
+ if (m_EquipDict.ContainsKey(equipInfo.place))
{
m_EquipDict.Remove(equipInfo.place);
}
--
Gitblit v1.8.0