Cosmetic changes to example scenes.

setchi · Jan 12, 2020 · a2e1ce7 · a2e1ce7
1 parent b6d31c4
commit a2e1ce7
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 79 deletions.
diff --git a/Assets/FancyScrollView/Examples/01_Basic.unity b/Assets/FancyScrollView/Examples/01_Basic.unity
@@ -132,6 +132,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Dropdown
       objectReference: {fileID: 0}
+    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
+        type: 3}
+      propertyPath: defaultScene
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1747360886316832959, guid: a5f73e63b9cf5418ca91edef13ad6686,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -237,11 +242,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
-        type: 3}
-      propertyPath: defaultScene
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a5f73e63b9cf5418ca91edef13ad6686, type: 3}
 --- !u!224 &538008497 stripped
@@ -492,9 +492,9 @@ GameObject:
   m_Component:
   - component: {fileID: 1492537696}
   - component: {fileID: 1492537702}
-  - component: {fileID: 1492537700}
-  - component: {fileID: 1492537699}
   - component: {fileID: 1492537701}
+  - component: {fileID: 1492537699}
+  - component: {fileID: 1492537700}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged

diff --git a/Assets/FancyScrollView/Examples/02_FocusOn.unity b/Assets/FancyScrollView/Examples/02_FocusOn.unity
@@ -132,6 +132,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Dropdown
       objectReference: {fileID: 0}
+    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
+        type: 3}
+      propertyPath: defaultScene
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1747360886316832959, guid: a5f73e63b9cf5418ca91edef13ad6686,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -237,11 +242,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
-        type: 3}
-      propertyPath: defaultScene
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a5f73e63b9cf5418ca91edef13ad6686, type: 3}
 --- !u!224 &71128192 stripped
@@ -693,9 +693,9 @@ GameObject:
   m_Component:
   - component: {fileID: 1492537696}
   - component: {fileID: 1492537702}
+  - component: {fileID: 1492537701}
   - component: {fileID: 1492537699}
   - component: {fileID: 1492537697}
-  - component: {fileID: 1492537701}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged

diff --git a/Assets/FancyScrollView/Examples/03_InfiniteScroll.unity b/Assets/FancyScrollView/Examples/03_InfiniteScroll.unity
@@ -167,6 +167,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Dropdown
       objectReference: {fileID: 0}
+    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
+        type: 3}
+      propertyPath: defaultScene
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 1747360886316832959, guid: a5f73e63b9cf5418ca91edef13ad6686,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -272,11 +277,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
-        type: 3}
-      propertyPath: defaultScene
-      value: 2
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a5f73e63b9cf5418ca91edef13ad6686, type: 3}
 --- !u!224 &644773179 stripped
@@ -590,9 +590,9 @@ GameObject:
   m_Component:
   - component: {fileID: 1492537696}
   - component: {fileID: 1492537702}
+  - component: {fileID: 1492537701}
   - component: {fileID: 1492537699}
   - component: {fileID: 1492537697}
-  - component: {fileID: 1492537701}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged

diff --git a/Assets/FancyScrollView/Examples/06_LoopTabBar.unity b/Assets/FancyScrollView/Examples/06_LoopTabBar.unity
@@ -127,16 +127,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1141698468}
     m_Modifications:
