From d6ddc7ceb5dc5cd6b04e8fdf482f29ea34b66c3b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 09 四月 2019 20:06:34 +0800
Subject: [PATCH] 3335 缥缈仙域
---
System/HazyRegion/HazyRegionCyclicScroll.cs | 19 +++++++++++++------
System/HazyRegion/HazyRegionIncidentBehaviour.cs | 2 +-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/System/HazyRegion/HazyRegionCyclicScroll.cs b/System/HazyRegion/HazyRegionCyclicScroll.cs
index 7cbe426..c3fda91 100644
--- a/System/HazyRegion/HazyRegionCyclicScroll.cs
+++ b/System/HazyRegion/HazyRegionCyclicScroll.cs
@@ -7,7 +7,16 @@
{
[SerializeField] float m_FadeInTime = 0.2f;
- public bool IsPlaying { get; private set; }
+ bool m_IsPlaying = false;
+ public bool IsPlaying
+ {
+ get { return m_IsPlaying; }
+ private set
+ {
+ m_IsPlaying = value;
+ this.enabled = !m_IsPlaying;
+ }
+ }
Coroutine m_Coroutine = null;
@@ -15,7 +24,6 @@
{
base.Init(_datas, _stepByStep);
IsPlaying = false;
- this.enabled = true;
if (m_Coroutine != null)
{
@@ -27,7 +35,6 @@
public void DisplayAnimation()
{
IsPlaying = true;
- this.enabled = false;
m_Coroutine = StartCoroutine(Co_DisplayAnimation());
}
@@ -48,9 +55,10 @@
{
var behaviour = infiniteItems[i] as HazyRegionIncidentBehaviour;
behaviour.linerMove.duration = behaviour.alphaTween.duration;
- var fromX = content.anchoredPosition.x + width / 2 + cellSize.x;
+ var fromX = content.anchoredPosition.x + width / 2 + m_BoundOffset.left + cellSize.x;
behaviour.linerMove.from = content.anchoredPosition.SetX(fromX);
- var toX = content.anchoredPosition.x - width / 2 + cellSize.x / 2 + i * (cellSize.x + spacing.x);
+ var toX = content.anchoredPosition.x - width / 2 + m_BoundOffset.left
+ + cellSize.x / 2 + i * (cellSize.x + spacing.x);
behaviour.linerMove.to = content.anchoredPosition.SetX(toX);
behaviour.alphaTween.Play();
behaviour.linerMove.Begin();
@@ -63,7 +71,6 @@
yield return WaitingForSecondConst.GetWaitForSeconds(time);
IsPlaying = false;
- this.enabled = true;
}
}
}
diff --git a/System/HazyRegion/HazyRegionIncidentBehaviour.cs b/System/HazyRegion/HazyRegionIncidentBehaviour.cs
index cc45d28..6ec9870 100644
--- a/System/HazyRegion/HazyRegionIncidentBehaviour.cs
+++ b/System/HazyRegion/HazyRegionIncidentBehaviour.cs
@@ -57,7 +57,7 @@
incidentType = (HazyRegionIncidentType)config.incidentType;
DisplayBase();
- //DisplayItems();
+ DisplayItems();
DisplayState();
DisplaySelect();
//DisplayBoss();
--
Gitblit v1.8.0