Przeglądaj źródła

Uppdatering av Drag and Drop, ej klar

Axel Nordh 7 lat temu
rodzic
commit
a5f69fae0d

+ 147 - 308
Assets/Prefab/NewQuestion.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2936479620192372285
+--- !u!1 &4662818861115959987
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,53 +8,57 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8128202872383329615}
-  - component: {fileID: 3249901327059394553}
-  - component: {fileID: 6038515080564881379}
-  - component: {fileID: 2138513072214761608}
+  - component: {fileID: 1781451649244772801}
+  - component: {fileID: 5002419110936671095}
+  - component: {fileID: 4303414690502663021}
+  - component: {fileID: 8491633767315704838}
+  - component: {fileID: 7776552258544191885}
+  - component: {fileID: 7933561225938041952}
+  - component: {fileID: 3652310416093541855}
+  - component: {fileID: 4763204001755850318}
   m_Layer: 5
-  m_Name: Panel
+  m_Name: NewQuestion
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &8128202872383329615
+--- !u!224 &1781451649244772801
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2936479620192372285}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_GameObject: {fileID: 4662818861115959987}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 3395082336030064538}
-  - {fileID: 3395082336339511758}
-  m_Father: {fileID: 3395082336809275732}
+  - {fileID: 5145380996076868372}
+  - {fileID: 5145380995516278080}
+  m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 180}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3249901327059394553
+--- !u!222 &5002419110936671095
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2936479620192372285}
+  m_GameObject: {fileID: 4662818861115959987}
   m_CullTransparentMesh: 0
---- !u!114 &6038515080564881379
+--- !u!114 &4303414690502663021
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2936479620192372285}
+  m_GameObject: {fileID: 4662818861115959987}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -77,13 +81,13 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
---- !u!114 &2138513072214761608
+--- !u!114 &8491633767315704838
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2936479620192372285}
+  m_GameObject: {fileID: 4662818861115959987}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -96,99 +100,43 @@ MonoBehaviour:
     m_Bottom: 4
   m_ChildAlignment: 0
   m_Spacing: 3
-  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 1
+  m_ChildControlWidth: 0
   m_ChildControlHeight: 1
---- !u!1 &3395082336030064537
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 867956338076863543, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3395082336030064538}
-  - component: {fileID: 3395082336030064542}
-  - component: {fileID: 3395082336030064541}
-  - component: {fileID: 3395082336030064540}
-  - component: {fileID: 3395082336030064539}
-  m_Layer: 5
-  m_Name: YearPanel
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3395082336030064538
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 3832916805813533196, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336030064537}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 2}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 3395082337050455786}
-  m_Father: {fileID: 8128202872383329615}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3395082336030064542
-CanvasRenderer:
+--- !u!114 &7776552258544191885
+MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 8945016162657971704, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336030064537}
-  m_CullTransparentMesh: 0
---- !u!114 &3395082336030064541
+  m_GameObject: {fileID: 4662818861115959987}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f299b2d58078e8d44b925d2d8c48a498, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  questionText: {fileID: 5145380997340698411}
+  answerText: {fileID: 5145380997204476517}
+--- !u!114 &7933561225938041952
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 5678858584141694581, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336030064537}
+  m_GameObject: {fileID: 4662818861115959987}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 06f334e0430ec0944ba0abce4592c950, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
---- !u!114 &3395082336030064540
+--- !u!114 &3652310416093541855
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 3188296057445502442, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336030064537}
+  m_GameObject: {fileID: 4662818861115959987}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -196,42 +144,37 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: -1
-  m_MinHeight: 30
-  m_PreferredWidth: 96
-  m_PreferredHeight: 50
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 100
+  m_PreferredHeight: 180
+  m_FlexibleWidth: 0
+  m_FlexibleHeight: 1
   m_LayoutPriority: 1
---- !u!114 &3395082336030064539
-MonoBehaviour:
+--- !u!225 &4763204001755850318
+CanvasGroup:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4641638300198110848, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336030064537}
+  m_GameObject: {fileID: 4662818861115959987}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
---- !u!1 &3395082336339511757
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
+--- !u!1 &5145380995516278083
 GameObject:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4480804082438904857, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3395082336339511758}
-  - component: {fileID: 3395082336339511762}
-  - component: {fileID: 3395082336339511761}
-  - component: {fileID: 3395082336339511760}
-  - component: {fileID: 3395082336339511759}
+  - component: {fileID: 5145380995516278080}
+  - component: {fileID: 5145380995516278108}
+  - component: {fileID: 5145380995516278111}
+  - component: {fileID: 5145380995516278110}
+  - component: {fileID: 5145380995516278081}
   m_Layer: 5
   m_Name: QuestionPanel
   m_TagString: Untagged
@@ -239,44 +182,41 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3395082336339511758
+--- !u!224 &5145380995516278080
 RectTransform:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 8433213467817524145, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336339511757}
