From 4ba12b5ea8513673294833f327aef805efc158f0 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 19 二月 2019 11:47:26 +0800
Subject: [PATCH] Merge branch 'ClearUp'
---
System/FairyAu/FairyGrabBossBehaviour.cs | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/System/FairyAu/FairyGrabBossBehaviour.cs b/System/FairyAu/FairyGrabBossBehaviour.cs
index 69b4489..de2200c 100644
--- a/System/FairyAu/FairyGrabBossBehaviour.cs
+++ b/System/FairyAu/FairyGrabBossBehaviour.cs
@@ -7,11 +7,8 @@
namespace Snxxz.UI
{
- public class FairyGrabBossBehaviour : ScrollItem
+ public class FairyGrabBossBehaviour : AutoSelectScrollItem
{
- [SerializeField] AutoSelectCyclicScroll m_Scroll;
- [SerializeField] SmoothMask m_SmoothMask;
- [SerializeField] RectTransform m_CenterSign;
[SerializeField] RectTransform m_ContainerSelect;
[SerializeField] RectTransform m_ContainerKilling;
[SerializeField] RectTransform m_ContainerKilled;
@@ -20,6 +17,8 @@
[SerializeField] Text m_MapName;
[SerializeField] Text m_BossType;
[SerializeField] Text m_BossName;
+ [SerializeField] protected Material m_NormalMaterial;
+ [SerializeField] protected Material m_GrayMaterial;
[SerializeField] Image m_RealmIcon;
[SerializeField] Text m_Progress;
[SerializeField] Button m_Select;
@@ -34,7 +33,7 @@
private void SelectBoss()
{
- m_Scroll.TrySelectData(bossId);
+ autoSelectScroll.TrySelectData(bossId);
}
public override void Display(object _data)
@@ -129,17 +128,15 @@
}
m_ContainerKilled.gameObject.SetActive(killed && opened);
m_ContainerKilling.gameObject.SetActive(!killed && opened);
- m_BossPortrait.material = opened && !killed ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];
+ m_BossPortrait.material = opened && !killed ? m_NormalMaterial : m_GrayMaterial;
m_ContainerMapName.gameObject.SetActive(!opened);
}
-
-
protected virtual void LateUpdate()
{
- if (m_Scroll.autoSelectable && model.selectBoss != bossId && bossId > 0)
+ if (autoSelectScroll.autoSelectable && model.selectBoss != bossId && bossId > 0)
{
- if (Mathf.Abs(m_CenterSign.position.y - rectTransform.position.y) * 100f < rectTransform.rect.height * 0.45f)
+ if (Mathf.Abs(centerSign.position.y - rectTransform.position.y) * 100f < rectTransform.rect.height * 0.45f)
{
model.selectBoss = bossId;
}
--
Gitblit v1.8.0