From bbc28bb827a5b52ed7a3c35b153c5d444062eca9 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期一, 01 七月 2019 15:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan
---
System/MainInterfacePanel/TaskModel.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/System/MainInterfacePanel/TaskModel.cs b/System/MainInterfacePanel/TaskModel.cs
index a21ef56..05c7fde 100644
--- a/System/MainInterfacePanel/TaskModel.cs
+++ b/System/MainInterfacePanel/TaskModel.cs
@@ -1393,12 +1393,11 @@
}
}
- private PackModel m_PlayerBackModel;
- private PackModel PlayerBackModel
+ private PackModel packModel
{
get
{
- return m_PlayerBackModel ?? (m_PlayerBackModel = ModelCenter.Instance.GetModel<PackModel>());
+ return ModelCenter.Instance.GetModel<PackModel>();
}
}
@@ -1410,17 +1409,17 @@
{
yield break;
}
- while (_hero.SkillMgr.CurCastSkill != null &&
+ while (_hero != null && _hero.SkillMgr.CurCastSkill != null &&
_hero.SkillMgr.CurCastSkill.SkillCompelete == false)
{
yield return null;
}
- yield return WaitingForSecondConst.WaitMS500;
-
- var _singleModel = PlayerBackModel.GetSinglePack(PackType.Equip);
- // 濡傛灉鏈夊畧鎶�, 鍒欎笉鎷惧彇
- var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.Guard);
+ yield return WaitingForSecondConst.WaitMS500;
+
+ // 濡傛灉鏈夊畧鎶�, 鍒欎笉鎷惧彇
+ var equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.Guard));
+ var _itemModel = packModel.GetItemByIndex(PackType.Equip, equipIndex);
if (_itemModel == null || !GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))
{
float _chkDistanceSqrt;
--
Gitblit v1.8.0