+  m_GameObject: {fileID: 5145380995516278083}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 3395082337199520676}
-  m_Father: {fileID: 8128202872383329615}
+  - {fileID: 5145380997340698410}
+  m_Father: {fileID: 1781451649244772801}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3395082336339511762
+--- !u!222 &5145380995516278108
 CanvasRenderer:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 6498180612513946287, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336339511757}
+  m_GameObject: {fileID: 5145380995516278083}
   m_CullTransparentMesh: 0
---- !u!114 &3395082336339511761
+--- !u!114 &5145380995516278111
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 8125421312422992841, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336339511757}
+  m_GameObject: {fileID: 5145380995516278083}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -299,14 +239,13 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
---- !u!114 &3395082336339511760
+--- !u!114 &5145380995516278110
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 5065114796447958111, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336339511757}
+  m_GameObject: {fileID: 5145380995516278083}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -320,14 +259,13 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: 1
   m_LayoutPriority: 1
---- !u!114 &3395082336339511759
+--- !u!114 &5145380995516278081
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 6617088022128742137, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336339511757}
+  m_GameObject: {fileID: 5145380995516278083}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -336,69 +274,61 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!1 &3395082336421756021
+--- !u!1 &5145380996076868375
 GameObject:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4206840261560900348, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3395082336809275732}
-  - component: {fileID: 3395082336421756027}
-  - component: {fileID: 3395082336421756026}
-  - component: {fileID: 3395082336421756025}
-  - component: {fileID: 1186775885521051584}
-  - component: {fileID: 3395082336421756024}
-  - component: {fileID: 3395082336421756023}
-  - component: {fileID: 3395082336421756022}
-  - component: {fileID: 9168973569361200927}
+  - component: {fileID: 5145380996076868372}
+  - component: {fileID: 5145380996076868368}
+  - component: {fileID: 5145380996076868371}
+  - component: {fileID: 5145380996076868370}
+  - component: {fileID: 5145380996076868373}
   m_Layer: 5
-  m_Name: NewQuestion
+  m_Name: YearPanel
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3395082336809275732
+--- !u!224 &5145380996076868372
 RectTransform:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4141386336649914136, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336421756021}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 5145380996076868375}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 8128202872383329615}
-  m_Father: {fileID: 0}
+  - {fileID: 5145380997204476516}
+  m_Father: {fileID: 1781451649244772801}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 180}
+  m_SizeDelta: {x: 92, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3395082336421756027
+--- !u!222 &5145380996076868368
 CanvasRenderer:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4138855185650734326, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336421756021}
+  m_GameObject: {fileID: 5145380996076868375}
   m_CullTransparentMesh: 0
---- !u!114 &3395082336421756026
+--- !u!114 &5145380996076868371
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4320009976205744584, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336421756021}
+  m_GameObject: {fileID: 5145380996076868375}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -421,50 +351,13 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
---- !u!223 &3395082336421756025
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 2474798347021706728, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336421756021}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &1186775885521051584
+--- !u!114 &5145380996076868370
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336421756021}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ac71313ea5cc2e54cae3e4e04a20b268, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  target: {fileID: 3395082336421756021}
-  isMouseDrag: 1
---- !u!114 &3395082336421756024
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 3687615659349084281, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336421756021}
+  m_GameObject: {fileID: 5145380996076868375}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -472,85 +365,38 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: 180
+  m_MinHeight: 30
+  m_PreferredWidth: 96
+  m_PreferredHeight: 50
   m_FlexibleWidth: -1
-  m_FlexibleHeight: 1
+  m_FlexibleHeight: -1
   m_LayoutPriority: 1
---- !u!114 &3395082336421756023
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 1433068658315073681, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336421756021}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f299b2d58078e8d44b925d2d8c48a498, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  questionText: {fileID: 3395082337199520677}
-  answerText: {fileID: 3395082337050455787}
-  questionString: 
-  answerString: 
-  idString: 
-  categoryString: 
---- !u!61 &3395082336421756022
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4745274715532328104, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336421756021}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 0, y: 0}
-    newSize: {x: 0, y: 0}
-    adaptiveTilingThreshold: 0
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 100, y: 180}
-  m_EdgeRadius: 0
---- !u!114 &9168973569361200927
+--- !u!114 &5145380996076868373
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082336421756021}
+  m_GameObject: {fileID: 5145380996076868375}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 3, y: -3}
+  m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!1 &3395082337050455785
+--- !u!1 &5145380997204476519
 GameObject:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4206906586121127748, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3395082337050455786}
-  - component: {fileID: 3395082337050455788}
-  - component: {fileID: 3395082337050455787}
+  - component: {fileID: 5145380997204476516}
+  - component: {fileID: 5145380997204476514}
+  - component: {fileID: 5145380997204476517}
   m_Layer: 5
   m_Name: NewAnswerText
   m_TagString: Untagged
