From 598b9c5eeb6e0ee8ba4c7928c5b154dac42875d8 Mon Sep 17 00:00:00 2001 From: Shavira Date: Thu, 29 May 2025 09:36:00 +0700 Subject: [PATCH] Update Layout Pretest, Postest --- .../Prefabs/UI Menu/PopUp Post Test.prefab | 19 ++-- Assets/ToothyV/Scenes/MainMenu.unity | 101 ------------------ .../{ => ToothyV/Scripts/UI}/PostTestMenu.cs | 14 ++- .../Scripts/UI}/PostTestMenu.cs.meta | 0 .../{ => ToothyV/Scripts/UI}/PreTestMenu.cs | 11 +- .../Scripts/UI}/PreTestMenu.cs.meta | 0 6 files changed, 33 insertions(+), 112 deletions(-) rename Assets/{ => ToothyV/Scripts/UI}/PostTestMenu.cs (88%) rename Assets/{ => ToothyV/Scripts/UI}/PostTestMenu.cs.meta (100%) rename Assets/{ => ToothyV/Scripts/UI}/PreTestMenu.cs (89%) rename Assets/{ => ToothyV/Scripts/UI}/PreTestMenu.cs.meta (100%) diff --git a/Assets/ToothyV/Prefabs/UI Menu/PopUp Post Test.prefab b/Assets/ToothyV/Prefabs/UI Menu/PopUp Post Test.prefab index 046c65a..5b85e9c 100644 --- a/Assets/ToothyV/Prefabs/UI Menu/PopUp Post Test.prefab +++ b/Assets/ToothyV/Prefabs/UI Menu/PopUp Post Test.prefab @@ -132,6 +132,9 @@ MonoBehaviour: - {fileID: 2323323422131760930} - {fileID: 2323323422542611504} - {fileID: 2323323421450116807} + normalButttonSprite: {fileID: 21300000, guid: b0eb9c535328048ca85e8a9f5088e776, type: 3} + trueAnswerSprite: {fileID: 21300000, guid: b32a6d84afc984b61b05b20c3d44569b, type: 3} + falseAnswerSprite: {fileID: 21300000, guid: e6404ce3667f546569c1c59a6de9495d, type: 3} timerText: {fileID: 8569834124009968930} timeToComplete: 30 timeToShowAnswer: 1 @@ -798,8 +801,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: PreTestMenu, Assembly-CSharp + - m_Target: {fileID: 2121418773813650335} + m_TargetAssemblyTypeName: PostTestMenu, Assembly-CSharp m_MethodName: OnAnswerSelected m_Mode: 3 m_Arguments: @@ -1203,8 +1206,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: PreTestMenu, Assembly-CSharp + - m_Target: {fileID: 2121418773813650335} + m_TargetAssemblyTypeName: PostTestMenu, Assembly-CSharp m_MethodName: OnAnswerSelected m_Mode: 3 m_Arguments: @@ -1403,8 +1406,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: PreTestMenu, Assembly-CSharp + - m_Target: {fileID: 2121418773813650335} + m_TargetAssemblyTypeName: PostTestMenu, Assembly-CSharp m_MethodName: OnAnswerSelected m_Mode: 3 m_Arguments: @@ -1538,8 +1541,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: PreTestMenu, Assembly-CSharp + - m_Target: {fileID: 2121418773813650335} + m_TargetAssemblyTypeName: PostTestMenu, Assembly-CSharp m_MethodName: OnAnswerSelected m_Mode: 3 m_Arguments: diff --git a/Assets/ToothyV/Scenes/MainMenu.unity b/Assets/ToothyV/Scenes/MainMenu.unity index 0b77cea..5564d21 100644 --- a/Assets/ToothyV/Scenes/MainMenu.unity +++ b/Assets/ToothyV/Scenes/MainMenu.unity @@ -122,107 +122,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &154800206 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 154800210} - - component: {fileID: 154800209} - - component: {fileID: 154800208} - - component: {fileID: 154800207} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &154800207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 154800206} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &154800208 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 154800206} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &154800209 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 154800206} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &154800210 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 154800206} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - 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, y: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/PostTestMenu.cs b/Assets/ToothyV/Scripts/UI/PostTestMenu.cs similarity index 88% rename from Assets/PostTestMenu.cs rename to Assets/ToothyV/Scripts/UI/PostTestMenu.cs index 922f6cb..4269e59 100644 --- a/Assets/PostTestMenu.cs +++ b/Assets/ToothyV/Scripts/UI/PostTestMenu.cs @@ -11,6 +11,11 @@ public class PostTestMenu : Menu [SerializeField] TextMeshProUGUI questionText; [SerializeField] List questions = new List(); [SerializeField] GameObject[] answerButtons; + + [Header("Answers")] + [SerializeField] private Sprite normalButttonSprite; + [SerializeField] private Sprite trueAnswerSprite; + [SerializeField] private Sprite falseAnswerSprite; [Header("UI")] [SerializeField] TextMeshProUGUI timerText; @@ -70,7 +75,9 @@ public class PostTestMenu : Menu await EndGame(); return; } + + Image buttonImage; int index = Random.Range(0, questions.Count); currentQuestion = questions[index]; questions.RemoveAt(index); @@ -80,6 +87,8 @@ public class PostTestMenu : Menu for (int i = 0; i < answerButtons.Length; i++) { TextMeshProUGUI buttonText = answerButtons[i].GetComponentInChildren(); + buttonImage = answerButtons[i].GetComponent(); + buttonImage.sprite = normalButttonSprite; buttonText.text = currentQuestion.GetAnswer(i); answerButtons[i].GetComponent().color = Color.white; answerButtons[i].GetComponent