fix issue qiankanglai#168: leave assert in Awake but move initializ…

…ation into ctor
SRX76 · Mar 3, 2024 · 22ee7b6 · 22ee7b6
1 parent b637aca
commit 22ee7b6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Runtime/LoopHorizontalScrollRect.cs b/Runtime/LoopHorizontalScrollRect.cs
@@ -7,6 +7,11 @@ namespace UnityEngine.UI
     [DisallowMultipleComponent]
     public class LoopHorizontalScrollRect : LoopScrollRect
     {
+        LoopHorizontalScrollRect()
+        {
+            direction = LoopScrollRectDirection.Horizontal;
+        }
+
         protected override float GetSize(RectTransform item, bool includeSpacing)
         {
             float size = includeSpacing ? contentSpacing : 0;
@@ -39,7 +44,6 @@ protected override Vector2 GetVector(float value)
 
         protected override void Awake()
         {
-            direction = LoopScrollRectDirection.Horizontal;
             base.Awake();
             if (m_Content)
             {

diff --git a/Runtime/LoopHorizontalScrollRectMulti.cs b/Runtime/LoopHorizontalScrollRectMulti.cs
@@ -7,6 +7,11 @@ namespace UnityEngine.UI
     [DisallowMultipleComponent]
     public class LoopHorizontalScrollRectMulti : LoopScrollRectMulti
     {
+        LoopHorizontalScrollRectMulti()
+        {
+            direction = LoopScrollRectDirection.Horizontal;
+        }
+
         protected override float GetSize(RectTransform item, bool includeSpacing)
         {
             float size = includeSpacing ? contentSpacing : 0;
@@ -39,7 +44,6 @@ protected override Vector2 GetVector(float value)
 
         protected override void Awake()
         {
-            direction = LoopScrollRectDirection.Horizontal;
             base.Awake();
             if (m_Content)
             {

diff --git a/Runtime/LoopVerticalScrollRect.cs b/Runtime/LoopVerticalScrollRect.cs
@@ -8,6 +8,11 @@ namespace UnityEngine.UI
     [DisallowMultipleComponent]
     public class LoopVerticalScrollRect : LoopScrollRect
     {
+        LoopVerticalScrollRect()
+        {
+            direction = LoopScrollRectDirection.Vertical;
+        }
+
         protected override float GetSize(RectTransform item, bool includeSpacing)
         {
             float size = includeSpacing ? contentSpacing : 0;
@@ -40,7 +45,6 @@ protected override Vector2 GetVector(float value)
 
         protected override void Awake()
         {
-            direction = LoopScrollRectDirection.Vertical;
             base.Awake();
             if (m_Content)
             {

diff --git a/Runtime/LoopVerticalScrollRectMulti.cs b/Runtime/LoopVerticalScrollRectMulti.cs
@@ -8,6 +8,10 @@ namespace UnityEngine.UI
     [DisallowMultipleComponent]
     public class LoopVerticalScrollRectMulti : LoopScrollRectMulti
     {
+        LoopVerticalScrollRectMulti()
+        {
+            direction = LoopScrollRectDirection.Vertical;
+        }
         protected override float GetSize(RectTransform item, bool includeSpacing)
         {
             float size = includeSpacing ? contentSpacing : 0;
@@ -40,7 +44,6 @@ protected override Vector2 GetVector(float value)
 
         protected override void Awake()
         {
-            direction = LoopScrollRectDirection.Vertical;
             base.Awake();
             if (m_Content)
             {