-    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
+    - target: {fileID: 3194610462843345028, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: m_Name
-      value: Window2
+      propertyPath: m_Text
+      value: Window 2
       objectReference: {fileID: 0}
-    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
+    - target: {fileID: 4622212885601797420, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
+      propertyPath: graphicRaycaster
+      value: 
+      objectReference: {fileID: 1708390399}
     - target: {fileID: 6748594459359164585, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -247,15 +247,15 @@ PrefabInstance:
       propertyPath: graphicRaycaster
       value: 
       objectReference: {fileID: 1708390399}
-    - target: {fileID: 4622212885601797420, guid: de225ab998d364b3fb185d53340d8cd6,
+    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: graphicRaycaster
-      value: 
-      objectReference: {fileID: 1708390399}
-    - target: {fileID: 3194610462843345028, guid: de225ab998d364b3fb185d53340d8cd6,
+      propertyPath: m_Name
+      value: Window2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: m_Text
-      value: Window 2
+      propertyPath: m_IsActive
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: de225ab998d364b3fb185d53340d8cd6, type: 3}
@@ -289,6 +289,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Dropdown
       objectReference: {fileID: 0}
+    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
+        type: 3}
+      propertyPath: defaultScene
+      value: 5
+      objectReference: {fileID: 0}
     - target: {fileID: 1747360886316832959, guid: a5f73e63b9cf5418ca91edef13ad6686,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -394,11 +399,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
-        type: 3}
-      propertyPath: defaultScene
-      value: 5
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a5f73e63b9cf5418ca91edef13ad6686, type: 3}
 --- !u!224 &407001266 stripped
@@ -733,16 +733,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1141698468}
     m_Modifications:
-    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
+    - target: {fileID: 3194610462843345028, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: m_Name
-      value: Window0
+      propertyPath: m_Text
+      value: Window 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
+    - target: {fileID: 4622212885601797420, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
+      propertyPath: graphicRaycaster
+      value: 
+      objectReference: {fileID: 1708390399}
     - target: {fileID: 6748594459359164585, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -853,15 +853,15 @@ PrefabInstance:
       propertyPath: graphicRaycaster
       value: 
       objectReference: {fileID: 1708390399}
-    - target: {fileID: 4622212885601797420, guid: de225ab998d364b3fb185d53340d8cd6,
+    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: graphicRaycaster
-      value: 
-      objectReference: {fileID: 1708390399}
-    - target: {fileID: 3194610462843345028, guid: de225ab998d364b3fb185d53340d8cd6,
+      propertyPath: m_Name
+      value: Window0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: m_Text
-      value: Window 0
+      propertyPath: m_IsActive
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: de225ab998d364b3fb185d53340d8cd6, type: 3}
@@ -995,8 +995,8 @@ GameObject:
   - component: {fileID: 2133201406}
   - component: {fileID: 2133201411}
   - component: {fileID: 2133201410}
-  - component: {fileID: 2133201409}
   - component: {fileID: 2133201407}
+  - component: {fileID: 2133201409}
   m_Layer: 5
   m_Name: Tabs
   m_TagString: Untagged
@@ -1112,16 +1112,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1141698468}
     m_Modifications:
-    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
+    - target: {fileID: 3194610462843345028, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: m_Name
-      value: Window1
+      propertyPath: m_Text
+      value: Window 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
+    - target: {fileID: 4622212885601797420, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
+      propertyPath: graphicRaycaster
+      value: 
+      objectReference: {fileID: 1708390399}
     - target: {fileID: 6748594459359164585, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -1232,15 +1232,15 @@ PrefabInstance:
       propertyPath: graphicRaycaster
       value: 
       objectReference: {fileID: 1708390399}
-    - target: {fileID: 4622212885601797420, guid: de225ab998d364b3fb185d53340d8cd6,
+    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: graphicRaycaster
-      value: 
-      objectReference: {fileID: 1708390399}
-    - target: {fileID: 3194610462843345028, guid: de225ab998d364b3fb185d53340d8cd6,
+      propertyPath: m_Name
+      value: Window1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8026611260721418881, guid: de225ab998d364b3fb185d53340d8cd6,
         type: 3}
-      propertyPath: m_Text
-      value: Window 1
+      propertyPath: m_IsActive
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: de225ab998d364b3fb185d53340d8cd6, type: 3}

diff --git a/Assets/FancyScrollView/Examples/07_ScrollRect.unity b/Assets/FancyScrollView/Examples/07_ScrollRect.unity
@@ -582,8 +582,8 @@ GameObject:
   - component: {fileID: 190094662}
   - component: {fileID: 190094665}
   - component: {fileID: 190094664}
-  - component: {fileID: 190094667}
   - component: {fileID: 190094666}
+  - component: {fileID: 190094667}
   m_Layer: 5
   m_Name: Scroll View
   m_TagString: Untagged
@@ -694,9 +694,9 @@ MonoBehaviour:
   paddingHead: 10
   paddingTail: 10
   spacing: 10
+  cellSize: 100
   cellPrefab: {fileID: 1865951358068953824, guid: efa276bbc93594b8d9fd30eb37d79102,
     type: 3}
-  cellSize: 100
 --- !u!1 &200634892
 GameObject:
   m_ObjectHideFlags: 0
@@ -2741,6 +2741,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Dropdown
       objectReference: {fileID: 0}
+    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
+        type: 3}
+      propertyPath: defaultScene
+      value: 6
+      objectReference: {fileID: 0}
     - target: {fileID: 1747360886316832959, guid: a5f73e63b9cf5418ca91edef13ad6686,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -2846,11 +2851,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 1747360886316832958, guid: a5f73e63b9cf5418ca91edef13ad6686,
-        type: 3}
-      propertyPath: defaultScene
-      value: 6
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a5f73e63b9cf5418ca91edef13ad6686, type: 3}
 --- !u!224 &1641173848 stripped

diff --git a/Assets/FancyScrollView/Examples/09_LoadTexture.unity b/Assets/FancyScrollView/Examples/09_LoadTexture.unity
@@ -503,7 +503,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 1
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 2026167135838482318}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1

diff --git a/Assets/FancyScrollView/Examples/Sources/07_ScrollRect/Example07.cs b/Assets/FancyScrollView/Examples/Sources/07_ScrollRect/Example07.cs
@@ -14,7 +14,7 @@ namespace FancyScrollView.Example07
 {
     public class Example07 : MonoBehaviour
     {
-        [SerializeField] FancyScrollRect scrollView = default;
+        [SerializeField] ScrollView scrollView = default;
         [SerializeField] InputField paddingTopInputField = default;
         [SerializeField] InputField paddingBottomInputField = default;
         [SerializeField] InputField spacingInputField = default;

diff --git a/.../Sources/07_ScrollRect/FancyScrollRect.cs → ...mples/Sources/07_ScrollRect/ScrollView.cs b/.../Sources/07_ScrollRect/FancyScrollRect.cs → ...mples/Sources/07_ScrollRect/ScrollView.cs
@@ -10,7 +10,7 @@
 
 namespace FancyScrollView.Example07
 {
-    public class FancyScrollRect : FancyScrollRect<ItemData, Context>
+    public class ScrollView : FancyScrollRect<ItemData, Context>
     {
         [SerializeField] float cellSize = 100f;
         [SerializeField] GameObject cellPrefab = default;

diff --git a/...ces/07_ScrollRect/FancyScrollRect.cs.meta → .../Sources/07_ScrollRect/ScrollView.cs.meta b/...ces/07_ScrollRect/FancyScrollRect.cs.meta → .../Sources/07_ScrollRect/ScrollView.cs.meta
diff --git a/Assets/FancyScrollView/Examples/Sources/08_GridView/Example08.cs b/Assets/FancyScrollView/Examples/Sources/08_GridView/Example08.cs
@@ -14,7 +14,7 @@ namespace FancyScrollView.Example08
 {
     public class Example08 : MonoBehaviour
     {
-        [SerializeField] FancyGridView gridView = default;
+        [SerializeField] GridView gridView = default;
         [SerializeField] InputField paddingTopInputField = default;
         [SerializeField] InputField paddingBottomInputField = default;
         [SerializeField] InputField xSpacingInputField = default;

diff --git a/...ples/Sources/08_GridView/FancyGridView.cs → .../Examples/Sources/08_GridView/GridView.cs b/...ples/Sources/08_GridView/FancyGridView.cs → .../Examples/Sources/08_GridView/GridView.cs
@@ -9,7 +9,7 @@
 
 namespace FancyScrollView.Example08
 {
-    public class FancyGridView : FancyGridView<ItemData, Context>
+    public class GridView : FancyGridView<ItemData, Context>
     {
         class CellGroup : DefaultCellGroup { }
 

diff --git a/...Sources/08_GridView/FancyGridView.cs.meta → ...ples/Sources/08_GridView/GridView.cs.meta b/...Sources/08_GridView/FancyGridView.cs.meta → ...ples/Sources/08_GridView/GridView.cs.meta