Merge branch 'model-ui-integration-work' of...

Merge branch 'model-ui-integration-work' of https://git.kucatdog.net/flatland/curvedflats into model-ui-integration-work

Assets/Scenes/Test.unity

@@ -214,7 +214,7 @@ GameObject:
   - component: {fileID: 260633610}
   m_Layer: 5
   m_Name: VelocitySlider
-  m_TagString: Untagged
+  m_TagString: VelocitySlider
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -381,7 +381,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &279236944
 MonoBehaviour:
@@ -462,7 +462,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &353909220
 GameObject:
@@ -477,7 +477,7 @@ GameObject:
   - component: {fileID: 353909222}
   m_Layer: 5
   m_Name: Text (1)
-  m_TagString: Untagged
+  m_TagString: VelocitySlider
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -653,6 +653,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   square: {fileID: 934514725}
   playercamera: {fileID: 1661408489}
+  velocityslider: {fileID: 260633610}
   canvas: {fileID: 1193230064}
   mytime: {fileID: 1678224219}
   wintext: {fileID: 512200287}
@@ -670,7 +671,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &439858915
 GameObject:
@@ -939,7 +940,7 @@ Transform:
   m_Children:
   - {fileID: 439858922}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &652340811
 GameObject:
@@ -1341,7 +1342,7 @@ Transform:
   m_Children:
   - {fileID: 1320474668}
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &804812004
 GameObject:
@@ -1435,7 +1436,7 @@ RectTransform:
   m_Children:
   - {fileID: 1751424969}
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1753,7 +1754,7 @@ Transform:
   m_LocalScale: {x: 4, y: 4, z: 4}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &948598106
 GameObject:
@@ -2088,7 +2089,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!81 &989372160
 AudioListener:
@@ -2135,7 +2136,7 @@ Camera:
   m_TargetDisplay: 0
   m_TargetEye: 0
   m_HDR: 1
-  m_AllowMSAA: 0
+  m_AllowMSAA: 1
   m_AllowDynamicResolution: 0
   m_ForceIntoRT: 0
   m_OcclusionCulling: 0
@@ -2401,7 +2402,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 90, y: -30, z: 0}
 --- !u!1 &1094934748
 GameObject:
@@ -2450,7 +2451,7 @@ Transform:
   m_Children:
   - {fileID: 839664892}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1096626729
 GameObject:
@@ -2544,7 +2545,7 @@ Transform:
   m_LocalScale: {x: 810.7, y: 456, z: 17.44}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1096626733
 MeshCollider:
@@ -2571,7 +2572,7 @@ GameObject:
   - component: {fileID: 1158931611}
   m_Layer: 5
   m_Name: Sliding Area
-  m_TagString: Untagged
+  m_TagString: VelocitySlider
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2714,7 +2715,7 @@ RectTransform:
   - {fileID: 1496132465}
   - {fileID: 512200285}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3154,7 +3155,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.392}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -3284,7 +3285,7 @@ Transform:
   m_LocalScale: {x: 1, y: 0.1000003, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!114 &1661408491
 MonoBehaviour:
@@ -3684,7 +3685,7 @@ Transform:
   m_Children:
   - {fileID: 1713675712}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!64 &1756789506
 MeshCollider:
@@ -3945,7 +3946,7 @@ GameObject:
   - component: {fileID: 1903486023}
   m_Layer: 5
   m_Name: Handle
-  m_TagString: Untagged
+  m_TagString: VelocitySlider
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4019,7 +4020,7 @@ GameObject:
   - component: {fileID: 1924599035}
   m_Layer: 5
   m_Name: Text
-  m_TagString: Untagged
+  m_TagString: VelocitySlider
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

ProjectSettings/TagManager.asset

@@ -6,6 +6,7 @@ TagManager:
   tags:
   - path
   - pathui
+  - VelocitySlider
   layers:
   - Default
   - TransparentFX