@@ -558,19 +404,18 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3395082337050455786
+--- !u!224 &5145380997204476516
 RectTransform:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4141457439853523434, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082337050455785}
+  m_GameObject: {fileID: 5145380997204476519}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 2}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 3395082336030064538}
+  m_Father: {fileID: 5145380996076868372}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -578,23 +423,21 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3395082337050455788
+--- !u!222 &5145380997204476514
 CanvasRenderer:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4139588361639155294, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082337050455785}
+  m_GameObject: {fileID: 5145380997204476519}
   m_CullTransparentMesh: 0
---- !u!114 &3395082337050455787
+--- !u!114 &5145380997204476517
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4319973298340497118, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082337050455785}
+  m_GameObject: {fileID: 5145380997204476519}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -622,18 +465,17 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: ???? - ????
---- !u!1 &3395082337199520675
+--- !u!1 &5145380997340698413
 GameObject:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4207111862292604664, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3395082337199520676}
-  - component: {fileID: 3395082337199520678}
-  - component: {fileID: 3395082337199520677}
+  - component: {fileID: 5145380997340698410}
+  - component: {fileID: 5145380997340698408}
+  - component: {fileID: 5145380997340698411}
   m_Layer: 5
   m_Name: NewQuestionText
   m_TagString: Untagged
@@ -641,43 +483,40 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3395082337199520676
+--- !u!224 &5145380997340698410
 RectTransform:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4143085156108782740, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082337199520675}
+  m_GameObject: {fileID: 5145380997340698413}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 3395082336339511758}
+  m_Father: {fileID: 5145380995516278080}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -0.083122}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 90, y: 130.15}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3395082337199520678
+--- !u!222 &5145380997340698408
 CanvasRenderer:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4139784116477443986, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082337199520675}
+  m_GameObject: {fileID: 5145380997340698413}
   m_CullTransparentMesh: 0
---- !u!114 &3395082337199520677
+--- !u!114 &5145380997340698411
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4320027678439970254, guid: 5517357e8b810124ea5029d64ced40d4,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395082337199520675}
+  m_GameObject: {fileID: 5145380997340698413}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}

+ 1 - 1
Assets/Prefab/NewQuestion.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2baefb2b369147241a37ed01defd5e22
+guid: e91b5c1a341f8be469b7bab25ee954d7
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 76 - 0
Assets/Prefab/Panel.prefab

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7460299730061661032
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5371510168798060342}
+  - component: {fileID: 6579300692378601676}
+  - component: {fileID: 7975703466908185607}
+  m_Layer: 5
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5371510168798060342
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7460299730061661032}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6579300692378601676
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7460299730061661032}
+  m_CullTransparentMesh: 0
+--- !u!114 &7975703466908185607
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7460299730061661032}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0

+ 7 - 0
Assets/Prefab/Panel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6b33d2abce98c0b4c8c66bd6287f19e9
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 160 - 320
Assets/Prefab/QuestionCard.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &573264335053083985
+--- !u!1 &2583734455467487379
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,67 +8,70 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2803736803940518314}
-  - component: {fileID: 1216298166169722924}
-  - component: {fileID: 538063500796907962}
-  - component: {fileID: 3325691986275188437}
-  - component: {fileID: 8730460796365720264}
+  - component: {fileID: 6237367818918707382}
+  - component: {fileID: 5121997675851897887}
+  - component: {fileID: 4688061370215409508}
+  - component: {fileID: 4272043366978706191}
+  - component: {fileID: 496125334106695266}
+  - component: {fileID: 3820892049407775847}
+  - component: {fileID: 4126295651488552487}
   m_Layer: 5
-  m_Name: YearPanel
+  m_Name: QuestionCard
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2803736803940518314
+--- !u!224 &6237367818918707382
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 573264335053083985}
+  m_GameObject: {fileID: 2583734455467487379}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 2}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 3141288431445514910}
-  m_Father: {fileID: 3134997057761314284}
+  - {fileID: 6622248623755758832}
+  - {fileID: 7200334351305752922}
+  m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 180}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1216298166169722924
+--- !u!222 &5121997675851897887
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 573264335053083985}
+  m_GameObject: {fileID: 2583734455467487379}
   m_CullTransparentMesh: 0
