diff --git a/Assets/Project/Prefabs/Interaction Canvas.prefab b/Assets/Project/Prefabs/Interaction Canvas.prefab index 68b9a02..94d097e 100644 --- a/Assets/Project/Prefabs/Interaction Canvas.prefab +++ b/Assets/Project/Prefabs/Interaction Canvas.prefab @@ -234,7 +234,7 @@ RectTransform: m_Children: - {fileID: 1636848380057103763} m_Father: {fileID: 7618683885887015085} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -654,7 +654,7 @@ RectTransform: m_Children: - {fileID: 1636848380031462533} m_Father: {fileID: 7618683885887015085} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1186,6 +1186,7 @@ RectTransform: - {fileID: 3944433987671751068} - {fileID: 1636848378519764368} - {fileID: 1636848380266032385} + - {fileID: 593312284358487049} - {fileID: 1636848379834419628} - {fileID: 1636848380063172519} - {fileID: 5397243351794453726} @@ -1234,7 +1235,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7618683885887015085} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1414,6 +1415,119 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &314611437135434802 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7618683885887015085} + m_Modifications: + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_SizeDelta.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_AnchoredPosition.x + value: -110 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1523598743811840760, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + propertyPath: m_Name + value: Review Queue + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} +--- !u!224 &593312284358487049 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 893514887629355067, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + m_PrefabInstance: {fileID: 314611437135434802} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7328563864762616756 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7055437948653346694, guid: 12f2117d110b11a4a9578ec7be2abbbf, type: 3} + m_PrefabInstance: {fileID: 314611437135434802} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2981ddae2c8398c468174f3b16262454, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2420460770352762329 PrefabInstance: m_ObjectHideFlags: 0 @@ -2015,7 +2129,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3425440239966454381, guid: 9873bc58750540c4caf749eab44ddd48, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3425440239966454381, guid: 9873bc58750540c4caf749eab44ddd48, type: 3} propertyPath: m_AnchorMax.x @@ -3260,7 +3374,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3181111360503444497, guid: 2718a448a410d344f895cede73ecc276, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 3181111360503444497, guid: 2718a448a410d344f895cede73ecc276, type: 3} propertyPath: m_AnchorMax.x @@ -3559,7 +3673,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6699556516868183421, guid: 4197cdbfe64f4b449beade5ad73806a6, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6699556516868183421, guid: 4197cdbfe64f4b449beade5ad73806a6, type: 3} propertyPath: m_AnchorMax.x @@ -3668,7 +3782,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2527637362693330649, guid: c0a48ec0dbbcae04294d2bf81edbb276, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 2527637362693330649, guid: c0a48ec0dbbcae04294d2bf81edbb276, type: 3} propertyPath: m_AnchorMax.x @@ -3903,6 +4017,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1583805534978165540, guid: 90a0dc82c98ca15458753f03ec5986ec, type: 3} + propertyPath: m_Queue + value: + objectReference: {fileID: 7328563864762616756} - target: {fileID: 1755072769748249776, guid: 90a0dc82c98ca15458753f03ec5986ec, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4201,7 +4319,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4620954029904748972, guid: 90a0dc82c98ca15458753f03ec5986ec, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4620954029904748972, guid: 90a0dc82c98ca15458753f03ec5986ec, type: 3} propertyPath: m_AnchorMax.x @@ -5021,7 +5139,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4620954029904748972, guid: f73594e34c860bf4db0bd32a553de7c1, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4620954029904748972, guid: f73594e34c860bf4db0bd32a553de7c1, type: 3} propertyPath: m_SizeDelta.y diff --git a/Assets/Project/Prefabs/InterfaceModules/Review Queue.prefab b/Assets/Project/Prefabs/InterfaceModules/Review Queue.prefab new file mode 100644 index 0000000..5b80d9f --- /dev/null +++ b/Assets/Project/Prefabs/InterfaceModules/Review Queue.prefab @@ -0,0 +1,112 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1523598743811840760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 893514887629355067} + - component: {fileID: 8727172516694990790} + - component: {fileID: 2322185863109548416} + - component: {fileID: 3497227477081285374} + - component: {fileID: 7055437948653346694} + m_Layer: 5 + m_Name: Review Queue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &893514887629355067 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523598743811840760} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -110, y: -20} + m_SizeDelta: {x: 400, y: 80} + m_Pivot: {x: 1, y: 1} +--- !u!222 &8727172516694990790 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523598743811840760} + m_CullTransparentMesh: 1 +--- !u!114 &2322185863109548416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523598743811840760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a3ee03a5fada3942b82c53c377b7113, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.27058825} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Outline: 0 + m_Thickness: 1 +--- !u!114 &3497227477081285374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523598743811840760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 2 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7055437948653346694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523598743811840760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2981ddae2c8398c468174f3b16262454, type: 3} + m_Name: + m_EditorClassIdentifier: + Items: [] + ItemPrefab: {fileID: 1656107568152232657, guid: aa3260be97d341f4fa7cdb88b9903019, type: 3} diff --git a/Assets/Project/Prefabs/InterfaceModules/Review Queue.prefab.meta b/Assets/Project/Prefabs/InterfaceModules/Review Queue.prefab.meta new file mode 100644 index 0000000..0372c59 --- /dev/null +++ b/Assets/Project/Prefabs/InterfaceModules/Review Queue.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 12f2117d110b11a4a9578ec7be2abbbf +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Project/Prefabs/MonitorGroup.prefab b/Assets/Project/Prefabs/MonitorGroup.prefab index 6847153..0d9578a 100644 --- a/Assets/Project/Prefabs/MonitorGroup.prefab +++ b/Assets/Project/Prefabs/MonitorGroup.prefab @@ -1207,6 +1207,38 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2274155454987628828} m_Modifications: + - target: {fileID: 73136325546376989, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 73136325546376989, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 73136325546376989, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 73136325546376989, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 76357563670584597, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 76357563670584597, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 76357563670584597, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 76357563670584597, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 117940913582895836, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_fontSizeBase value: 17 @@ -1247,6 +1279,22 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 260914893699896811, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 260914893699896811, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 260914893699896811, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 260914893699896811, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 380576040611611589, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1295,6 +1343,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 440869377660935173, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440869377660935173, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440869377660935173, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440869377660935173, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 476692233604492107, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1335,6 +1399,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 621690925679485631, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 621690925679485631, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 621690925679485631, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 621690925679485631, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 624913270827122871, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 624913270827122871, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 624913270827122871, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 624913270827122871, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 638875999734121491, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1363,6 +1459,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 734371377227573825, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 734371377227573825, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 734371377227573825, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 734371377227573825, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 825607726795324505, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1763,6 +1875,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1684413140170546852, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1684413140170546852, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1684413140170546852, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1684413140170546852, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1725142813558385900, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1835,6 +1963,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2014533037645447615, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2014533037645447615, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2014533037645447615, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2014533037645447615, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2016799564118955281, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1987,6 +2131,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2220215815131095310, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2220215815131095310, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2220215815131095310, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2220215815131095310, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2231800718728036321, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2471,6 +2631,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3518954375527407922, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3518954375527407922, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3518954375527407922, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3518954375527407922, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3581367048138374501, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2539,6 +2715,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3745946700256367335, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745946700256367335, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745946700256367335, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745946700256367335, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867486462225679203, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867486462225679203, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867486462225679203, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867486462225679203, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3869266523579021850, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2659,6 +2867,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4202897471549582669, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4202897471549582669, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4202897471549582669, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4202897471549582669, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4230293289418109383, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2675,6 +2899,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4324550912653819081, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4324550912653819081, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4324550912653819081, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4324550912653819081, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4405675805206446657, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2707,6 +2947,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4514359288226924776, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4514359288226924776, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4514359288226924776, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4514359288226924776, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4519329080903766227, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3059,6 +3315,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5121421184631908127, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5121421184631908127, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5121421184631908127, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5121421184631908127, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5237759269415908782, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3155,6 +3427,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5485426777858142787, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5485426777858142787, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5485426777858142787, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5485426777858142787, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5495889392696019584, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3191,6 +3479,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5519829741912218396, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5519829741912218396, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5519829741912218396, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5519829741912218396, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5558198472874599703, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3227,6 +3531,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5670477153449212605, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5670477153449212605, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5670477153449212605, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5670477153449212605, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5818180262161122226, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5818180262161122226, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5818180262161122226, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5818180262161122226, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5846041833694639638, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3259,6 +3595,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5868498884470687398, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5868498884470687398, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5868498884470687398, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5868498884470687398, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5893912101601210361, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5893912101601210361, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5893912101601210361, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5893912101601210361, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5924587243204545879, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3275,6 +3643,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6006345798684010247, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6006345798684010247, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6006345798684010247, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6006345798684010247, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6074191781150615063, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6074191781150615063, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6074191781150615063, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6074191781150615063, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6076402942026552728, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3375,6 +3775,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6263944957821080118, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6263944957821080118, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6263944957821080118, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6263944957821080118, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6281554065927652279, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3447,6 +3863,22 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 17.6 objectReference: {fileID: 0} + - target: {fileID: 6501001831861850061, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6501001831861850061, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6501001831861850061, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6501001831861850061, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6519652756105337251, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3491,6 +3923,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6555471041061436069, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6555471041061436069, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6555471041061436069, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6555471041061436069, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6669577622378079590, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3559,6 +4007,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6765580269221976509, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765580269221976509, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765580269221976509, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765580269221976509, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6788856067978597910, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3667,6 +4131,22 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7080159629765783112, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7080159629765783112, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7080159629765783112, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7080159629765783112, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7084190211738722875, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3703,6 +4183,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7097746950008183584, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097746950008183584, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097746950008183584, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097746950008183584, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7109429586459553377, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3919,6 +4415,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 7495719970506938207, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7495719970506938207, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7495719970506938207, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7495719970506938207, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7527737126421748234, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_fontSizeBase value: 17.6 @@ -3955,6 +4467,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7598434942653266708, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7598434942653266708, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7598434942653266708, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7598434942653266708, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7648652889055262390, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4003,6 +4531,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7773954201157891050, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7773954201157891050, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7773954201157891050, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7773954201157891050, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7859075502451632267, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4095,6 +4639,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7950666739293210331, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7950666739293210331, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7950666739293210331, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7950666739293210331, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7976273910403431345, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4163,6 +4723,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8339881481235290977, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8339881481235290977, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8339881481235290977, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8339881481235290977, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8348358904089385803, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4183,6 +4759,22 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8368302054434918385, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8368302054434918385, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8368302054434918385, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8368302054434918385, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8468057196765983795, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4199,6 +4791,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 8497556761554225893, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8497556761554225893, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8497556761554225893, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8497556761554225893, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8502279960603330095, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4371,6 +4979,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 9181437204439697050, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9181437204439697050, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9181437204439697050, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9181437204439697050, guid: bf09924d648c0d04da7173d418e011c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9214789231118360181, guid: bf09924d648c0d04da7173d418e011c6, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Project/Prefabs/Review.prefab b/Assets/Project/Prefabs/Review.prefab new file mode 100644 index 0000000..ccce754 --- /dev/null +++ b/Assets/Project/Prefabs/Review.prefab @@ -0,0 +1,303 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &94744255657519001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2401283227315956746} + - component: {fileID: 249389492449948861} + - component: {fileID: 6549587422991798572} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2401283227315956746 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94744255657519001} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9083286435426868826} + 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: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &249389492449948861 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94744255657519001} + m_CullTransparentMesh: 1 +--- !u!114 &6549587422991798572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94744255657519001} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d255e7dd7dabbe949b7e56c2f3e558f4, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3193663525759401265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3074067388415133711} + - component: {fileID: 4991709737492485647} + - component: {fileID: 6320663613724884645} + m_Layer: 5 + m_Name: Dial + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3074067388415133711 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3193663525759401265} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9083286435426868826} + m_RootOrder: 1 + 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: 115, y: 115} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4991709737492485647 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3193663525759401265} + m_CullTransparentMesh: 1 +--- !u!114 &6320663613724884645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3193663525759401265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b929d2ed17ea3e499cba99c528388cc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Resolution: 0 + m_StartDegrees: 90 + m_ArcDegrees: 360 + m_ArcFill: 1 + m_Outline: 0 + m_Thickness: 1 +--- !u!1 &4948194452654273634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9083286435426868826} + - component: {fileID: 7507064055678587211} + - component: {fileID: 3639888149319323573} + - component: {fileID: 6042242522768393999} + - component: {fileID: 2967056566678502680} + - component: {fileID: 1656107568152232657} + m_Layer: 5 + m_Name: Review + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9083286435426868826 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4948194452654273634} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2401283227315956746} + - {fileID: 3074067388415133711} + 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: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7507064055678587211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4948194452654273634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 1, g: 1, b: 1, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 6042242522768393999} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &3639888149319323573 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4948194452654273634} + m_CullTransparentMesh: 1 +--- !u!114 &6042242522768393999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4948194452654273634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a3ee03a5fada3942b82c53c377b7113, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.12310444, g: 0.03484337, b: 0.254717, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Outline: 0 + m_Thickness: 1 +--- !u!114 &2967056566678502680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4948194452654273634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} +--- !u!114 &1656107568152232657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4948194452654273634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa2afd7eca535624bb23c9515000e9ef, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Timer: + Period: 10 + m_Points: 0 + m_Guess: + m_RefObject: {fileID: 0} + m_Queue: {fileID: 0} + m_Button: {fileID: 7507064055678587211} + m_TimeDial: {fileID: 6320663613724884645} + m_Image: {fileID: 6549587422991798572} + m_Background: {fileID: 6042242522768393999} diff --git a/Assets/Project/Prefabs/Review.prefab.meta b/Assets/Project/Prefabs/Review.prefab.meta new file mode 100644 index 0000000..07d7fff --- /dev/null +++ b/Assets/Project/Prefabs/Review.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aa3260be97d341f4fa7cdb88b9903019 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Project/Scripts/General/GameConsts.cs b/Assets/Project/Scripts/General/GameConsts.cs index f752010..67be7f5 100644 --- a/Assets/Project/Scripts/General/GameConsts.cs +++ b/Assets/Project/Scripts/General/GameConsts.cs @@ -8,6 +8,11 @@ namespace AstroLab public class GameConsts : MonoBehaviour { public int SkyboxDist = 1000; + + public int IncorrectIDPenalty = -1; + + public Color CorrectColor = Color.green; + public Color IncorrectColor = Color.red; } static public class GameEvents @@ -29,4 +34,5 @@ static public class GameEvents static public readonly StringHash32 DataSlotCleared = "world:data-slot-cleared"; } + } diff --git a/Assets/Project/Scripts/General/Timer.cs b/Assets/Project/Scripts/General/Timer.cs new file mode 100644 index 0000000..0af5232 --- /dev/null +++ b/Assets/Project/Scripts/General/Timer.cs @@ -0,0 +1,37 @@ + + +using System; + +namespace AstroLab { + + [Serializable] + public struct Timer { + public float Period; + [NonSerialized] public bool Paused; + [NonSerialized] public float Accumulator; + [NonSerialized] public bool AdvancedRecently; + + public Timer(float period) { + Period = period; + Paused = false; + Accumulator = 0; + AdvancedRecently = false; + } + + public bool Advance(float deltaTime) { + if (Paused) return false; + Accumulator += deltaTime; + if (Accumulator >= Period) { + AdvancedRecently = true; + return true; + } else { + AdvancedRecently = false; + return false; + } + } + + public float GetProgress() { + return Accumulator / Period; + } + } +} \ No newline at end of file diff --git a/Assets/Project/Scripts/General/Timer.cs.meta b/Assets/Project/Scripts/General/Timer.cs.meta new file mode 100644 index 0000000..8663916 --- /dev/null +++ b/Assets/Project/Scripts/General/Timer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: db860d2ea6bb6c04d9b38140788adad8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Project/Scripts/UI/Interface/UICategoryNotebookModule.cs b/Assets/Project/Scripts/UI/Interface/UICategoryNotebookModule.cs index 8b6cc74..fa87bf9 100644 --- a/Assets/Project/Scripts/UI/Interface/UICategoryNotebookModule.cs +++ b/Assets/Project/Scripts/UI/Interface/UICategoryNotebookModule.cs @@ -10,6 +10,9 @@ namespace AstroLab { public class UICategoryNotebookModule : UIInterfaceModule { + + [SerializeField] private ReviewQueue m_Queue; + [Space(5)] [Header("Notebook")] [SerializeField] private Button[] m_ItemButtons; @@ -140,15 +143,17 @@ private void HandleIdentifyClicked() string guessId = CurrCategory.Title + "_" + CurrItem; string realId = FocusMgr.Instance.LastSelectedFocusable.CelestialObj.Data.IdentifyEntryID; - if (guessId.Equals(realId)) - { - FocusMgr.Instance.LastSelectedFocusable.CelestialObj.Identified = true; - GameMgr.Events.Dispatch(GameEvents.CelestialObjIdentified); - Log.Msg("Item identified! {0}", guessId); - } else { - Log.Msg("Incorrect identification :( It's actually {0}", realId); - } + m_Queue.AddNewItem(guessId, FocusMgr.Instance.LastSelectedFocusable.CelestialObj, 5f, 5); + //if (guessId.Equals(realId)) + //{ + // FocusMgr.Instance.LastSelectedFocusable.CelestialObj.Identified = true; + + // GameMgr.Events.Dispatch(GameEvents.CelestialObjIdentified); + // Log.Msg("Item identified! {0}", guessId); + //} else { + // Log.Msg("Incorrect identification :( It's actually {0}", realId); + //} m_identifyButton.interactable = false; } diff --git a/Assets/ReviewItem.cs b/Assets/ReviewItem.cs new file mode 100644 index 0000000..1c89169 --- /dev/null +++ b/Assets/ReviewItem.cs @@ -0,0 +1,76 @@ +using BeauUtil.Debugger; +using BeauUtil.UI; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace AstroLab { + public class ReviewItem : MonoBehaviour { + + [Header("Config")] + [SerializeField] private Timer m_Timer; + [SerializeField] private int m_Points; + [SerializeField] private string m_Guess; + [SerializeField] private CelestialObject m_RefObject; + [Space(4)] + + [Header("Components")] + [SerializeField] private ReviewQueue m_Queue; + [SerializeField] private Button m_Button; + [SerializeField] private EllipseGraphic m_TimeDial; + [SerializeField] private Image m_Image; + [SerializeField] private Graphic m_Background; + + void Start() { + m_Button.interactable = false; + m_Button.onClick.AddListener(HandleButtonPressed); + } + + void Update() { + if (m_Timer.Advance(Time.deltaTime)) { + // complete item + SetComplete(CheckCorrect()); + m_Timer.Paused = true; + } + m_TimeDial.ArcFill = (1 - m_Timer.GetProgress()); + } + + public void Populate(ReviewQueue queue, string guess, CelestialObject obj, float time, int pts) { + m_Queue = queue; + m_Timer = new Timer(time); + m_Guess = guess; + m_RefObject = obj; + m_Points = pts; + m_Image.sprite = obj.Data.Represent2D; + } + + private bool CheckCorrect() { + return m_Guess.Equals(m_RefObject.Data.IdentifyEntryID); + } + + private void SetComplete(bool correct) { + GameConsts consts = FindObjectOfType(); + + if (correct) { + m_Background.color = consts.CorrectColor; + m_RefObject.Identified = true; + GameMgr.Events.Dispatch(GameEvents.CelestialObjIdentified); + Log.Msg("Item identified! {0}", m_Guess); + } else { + m_Background.color = consts.IncorrectColor; + Log.Msg("Incorrect identification :( It's actually {0}", m_RefObject.Data.IdentifyEntryID); + m_Points = consts.IncorrectIDPenalty; + } + m_Button.interactable = true; + } + + private void HandleButtonPressed() { + // TODO + // AddXP(m_Points) + m_Queue.Items.Remove(this); + Destroy(gameObject); + } + } +} + diff --git a/Assets/ReviewItem.cs.meta b/Assets/ReviewItem.cs.meta new file mode 100644 index 0000000..650df8a --- /dev/null +++ b/Assets/ReviewItem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aa2afd7eca535624bb23c9515000e9ef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ReviewQueue.cs b/Assets/ReviewQueue.cs new file mode 100644 index 0000000..de4c886 --- /dev/null +++ b/Assets/ReviewQueue.cs @@ -0,0 +1,17 @@ +using BeauUtil.Debugger; +using System.Collections.Generic; +using UnityEngine; + +namespace AstroLab { + public class ReviewQueue : MonoBehaviour { + public List Items = new List(); + + [SerializeField] private ReviewItem ItemPrefab; + public void AddNewItem(string guess, CelestialObject refObject, float time, int pts) { + // TODO: check if item is already in queue + var NewItem = Instantiate(ItemPrefab, transform); + NewItem.Populate(this, guess, refObject, time, pts); + Items.Add(NewItem); + } + } +} diff --git a/Assets/ReviewQueue.cs.meta b/Assets/ReviewQueue.cs.meta new file mode 100644 index 0000000..d5361ab --- /dev/null +++ b/Assets/ReviewQueue.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2981ddae2c8398c468174f3b16262454 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: