From b4c0ef42fb938ace44bd616294384c19d084af2c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 24 十二月 2018 16:06:56 +0800
Subject: [PATCH] 5367 【前端】【1.4】聚魂功能开发（聚魂替换规则修改）
---
System/GatheringSoul/GatherSoulWin.cs | 9 ++++++---
System/GatheringSoul/GatheringSoulModel.cs | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/System/GatheringSoul/GatherSoulWin.cs b/System/GatheringSoul/GatherSoulWin.cs
index ab0ded9..ef46062 100644
--- a/System/GatheringSoul/GatherSoulWin.cs
+++ b/System/GatheringSoul/GatherSoulWin.cs
@@ -26,8 +26,11 @@
[SerializeField] Button m_Resolve;
[SerializeField] Button m_ViewProperty;
[SerializeField] Image m_DustIcon;
+ [SerializeField] Transform m_DustRaycast;
[SerializeField] Image m_SplintersIcon;
+ [SerializeField] Transform m_SplintersRaycast;
[SerializeField] Image m_CoreIcon;
+ [SerializeField] Transform m_CoreRaycast;
VirtualPackModel virtualPack
@@ -59,15 +62,15 @@
m_GotoCompose.onClick.AddListener(GotoCompose);
m_Resolve.onClick.AddListener(Resolve);
m_ViewProperty.onClick.AddListener(ViewProperty);
- UIEventTrigger.Get(m_DustIcon.gameObject).OnDown = (GameObject go) =>
+ UIEventTrigger.Get(m_DustRaycast.gameObject).OnDown = (GameObject go) =>
{
ViewMoneyType(GatheringSoulModel.SOULDUST_MONEYTYPE, m_DustIcon.transform as RectTransform);
};
- UIEventTrigger.Get(m_SplintersIcon.gameObject).OnDown = (GameObject go) =>
+ UIEventTrigger.Get(m_SplintersRaycast.gameObject).OnDown = (GameObject go) =>
{
ViewMoneyType(GatheringSoulModel.SOULSPLINTERS_MONEYTYPE, m_SplintersIcon.transform as RectTransform);
};
- UIEventTrigger.Get(m_CoreIcon.gameObject).OnDown = (GameObject go) =>
+ UIEventTrigger.Get(m_CoreRaycast.gameObject).OnDown = (GameObject go) =>
{
ViewMoneyType(GatheringSoulModel.SOULCORE_MONEYTYPE, m_CoreIcon.transform as RectTransform);
};
diff --git a/System/GatheringSoul/GatheringSoulModel.cs b/System/GatheringSoul/GatheringSoulModel.cs
index 21da423..c3a7485 100644
--- a/System/GatheringSoul/GatheringSoulModel.cs
+++ b/System/GatheringSoul/GatheringSoulModel.cs
@@ -863,7 +863,7 @@
SendEquipPack((int)PackType.rptGatherSoul, item.index, (int)PackType.rptInterimPack, tryEquipHole);
}
}
- if (item.itemType == GATHERSOUL_CORE_TYPE)
+ else if (item.itemType == GATHERSOUL_CORE_TYPE)
{
GatherSoulItem holeItem;
if (TryGetItem(coreHole, out holeItem))
--
Gitblit v1.8.0