---- !u!114 &538063500796907962
+--- !u!114 &4688061370215409508
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 573264335053083985}
+  m_GameObject: {fileID: 2583734455467487379}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 0.0047169924, b: 0.0047169924, a: 0.5882353}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -77,13 +80,50 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
---- !u!114 &3325691986275188437
+--- !u!114 &4272043366978706191
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2583734455467487379}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 4
+    m_Right: 4
+    m_Top: 4
+    m_Bottom: 4
+  m_ChildAlignment: 0
+  m_Spacing: 2
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 1
+--- !u!114 &496125334106695266
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 573264335053083985}
+  m_GameObject: {fileID: 2583734455467487379}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81296cbde3d359d45a78e8b9a5bace79, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  questionText: {fileID: 491313937380098038}
+  answerText: {fileID: 8760622633323229486}
+--- !u!114 &3820892049407775847
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2583734455467487379}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -91,28 +131,28 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: -1
-  m_MinHeight: 30
-  m_PreferredWidth: 96
-  m_PreferredHeight: 50
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 100
+  m_PreferredHeight: 180
+  m_FlexibleWidth: 0
+  m_FlexibleHeight: 1
   m_LayoutPriority: 1
---- !u!114 &8730460796365720264
+--- !u!114 &4126295651488552487
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 573264335053083985}
+  m_GameObject: {fileID: 2583734455467487379}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
+  m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
---- !u!1 &807117113663802904
+--- !u!1 &5454373070573218908
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -120,50 +160,50 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3141288431445514910}
-  - component: {fileID: 8492834611039567289}
-  - component: {fileID: 332650730565547124}
+  - component: {fileID: 2542586506607052985}
+  - component: {fileID: 7378609231691140005}
+  - component: {fileID: 491313937380098038}
   m_Layer: 5
-  m_Name: AnswerText
+  m_Name: QuestionText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3141288431445514910
+--- !u!224 &2542586506607052985
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 807117113663802904}
+  m_GameObject: {fileID: 5454373070573218908}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 2}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 2803736803940518314}
+  m_Father: {fileID: 7200334351305752922}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 94, y: 50}
+  m_AnchoredPosition: {x: 0, y: 0.00071561}
+  m_SizeDelta: {x: 92, y: 125.3}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8492834611039567289
+--- !u!222 &7378609231691140005
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 807117113663802904}
+  m_GameObject: {fileID: 5454373070573218908}
   m_CullTransparentMesh: 0
---- !u!114 &332650730565547124
+--- !u!114 &491313937380098038
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 807117113663802904}
+  m_GameObject: {fileID: 5454373070573218908}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -179,199 +219,19 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 18
+    m_FontSize: 14
     m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 255
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 1980
---- !u!1 &828492766240825314
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2679799103802188408}
-  - component: {fileID: 4840051168397736876}
-  - component: {fileID: 8819974297064682290}
-  - component: {fileID: 119482509772486135}
-  - component: {fileID: 7766826027455112567}
-  - component: {fileID: 4111874239867258461}
-  - component: {fileID: 1642914577215789232}
-  - component: {fileID: 968393937643271005}
-  m_Layer: 5
-  m_Name: QuestionCard
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2679799103802188408
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828492766240825314}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 3134997057761314284}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 175}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4840051168397736876
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828492766240825314}
-  m_CullTransparentMesh: 0
---- !u!114 &8819974297064682290
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828492766240825314}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
---- !u!223 &119482509772486135
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828492766240825314}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &7766826027455112567
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828492766240825314}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: 175
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: 1
-  m_LayoutPriority: 1
---- !u!61 &4111874239867258461
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828492766240825314}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 0, y: 0}
-    newSize: {x: 0, y: 0}
-    adaptiveTilingThreshold: 0
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 100, y: 175}
-  m_EdgeRadius: 0
---- !u!114 &1642914577215789232
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828492766240825314}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 81296cbde3d359d45a78e8b9a5bace79, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  questionText: {fileID: 8925946038907665068}
-  answerText: {fileID: 332650730565547124}
-  questionString: 
-  answerString: 
-  idString: 
-  categoryString: 
---- !u!114 &968393937643271005
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828492766240825314}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 3, y: -3}
-  m_UseGraphicAlpha: 1
---- !u!1 &2598333893938895333
+  m_Text: Question text
+--- !u!1 &6413417402222877887
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -379,11 +239,10 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2225501955395355648}
-  - component: {fileID: 7422611420984008246}
-  - component: {fileID: 4033897915962244403}
-  - component: {fileID: 4730484038299192263}
-  - component: {fileID: 264080465589788971}
+  - component: {fileID: 7200334351305752922}
+  - component: {fileID: 1876947779286866796}
+  - component: {fileID: 5401332201340434537}
+  - component: {fileID: 4370785109706722973}
   m_Layer: 5
   m_Name: QuestionPanel
   m_TagString: Untagged
@@ -391,19 +250,19 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2225501955395355648
+--- !u!224 &7200334351305752922
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2598333893938895333}
+  m_GameObject: {fileID: 6413417402222877887}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 6793468080494972387}
-  m_Father: {fileID: 3134997057761314284}
+  - {fileID: 2542586506607052985}
+  m_Father: {fileID: 6237367818918707382}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -411,28 +270,28 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7422611420984008246
+--- !u!222 &1876947779286866796
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2598333893938895333}
+  m_GameObject: {fileID: 6413417402222877887}
   m_CullTransparentMesh: 0
