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/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs b/System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs
index 79d947b..9f00f61 100644
--- a/System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs
+++ b/System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs
@@ -11,13 +11,11 @@
namespace Snxxz.UI
{
- public class FindPreciousBossBriefInfoBehaviour : ScrollItem
+ public class FindPreciousBossBriefInfoBehaviour : AutoSelectScrollItem
{
[SerializeField] protected float m_SelectedShifting = 6f;
[SerializeField] protected CanvasGroup m_CanvasGroup;
- [SerializeField] protected AutoSelectCyclicScroll m_Scroll;
- [SerializeField] protected Transform m_CenterSign;
[SerializeField] protected Button m_Select;
[SerializeField] protected RectTransform m_Content;
[SerializeField] protected Image m_BackGround;
@@ -118,7 +116,7 @@
private void SelectBoss()
{
- m_Scroll.TrySelectData(bossId);
+ autoSelectScroll.TrySelectData(bossId);
}
protected virtual void OnSubscribe(int _bossId)
@@ -219,9 +217,9 @@
protected virtual void LateUpdate()
{
- if (m_Scroll.autoSelectable && selectedBossId != bossId && bossId > 0)
+ if (autoSelectScroll.autoSelectable && selectedBossId != 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)
{
selectedBossId = bossId;
}
--
Gitblit v1.8.0