From 6de15f94f7273ee139f09b0b98cbb03b3e034abd Mon Sep 17 00:00:00 2001 From: Samir Badi Date: Sat, 9 Nov 2024 12:36:25 -0500 Subject: [PATCH] Save --- Assets/Scenes/Samir.unity | 154 +++++++++++++++--- ...estionHolderUI.cs => QuestionDisplayUI.cs} | 6 +- ...erUI.cs.meta => QuestionDisplayUI.cs.meta} | 0 3 files changed, 133 insertions(+), 27 deletions(-) rename Assets/Scripts/UI/Quiz/{QuestionHolderUI.cs => QuestionDisplayUI.cs} (80%) rename Assets/Scripts/UI/Quiz/{QuestionHolderUI.cs.meta => QuestionDisplayUI.cs.meta} (100%) diff --git a/Assets/Scenes/Samir.unity b/Assets/Scenes/Samir.unity index 5121f2d..84d2ffa 100644 --- a/Assets/Scenes/Samir.unity +++ b/Assets/Scenes/Samir.unity @@ -267,6 +267,66 @@ Transform: - {fileID: 2076373778} m_Father: {fileID: 1958973072} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &81375270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 81375271} + - component: {fileID: 81375272} + m_Layer: 5 + m_Name: Questions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &81375271 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81375270} + 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: 297350527} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &81375272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81375270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 2000, y: 800} + m_Spacing: {x: 0, y: 40} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &110478555 GameObject: m_ObjectHideFlags: 0 @@ -845,6 +905,43 @@ Transform: type: 3} m_PrefabInstance: {fileID: 266640700} m_PrefabAsset: {fileID: 0} +--- !u!1 &297350526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 297350527} + m_Layer: 5 + m_Name: Scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &297350527 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 297350526} + 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: 595688925} + - {fileID: 81375271} + m_Father: {fileID: 484553101} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 16760} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &298469751 GameObject: m_ObjectHideFlags: 0 @@ -1188,8 +1285,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 230940466} - - {fileID: 1442894366} - {fileID: 1872289498} + - {fileID: 1442894366} m_Father: {fileID: 461561940} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1474,10 +1571,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 484553101} - - component: {fileID: 484553103} - component: {fileID: 484553102} + - component: {fileID: 484553104} m_Layer: 5 - m_Name: QuestionHolderUI + m_Name: QuestionDisplayUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1494,13 +1591,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 297350527} m_Father: {fileID: 1872289498} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -200} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 2000} m_Pivot: {x: 0.5, y: 1} --- !u!114 &484553102 MonoBehaviour: @@ -1516,7 +1614,8 @@ MonoBehaviour: m_EditorClassIdentifier: questionPrefab: {fileID: -195756202558770544, guid: 4990be67b296d704cb92c83d65fc54cd, type: 3} ---- !u!114 &484553103 + questionHolder: {fileID: 81375271} +--- !u!114 &484553104 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1525,21 +1624,27 @@ MonoBehaviour: m_GameObject: {fileID: 484553100} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} m_Name: m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 1 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 2000, y: 800} - m_Spacing: {x: 0, y: 40} - m_Constraint: 0 - m_ConstraintCount: 2 + m_Content: {fileID: 297350527} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 50 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &564588868 GameObject: m_ObjectHideFlags: 0 @@ -1776,12 +1881,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 595688924} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1872289498} + m_Father: {fileID: 297350527} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4004,7 +4109,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 595688925} - {fileID: 484553101} m_Father: {fileID: 360155762} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/UI/Quiz/QuestionHolderUI.cs b/Assets/Scripts/UI/Quiz/QuestionDisplayUI.cs similarity index 80% rename from Assets/Scripts/UI/Quiz/QuestionHolderUI.cs rename to Assets/Scripts/UI/Quiz/QuestionDisplayUI.cs index d70620f..e56cc4c 100644 --- a/Assets/Scripts/UI/Quiz/QuestionHolderUI.cs +++ b/Assets/Scripts/UI/Quiz/QuestionDisplayUI.cs @@ -3,12 +3,14 @@ using System.Collections.Generic; using GameOff.Core; using GameOff.Quiz; using UnityEngine; +using UnityEngine.Serialization; namespace GameOff.UI.Quiz { - public class QuestionHolderUI: MonoBehaviour + public class QuestionDisplayUI: MonoBehaviour { [SerializeField] private QuestionUI questionPrefab; + [SerializeField] private Transform questionHolder; private void Start() { @@ -21,7 +23,7 @@ namespace GameOff.UI.Quiz for (int i = 1; i <= infos.Count; i++) { - QuestionUI visual = Instantiate(questionPrefab, transform); + QuestionUI visual = Instantiate(questionPrefab, questionHolder); visual.SetUp(infos[i - 1]); visual.transform.name = $"Question-{i}"; } diff --git a/Assets/Scripts/UI/Quiz/QuestionHolderUI.cs.meta b/Assets/Scripts/UI/Quiz/QuestionDisplayUI.cs.meta similarity index 100% rename from Assets/Scripts/UI/Quiz/QuestionHolderUI.cs.meta rename to Assets/Scripts/UI/Quiz/QuestionDisplayUI.cs.meta