---- !u!114 &4033897915962244403
+--- !u!114 &5401332201340434537
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2598333893938895333}
+  m_GameObject: {fileID: 6413417402222877887}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_Color: {r: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -448,13 +307,13 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
---- !u!114 &4730484038299192263
+--- !u!114 &4370785109706722973
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2598333893938895333}
+  m_GameObject: {fileID: 6413417402222877887}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -464,26 +323,11 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 94
-  m_PreferredHeight: 300
+  m_PreferredHeight: 150
   m_FlexibleWidth: -1
   m_FlexibleHeight: 1
   m_LayoutPriority: 1
---- !u!114 &264080465589788971
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2598333893938895333}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
---- !u!1 &3945145188504135942
+--- !u!1 &8520071005363342146
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -491,50 +335,50 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6793468080494972387}
-  - component: {fileID: 1974896389905583871}
-  - component: {fileID: 8925946038907665068}
+  - component: {fileID: 6239230281463816132}
+  - component: {fileID: 635772643756194019}
+  - component: {fileID: 8760622633323229486}
   m_Layer: 5
-  m_Name: QuestionText
+  m_Name: AnswerText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6793468080494972387
+--- !u!224 &6239230281463816132
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3945145188504135942}
+  m_GameObject: {fileID: 8520071005363342146}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 2}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 2225501955395355648}
+  m_Father: {fileID: 6622248623755758832}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -0.0049968}
-  m_SizeDelta: {x: 90, y: 129.99}
+  m_AnchoredPosition: {x: 0, y: 0.00073558}
+  m_SizeDelta: {x: 92, y: 46.7}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1974896389905583871
+--- !u!222 &635772643756194019
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3945145188504135942}
+  m_GameObject: {fileID: 8520071005363342146}
   m_CullTransparentMesh: 0
---- !u!114 &8925946038907665068
+--- !u!114 &8760622633323229486
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3945145188504135942}
+  m_GameObject: {fileID: 8520071005363342146}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -550,19 +394,19 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
+    m_FontSize: 18
     m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 10
-    m_MaxSize: 255
-    m_Alignment: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Question text
---- !u!1 &6833490061834319305
+  m_Text: 1980
+--- !u!1 &8861552641027936267
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -570,60 +414,59 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3134997057761314284}
-  - component: {fileID: 4186894591298836805}
-  - component: {fileID: 4323874794093404734}
-  - component: {fileID: 5064142766650170965}
+  - component: {fileID: 6622248623755758832}
+  - component: {fileID: 7921554056996791670}
+  - component: {fileID: 8825294032478541024}
+  - component: {fileID: 5992339406224358287}
   m_Layer: 5
-  m_Name: Border
+  m_Name: YearPanel
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3134997057761314284
+--- !u!224 &6622248623755758832
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6833490061834319305}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_GameObject: {fileID: 8861552641027936267}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 2}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 2803736803940518314}
-  - {fileID: 2225501955395355648}
-  m_Father: {fileID: 2679799103802188408}
+  - {fileID: 6239230281463816132}
+  m_Father: {fileID: 6237367818918707382}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4186894591298836805
+--- !u!222 &7921554056996791670
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6833490061834319305}
+  m_GameObject: {fileID: 8861552641027936267}
   m_CullTransparentMesh: 0
---- !u!114 &4323874794093404734
+--- !u!114 &8825294032478541024
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6833490061834319305}
+  m_GameObject: {fileID: 8861552641027936267}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.0047169924, b: 0.0047169924, a: 0.5882353}
+  m_Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -633,32 +476,29 @@ MonoBehaviour:
   m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
-  m_FillCenter: 0
+  m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
---- !u!114 &5064142766650170965
+--- !u!114 &5992339406224358287
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6833490061834319305}
+  m_GameObject: {fileID: 8861552641027936267}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 4
-    m_Right: 4
-    m_Top: 4
-    m_Bottom: 4
-  m_ChildAlignment: 0
-  m_Spacing: 3
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 1
-  m_ChildControlHeight: 1
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: 30
+  m_PreferredWidth: 94
+  m_PreferredHeight: 50
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1

+ 0 - 59
Assets/Scripts/Drag.cs

@@ -1,59 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-[RequireComponent(typeof(BoxCollider2D))]
-
-public class Drag : MonoBehaviour {
-    public GameObject target;
-    public bool isMouseDrag = false;
-    private Vector3 screenPosition;
-    private Vector3 offset;
-
-    // Update is called once per frame
-    void Update()
-    {
-
-        if (Input.GetMouseButtonDown(0))
-        {
-            RaycastHit hitInfo;
-            target = ReturnClickedObject(out hitInfo);
-            if (target != null)
-            {
-                isMouseDrag = true;
-                Debug.Log("target position :" + target.transform.position);
-                //Convert world position to screen position.
-                screenPosition = Camera.main.WorldToScreenPoint(target.transform.position);
-                offset = target.transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPosition.z));
-            }
-        }
-
-        if (Input.GetMouseButtonUp(0))
-        {
-            isMouseDrag = false;
-        }
-
-        if (isMouseDrag)
-        {
-            //track mouse position.
-            Vector3 currentScreenSpace = new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPosition.z);
-
-            //convert screen position to world position with offset changes.
-            Vector3 currentPosition = Camera.main.ScreenToWorldPoint(currentScreenSpace) + offset;
-
-            //It will update target gameobject's current postion.
-            target.transform.position = currentPosition;
-        }
-
-    }
-
-    GameObject ReturnClickedObject(out RaycastHit hit)
-    {
-        GameObject target = null;
-        Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-        if (Physics.Raycast(ray.origin, ray.direction * 10, out hit))
-        {
-            target = hit.collider.gameObject;
-        }
-        return target;
-    }
-}

+ 67 - 0
Assets/Scripts/Draggable.cs

@@ -0,0 +1,67 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class Draggable : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler {
+
+    public Vector3 startPosition;
+    public Transform parent = null;
+    public Transform placeholderParent = null;
+    GameObject placeholder = null;
+
+    public void OnDrag(PointerEventData eventData) {
+        this.transform.position = eventData.position;
+        
+        if (placeholder.transform.parent != placeholderParent) {
+            placeholder.transform.SetParent(placeholderParent);
+        }
+
+        int newSiblingIndex = placeholderParent.childCount;
+
+        for (int i = 0; i < placeholderParent.childCount; i++) {
+            if (this.transform.position.x < placeholderParent.GetChild(i).transform.position.x) {
+                newSiblingIndex = i;
+                if (parent.transform.GetSiblingIndex() < newSiblingIndex) {
+                    newSiblingIndex--;
+                }
+                break;
+            }
+        }
+
+        placeholderParent.transform.SetSiblingIndex(newSiblingIndex);
+    }
+
+    public void OnBeginDrag(PointerEventData eventData) {
+        startPosition = this.transform.position;
+
+        placeholder = new GameObject();
+        placeholder.transform.SetParent(this.transform.parent);
+        LayoutElement le = placeholder.AddComponent<LayoutElement>();
+        le.preferredHeight = this.GetComponent<LayoutElement>().preferredHeight;
+        le.preferredWidth = this.GetComponent<LayoutElement>().preferredWidth;
+        le.flexibleHeight = this.GetComponent<LayoutElement>().flexibleHeight;
+        le.flexibleWidth = this.GetComponent<LayoutElement>().flexibleWidth;
+        le.minHeight = this.GetComponent<LayoutElement>().minHeight;
+        le.minWidth = this.GetComponent<LayoutElement>().minWidth;
+
+        placeholder.transform.SetSiblingIndex(this.transform.GetSiblingIndex());
+
+        parent = this.transform.parent;
+        placeholderParent = parent;
+        GetComponent<CanvasGroup>().blocksRaycasts = false;
+    }
+
+    public void OnEndDrag(PointerEventData eventData) {
+        if (parent == null) {
+            this.transform.position = startPosition;
+            this.transform.SetSiblingIndex(placeholder.transform.GetSiblingIndex());
+        } else {
+            this.transform.SetParent(parent);
+        }
+        GetComponent<CanvasGroup>().blocksRaycasts = true;
+
+        Destroy(placeholder);
+    }
+}

+ 1 - 1
Assets/Scripts/Drag.cs.meta → Assets/Scripts/Draggable.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ac71313ea5cc2e54cae3e4e04a20b268
+guid: 06f334e0430ec0944ba0abce4592c950
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 36 - 0
Assets/Scripts/DropZone.cs

@@ -0,0 +1,36 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class DropZone : MonoBehaviour, IDropHandler, IPointerEnterHandler, IPointerExitHandler {
+
+    public void OnDrop(PointerEventData eventData) {
+        Draggable d = eventData.pointerDrag.GetComponent<Draggable>();
+        if (d != null) {
+            d.placeholderParent = this.transform;
+        }
+    }
+
+    public void OnPointerEnter(PointerEventData eventData) {
+        if (eventData.pointerDrag == null) {
+            return;
+        }
+
+        Draggable d = eventData.pointerDrag.GetComponent<Draggable>();
+        if (d != null) {
+            d.placeholderParent = this.transform;
+        }
+    }
+
+    public void OnPointerExit(PointerEventData eventData) {
+        if (eventData.pointerDrag == null) {
+            return;
+        }
+
+        Draggable d = eventData.pointerDrag.GetComponent<Draggable>();
+        if (d != null && d.placeholderParent == this.transform) {
+            d.placeholderParent = d.parent;
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/DropZone.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e8b2fc3684a5cca4e9de0bbec931fc27
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 1
Assets/Scripts/NewQuestion.cs

@@ -1,8 +1,9 @@
 using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 public class NewQuestion : QuestionCard {
+
     // Start is called before the first frame update
     void Start()
     {
@@ -10,8 +11,10 @@ public class NewQuestion : QuestionCard {
         SetQuestionData();
     }
 
+    
     public void SetQuestionData()
     {
         GetQuestion(false);
     }
+
 }

+ 6 - 15
Assets/Scripts/NewQuestionScript.cs

@@ -2,39 +2,30 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.EventSystems;
 
 public class NewQuestionScript : MonoBehaviour {
 
     public GameObject prefab;
     public Transform contentPanel;
+    QuestionCard questionCard;
     // Start is called before the first frame update
-    void Start()
-    {
+    void Start() {
         GetNewQuestionData();
     }
 
-    private void GetNewQuestionData()
-    {
+    private void GetNewQuestionData() {
         // if new game, create one question card to start with
         GameObject question = Instantiate(prefab, new Vector2(0, 0), Quaternion.identity) as GameObject;
-        NewQuestion questionCard = question.GetComponent<NewQuestion>();
+        questionCard = question.GetComponent<NewQuestion>();
         PrepareQuestion(questionCard);
         questionCard.GetQuestion(false);
 
-        Debug.Log("NEWQuestion start " + questionCard.questionText.text);
-
         questionCard.transform.SetParent(contentPanel);
     }
 
-    public void PrepareQuestion(QuestionCard qc)
-    {
+    public void PrepareQuestion(QuestionCard qc) {
         qc.questionText = GameObject.Find("NewQuestionText").GetComponent<Text>();
         qc.answerText = GameObject.Find("NewAnswerText").GetComponent<Text>();
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }

+ 5 - 7
Assets/Scripts/QuestionCard.cs

@@ -9,12 +9,11 @@ public class QuestionCard : MonoBehaviour
 {
     public Text questionText;
     public Text answerText;
-    private Image border;
 
-    public string questionString = "";
-    public string answerString = "";
-    public string idString = "";
-    public string categoryString = "";
+    private string questionString = "";
+    private string answerString = "";
+    private string idString = "";
+    private string categoryString = "";
 
     private Color32 unsafeColor = new Color32(255, 1, 1, 150);
     private Color32 safeColor = new Color32(1, 255, 1, 75);
@@ -41,7 +40,6 @@ public class QuestionCard : MonoBehaviour
     {
         questionText = GameObject.Find("QuestionText").GetComponent<Text>();
         answerText = GameObject.Find("AnswerText").GetComponent<Text>();
-        border = GameObject.Find("Border").GetComponent<Image>();
     }
 
     private IEnumerator GetQuestionData(bool showAnswer)
@@ -85,6 +83,6 @@ public class QuestionCard : MonoBehaviour
 
     public void SetQuestionSafe()
     {
-        border.color = safeColor;
+        this.GetComponent<Image>().color = safeColor;
     }
 }

+ 37 - 5
Assets/Scripts/ScrollViewScript.cs

@@ -1,8 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
-public class ScrollViewScript : MonoBehaviour
+public class ScrollViewScript : MonoBehaviour, IDropHandler, IPointerEnterHandler, IPointerExitHandler
 {
     public GameObject prefab;
     public Transform contentPanel;
@@ -24,10 +25,41 @@ public class ScrollViewScript : MonoBehaviour
 
         questionCard.transform.SetParent(contentPanel);
     }
+    /*
+    public void OnDrop(PointerEventData eventData) {
+        Debug.Log(eventData.pointerDrag + " dropped on " + gameObject.name);
+        Draggable d = eventData.pointerDrag.GetComponent<Draggable>();
+        if (d != null) {
+            // Kontrollera om man släppt kortet på en korrekt possition, 
+            d.parent = contentPanel;
+        }
+    } */
+    public void OnDrop(PointerEventData eventData) {
+        Draggable d = eventData.pointerDrag.GetComponent<Draggable>();
+        if (d != null) {
+            d.placeholderParent = this.transform;
+        }
+    }
 
-    // Update is called once per frame
-    void Update()
-    {
-        
+    public void OnPointerEnter(PointerEventData eventData) {
+        if (eventData.pointerDrag == null) {
+            return;
+        }
+
+        Draggable d = eventData.pointerDrag.GetComponent<Draggable>();
+        if (d != null) {
+            d.placeholderParent = this.transform;
+        }
+    }
+
+    public void OnPointerExit(PointerEventData eventData) {
+        if (eventData.pointerDrag == null) {
+            return;
+        }
+
+        Draggable d = eventData.pointerDrag.GetComponent<Draggable>();
+        if (d != null && d.placeholderParent == this.transform) {
+            d.placeholderParent = d.parent;
+        }
     }
 }

+ 221 - 83
Assets/narKampen.unity

@@ -220,72 +220,6 @@ MonoBehaviour:
   m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &561881491
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 561881494}
-  - component: {fileID: 561881493}
-  - component: {fileID: 561881492}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &561881492
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 561881491}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &561881493
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 561881491}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 5
---- !u!4 &561881494
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 561881491}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &757791029 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 4606992418804682740, guid: 952f6c50eed555c448854a8a8fdb799e,
@@ -488,8 +422,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1133529224}
   m_HandleRect: {fileID: 1133529223}
   m_Direction: 0
-  m_Value: 0
-  m_Size: 1
+  m_Value: 0.5
+  m_Size: 0.9999999
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -959,7 +893,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
-  m_MinWidth: 250
+  m_MinWidth: 100
   m_MinHeight: -1
   m_PreferredWidth: 300
   m_PreferredHeight: -1
@@ -980,6 +914,7 @@ GameObject:
   - component: {fileID: 1400291477}
   - component: {fileID: 1400291479}
   - component: {fileID: 1400291478}
+  - component: {fileID: 1400291480}
   m_Layer: 5
   m_Name: NewQuestionPanel
   m_TagString: Untagged
@@ -1075,7 +1010,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 44f825b6746897d4db56a5f8b4a2f084, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prefab: {fileID: 3395082336421756021, guid: 2baefb2b369147241a37ed01defd5e22, type: 3}
+  prefab: {fileID: 4662818861115959987, guid: e91b5c1a341f8be469b7bab25ee954d7, type: 3}
   contentPanel: {fileID: 1400291474}
 --- !u!114 &1400291479
 MonoBehaviour:
@@ -1100,6 +1035,18 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlHeight: 1
+--- !u!114 &1400291480
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1400291473}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e8b2fc3684a5cca4e9de0bbec931fc27, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &1423700018 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 4606992419449489139, guid: 952f6c50eed555c448854a8a8fdb799e,
@@ -1146,7 +1093,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1682926880 stripped
 MonoBehaviour:
@@ -1194,7 +1141,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.00008913179, y: 0}
+  m_AnchoredPosition: {x: -0.000038369853, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1715970008
@@ -1245,8 +1192,8 @@ GameObject:
   - component: {fileID: 1754055320}
   - component: {fileID: 1754055319}
   - component: {fileID: 1754055318}
-  - component: {fileID: 1754055317}
   - component: {fileID: 1754055321}
+  - component: {fileID: 1754055317}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -1263,7 +1210,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1754055316}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreReversedGraphics: 1
@@ -1359,6 +1306,72 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
   m_ChildControlHeight: 1
+--- !u!1 &1870062085
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1870062088}
+  - component: {fileID: 1870062087}
+  - component: {fileID: 1870062086}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1870062086
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1870062085}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1870062087
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1870062085}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1870062088
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1870062085}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1956041112
 GameObject:
   m_ObjectHideFlags: 0
@@ -1481,7 +1494,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 684c1f69bdbd6fb4ab209953393d9a9c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prefab: {fileID: 828492766240825314, guid: 66a4bacf087ffb848b07dd6b7ee79bba, type: 3}
+  prefab: {fileID: 2583734455467487379, guid: 66a4bacf087ffb848b07dd6b7ee79bba, type: 3}
   contentPanel: {fileID: 1715970007}
 --- !u!1 &2091956459
 GameObject:
@@ -1546,7 +1559,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &4606992418052486849
 PrefabInstance:
@@ -1560,6 +1573,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Modal Panel
       objectReference: {fileID: 0}
+    - target: {fileID: 4606992419111749744, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -1618,22 +1636,22 @@ PrefabInstance:
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 557.2581
       objectReference: {fileID: 0}
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -406.56677
       objectReference: {fileID: 0}
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1112.5162
       objectReference: {fileID: 0}
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 46.226715
       objectReference: {fileID: 0}
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
@@ -1643,17 +1661,17 @@ PrefabInstance:
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4606992419516846070, guid: 952f6c50eed555c448854a8a8fdb799e,
         type: 3}
@@ -1665,5 +1683,125 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
+    - target: {fileID: 4606992419367822045, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419367822045, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419367822045, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419367822045, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419367822045, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419367822045, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992418727110694, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992418727110694, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992418727110694, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992418727110694, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992418727110694, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992418727110694, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992420035552574, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992420035552574, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992420035552574, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992420035552574, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992420035552574, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992420035552574, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419968363940, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419968363940, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419210851140, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419210851140, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419210851140, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4606992419210851140, guid: 952f6c50eed555c448854a8a8fdb799e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 952f6c50eed555c448854a8a8fdb799e, type: 3}

+ 1 - 1
ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2018.3.4f1
+m_EditorVersion: 2018.3.7f1