Fix UI and Dubbing

This commit is contained in:
itsvraza 2025-07-15 16:51:17 +07:00
parent b4ad47a06c
commit 4f7b5f254f
5 changed files with 209 additions and 157 deletions

View File

@ -194,7 +194,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -1386,7 +1386,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &1189661590854077915 --- !u!114 &1189661590854077915
MonoBehaviour: MonoBehaviour:
@ -1422,7 +1422,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -1575,7 +1575,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -3051,7 +3051,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 69.069305, y: -10} m_AnchoredPosition: {x: 69.069305, y: -24.614382}
m_SizeDelta: {x: 180.1386, y: 47.2287} m_SizeDelta: {x: 180.1386, y: 47.2287}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2729722545652982203 --- !u!222 &2729722545652982203
@ -3113,11 +3113,11 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 1
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 0.91764706, g: 0.9647059, b: 0.99215686, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_HighlightedColor: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_PressedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_SelectedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_DisabledColor: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 0.5019608}
m_ColorMultiplier: 1 m_ColorMultiplier: 1
m_FadeDuration: 0.1 m_FadeDuration: 0.1
m_SpriteState: m_SpriteState:
@ -3269,11 +3269,11 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 1
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 0.91764706, g: 0.9647059, b: 0.99215686, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_HighlightedColor: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_PressedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_SelectedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_DisabledColor: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 0.5019608}
m_ColorMultiplier: 1 m_ColorMultiplier: 1
m_FadeDuration: 0.1 m_FadeDuration: 0.1
m_SpriteState: m_SpriteState:
@ -3564,7 +3564,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1174496865893196477 --- !u!224 &1174496865893196477
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3645,11 +3645,11 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 1
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 0.91764706, g: 0.9647059, b: 0.99215686, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_HighlightedColor: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_PressedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_SelectedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_DisabledColor: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 0.5019608}
m_ColorMultiplier: 1 m_ColorMultiplier: 1
m_FadeDuration: 0.1 m_FadeDuration: 0.1
m_SpriteState: m_SpriteState:
@ -4445,7 +4445,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.5568628, g: 0.9254902, b: 0.90588236, a: 1} m_Color: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -4597,7 +4597,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -5085,7 +5085,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 2} m_AnchoredPosition: {x: 0, y: 2}
m_SizeDelta: {x: 0, y: 229.5478} m_SizeDelta: {x: 0, y: 250}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3956411770406986509 --- !u!222 &3956411770406986509
CanvasRenderer: CanvasRenderer:
@ -5108,7 +5108,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -8102,7 +8102,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -8178,7 +8178,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -8763,7 +8763,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -8954,7 +8954,7 @@ MonoBehaviour:
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.18431373, g: 0.46274513, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -9088,8 +9088,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4281479730 rgba: 4289492527
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_fontColor: {r: 0.18431373, g: 0.46274513, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -9224,7 +9224,7 @@ MonoBehaviour:
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.18431373, g: 0.46274513, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -12213,7 +12213,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.708, g: 0.8734667, b: 0.9647059, a: 1} m_Color: {r: 0.81568635, g: 0.94117653, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -12576,7 +12576,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.015686275, g: 0.59607846, b: 0.92941177, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -12957,7 +12957,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.5568628, g: 0.9254902, b: 0.90588236, a: 1} m_Color: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -13009,7 +13009,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -136.9, y: 0} m_AnchoredPosition: {x: -129.9, y: -2}
m_SizeDelta: {x: 200, y: 50} m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &682092670934755072 --- !u!222 &682092670934755072
@ -13049,8 +13049,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4289492527
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.18431373, g: 0.4627451, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -13281,9 +13281,9 @@ RectTransform:
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 2} m_AnchoredPosition: {x: 87.569, y: 0}
m_SizeDelta: {x: 0, y: 229.5478} m_SizeDelta: {x: 175.14, y: 250}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5205391767363208620 --- !u!222 &5205391767363208620
CanvasRenderer: CanvasRenderer:
@ -13306,7 +13306,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -14130,7 +14130,7 @@ GameObject:
- component: {fileID: 2515667624664920969} - component: {fileID: 2515667624664920969}
- component: {fileID: 757676863770033751} - component: {fileID: 757676863770033751}
m_Layer: 5 m_Layer: 5
m_Name: Text (TMP) m_Name: Input Birthday
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -14153,7 +14153,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.000030517578, y: -15} m_AnchoredPosition: {x: -0.000030517578, y: -40}
m_SizeDelta: {x: 0, y: 50} m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &2515667624664920969 --- !u!222 &2515667624664920969
@ -14184,7 +14184,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: Input your birthday m_text: Input Birthday
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 015573da50ed04390be9f20287a541d6, type: 2} m_fontAsset: {fileID: 11400000, guid: 015573da50ed04390be9f20287a541d6, type: 2}
m_sharedMaterial: {fileID: -2237749729835323621, guid: 015573da50ed04390be9f20287a541d6, type: 2} m_sharedMaterial: {fileID: -2237749729835323621, guid: 015573da50ed04390be9f20287a541d6, type: 2}
@ -14193,8 +14193,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4289492527
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.18431373, g: 0.46274513, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -14485,8 +14485,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4289492527
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.18431373, g: 0.46274513, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -14657,8 +14657,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4281479730 rgba: 4289492527
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_fontColor: {r: 0.18431373, g: 0.46274513, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -14675,8 +14675,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 29.3 m_fontSize: 28
m_fontSizeBase: 29.3 m_fontSizeBase: 28
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
@ -15346,11 +15346,11 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 1
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 0.91764706, g: 0.9647059, b: 0.99215686, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_HighlightedColor: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_PressedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_SelectedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_DisabledColor: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 0.5019608}
m_ColorMultiplier: 1 m_ColorMultiplier: 1
m_FadeDuration: 0.1 m_FadeDuration: 0.1
m_SpriteState: m_SpriteState:
@ -15368,7 +15368,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 4468590405266159402} m_TargetGraphic: {fileID: 4468590405266159402}
m_HandleRect: {fileID: 7456817482127501815} m_HandleRect: {fileID: 7456817482127501815}
m_Direction: 2 m_Direction: 2
m_Value: 1 m_Value: 0
m_Size: 1 m_Size: 1
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
@ -15968,10 +15968,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: 'Game ini hanya untuk anak-anak usia 6 sampai 12 tahun. m_text: Game ini hanya untuk anak usia 6-9 tahun. Mohon masukkan usia yang sesuai!
Mohon masukkan
usia yang sesuai ya'
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9fa5016cb7e534c0aa0c0adb2ecf9124, type: 2} m_fontAsset: {fileID: 11400000, guid: 9fa5016cb7e534c0aa0c0adb2ecf9124, type: 2}
m_sharedMaterial: {fileID: 6098576539282327867, guid: 9fa5016cb7e534c0aa0c0adb2ecf9124, type: 2} m_sharedMaterial: {fileID: 6098576539282327867, guid: 9fa5016cb7e534c0aa0c0adb2ecf9124, type: 2}
@ -15998,8 +15995,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 32 m_fontSize: 34
m_fontSizeBase: 32 m_fontSizeBase: 34
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
@ -16182,7 +16179,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: 2010 m_text: 2015
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 015573da50ed04390be9f20287a541d6, type: 2} m_fontAsset: {fileID: 11400000, guid: 015573da50ed04390be9f20287a541d6, type: 2}
m_sharedMaterial: {fileID: -2237749729835323621, guid: 015573da50ed04390be9f20287a541d6, type: 2} m_sharedMaterial: {fileID: -2237749729835323621, guid: 015573da50ed04390be9f20287a541d6, type: 2}
@ -16191,8 +16188,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4281479730 rgba: 4289492527
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_fontColor: {r: 0.18431373, g: 0.46274513, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -17241,7 +17238,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.015686275, g: 0.59607846, b: 0.92941177, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -17298,7 +17295,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 69.069305, y: 71.61438} m_AnchoredPosition: {x: 69.069305, y: 57}
m_SizeDelta: {x: 180.1386, y: 47.2287} m_SizeDelta: {x: 180.1386, y: 47.2287}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &749489733595242818 --- !u!222 &749489733595242818
@ -17360,11 +17357,11 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 1
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 0.91764706, g: 0.9647059, b: 0.99215686, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_HighlightedColor: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_PressedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_SelectedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_DisabledColor: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 0.5019608}
m_ColorMultiplier: 1 m_ColorMultiplier: 1
m_FadeDuration: 0.1 m_FadeDuration: 0.1
m_SpriteState: m_SpriteState:
@ -17451,8 +17448,6 @@ MonoBehaviour:
m_Image: {fileID: 0} m_Image: {fileID: 0}
- m_Text: 31 - m_Text: 31
m_Image: {fileID: 0} m_Image: {fileID: 0}
- m_Text: 32
m_Image: {fileID: 0}
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -17492,7 +17487,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -137, y: 0} m_AnchoredPosition: {x: -130, y: -2}
m_SizeDelta: {x: 200, y: 50} m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8422327703586903868 --- !u!222 &8422327703586903868
@ -17532,8 +17527,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4289492527
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.18431373, g: 0.4627451, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -17803,7 +17798,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -17879,7 +17874,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.5568628, g: 0.9254902, b: 0.90588236, a: 1} m_Color: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -18858,7 +18853,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 69.069305, y: -95} m_AnchoredPosition: {x: 69.069305, y: -109.61438}
m_SizeDelta: {x: 180.1386, y: 47.2287} m_SizeDelta: {x: 180.1386, y: 47.2287}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8404479907356505764 --- !u!222 &8404479907356505764
@ -18920,11 +18915,11 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 1
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 0.91764706, g: 0.9647059, b: 0.99215686, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_HighlightedColor: {r: 0.74509805, g: 0.8901961, b: 0.972549, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_PressedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_SelectedColor: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_DisabledColor: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 0.5019608}
m_ColorMultiplier: 1 m_ColorMultiplier: 1
m_FadeDuration: 0.1 m_FadeDuration: 0.1
m_SpriteState: m_SpriteState:
@ -18949,16 +18944,6 @@ MonoBehaviour:
m_Value: 0 m_Value: 0
m_Options: m_Options:
m_Options: m_Options:
- m_Text: 2010
m_Image: {fileID: 0}
- m_Text: 2011
m_Image: {fileID: 0}
- m_Text: 2012
m_Image: {fileID: 0}
- m_Text: 2013
m_Image: {fileID: 0}
- m_Text: 2014
m_Image: {fileID: 0}
- m_Text: 2015 - m_Text: 2015
m_Image: {fileID: 0} m_Image: {fileID: 0}
- m_Text: 2016 - m_Text: 2016
@ -19554,7 +19539,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -20008,7 +19993,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -136.9, y: 0} m_AnchoredPosition: {x: -129.9, y: -5}
m_SizeDelta: {x: 200, y: 50} m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3661677003401119064 --- !u!222 &3661677003401119064
@ -20048,8 +20033,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4289492527
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.18431373, g: 0.4627451, b: 0.6745098, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -20559,7 +20544,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.015686275, g: 0.59607846, b: 0.9294118, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -20639,7 +20624,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.015686275, g: 0.59607846, b: 0.9294118, a: 1} m_Color: {r: 0.8156863, g: 0.9411765, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -22408,7 +22393,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 2} m_AnchoredPosition: {x: 0, y: 2}
m_SizeDelta: {x: 0, y: 229.5478} m_SizeDelta: {x: 0, y: 250}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3199866838963296930 --- !u!222 &3199866838963296930
CanvasRenderer: CanvasRenderer:
@ -22431,7 +22416,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.4745098, g: 0.72156864, b: 0.9529412, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1

View File

@ -9,7 +9,7 @@ public class AuntMenu : Menu<AuntMenu>
{ {
[SerializeField] private GameObject loadingScreen; [SerializeField] private GameObject loadingScreen;
[Header("Register")] [Header("Register")]
[SerializeField] private TMP_InputField usernameFieldRegister; [SerializeField] private TMP_InputField usernameFieldRegister;
[SerializeField] private TMP_InputField nameFieldRegister; [SerializeField] private TMP_InputField nameFieldRegister;
[SerializeField] private TMP_InputField paswordFieldRegister; [SerializeField] private TMP_InputField paswordFieldRegister;
@ -26,7 +26,7 @@ public class AuntMenu : Menu<AuntMenu>
[SerializeField] private GameObject RegisterObj; [SerializeField] private GameObject RegisterObj;
[SerializeField] private GameObject InvalidAge; [SerializeField] private GameObject InvalidAge;
[Header("Login")] [Header("Login")]
[SerializeField] private TMP_InputField usernameFieldLogin; [SerializeField] private TMP_InputField usernameFieldLogin;
[SerializeField] private TMP_InputField paswordFieldLogin; [SerializeField] private TMP_InputField paswordFieldLogin;
private string usernameLogin; private string usernameLogin;
@ -99,20 +99,26 @@ public class AuntMenu : Menu<AuntMenu>
paswordRegister = paswordFieldRegister.text; paswordRegister = paswordFieldRegister.text;
EmailRegister = EmailFieldRegister.text; EmailRegister = EmailFieldRegister.text;
int day = dateAgeRegister.value + 1; int day = dateAgeRegister.value + 1;
int month = monthAgeRegister.value + 1; int month = monthAgeRegister.value + 1;
int year = int.Parse(yearAgeRegister.options[yearAgeRegister.value].text); int year = int.Parse(yearAgeRegister.options[yearAgeRegister.value].text);
DateTime birthDate = new DateTime(year, month, day); // Validasi tanggal + hitung umur
calculatedAge = CalculateAge(birthDate); if (!TryGetValidAge(year, month, day, out calculatedAge))
// {
// if (calculatedAge < 6 || calculatedAge > 12) Debug.LogWarning("Tanggal tidak valid!");
// { InvalidAge.SetActive(true);
// Debug.LogWarning("Age must be between 6 and 12 years!"); ResetRegisterFields();
// Debug.Log(calculatedAge); return;
// InvalidAge.SetActive(true); }
// return;
// } if (calculatedAge < 6 || calculatedAge > 9)
{
Debug.LogWarning("Usia harus antara 6 sampai 9 tahun!");
InvalidAge.SetActive(true);
ResetRegisterFields();
return;
}
await AuthenticationManager.SignUpUsernamePassword(usernameRegister, paswordRegister, EmailRegister, calculatedAge.ToString()); await AuthenticationManager.SignUpUsernamePassword(usernameRegister, paswordRegister, EmailRegister, calculatedAge.ToString());
@ -125,6 +131,21 @@ public class AuntMenu : Menu<AuntMenu>
await Cloudsave.SaveData(dataToSave, "DataPlayer"); await Cloudsave.SaveData(dataToSave, "DataPlayer");
} }
private bool TryGetValidAge(int year, int month, int day, out int age)
{
try
{
DateTime birthDate = new DateTime(year, month, day);
age = CalculateAge(birthDate);
return true;
}
catch (ArgumentOutOfRangeException)
{
age = 0;
return false;
}
}
private int CalculateAge(DateTime birthDate) private int CalculateAge(DateTime birthDate)
{ {
DateTime today = DateTime.Today; DateTime today = DateTime.Today;
@ -132,4 +153,15 @@ public class AuntMenu : Menu<AuntMenu>
if (birthDate.Date > today.AddYears(-age)) age--; if (birthDate.Date > today.AddYears(-age)) age--;
return age; return age;
} }
}
private void ResetRegisterFields()
{
usernameFieldRegister.text = "";
nameFieldRegister.text = "";
paswordFieldRegister.text = "";
EmailFieldRegister.text = "";
dateAgeRegister.value = 0;
monthAgeRegister.value = 0;
yearAgeRegister.value = 0;
}
}

View File

@ -11,8 +11,8 @@ public class PostTestMenu : Menu<PostTestMenu>
[SerializeField] TextMeshProUGUI questionText; [SerializeField] TextMeshProUGUI questionText;
[SerializeField] List<QuestionSO> questions = new List<QuestionSO>(); [SerializeField] List<QuestionSO> questions = new List<QuestionSO>();
[SerializeField] GameObject[] answerButtons; [SerializeField] GameObject[] answerButtons;
[Header("Answers")] [Header("Answers")]
[SerializeField] private Sprite normalButttonSprite; [SerializeField] private Sprite normalButttonSprite;
[SerializeField] private Sprite trueAnswerSprite; [SerializeField] private Sprite trueAnswerSprite;
[SerializeField] private Sprite falseAnswerSprite; [SerializeField] private Sprite falseAnswerSprite;
@ -33,12 +33,12 @@ public class PostTestMenu : Menu<PostTestMenu>
bool isComplete = false; bool isComplete = false;
SaveData saveData; SaveData saveData;
int correctAnswers = 0; int correctAnswers = 0;
int totalQuestions = 10; int totalQuestions = 10;
private int indexEnable = 0; private int indexEnable = 0;
private async void OnEnable() private async void OnEnable()
{ {
indexEnable++; indexEnable++;
@ -86,7 +86,7 @@ public class PostTestMenu : Menu<PostTestMenu>
await EndGame(); await EndGame();
return; return;
} }
Image buttonImage; Image buttonImage;
int index = Random.Range(0, questions.Count); int index = Random.Range(0, questions.Count);
@ -109,10 +109,10 @@ public class PostTestMenu : Menu<PostTestMenu>
timer = timeToComplete; timer = timeToComplete;
isAnswering = true; isAnswering = true;
hasAnsweredEarly = false; hasAnsweredEarly = false;
audioController.Instance.StopDubbing(); audioController.Instance.StopDubbing();
audioController.Instance.PlayDubbing(currentQuestion.dubbingName); audioController.Instance.PlayDubbing(currentQuestion.dubbingName);
} }
public void OnAnswerSelected(int index) public void OnAnswerSelected(int index)
@ -132,7 +132,7 @@ public class PostTestMenu : Menu<PostTestMenu>
if (index == correctAnswerIndex) if (index == correctAnswerIndex)
{ {
correctAnswers ++; correctAnswers++;
Debug.Log("Jawab Benar"); Debug.Log("Jawab Benar");
selectedImage.sprite = trueAnswerSprite; selectedImage.sprite = trueAnswerSprite;
questionText.text = "Jawaban Benar!"; questionText.text = "Jawaban Benar!";
@ -146,7 +146,7 @@ public class PostTestMenu : Menu<PostTestMenu>
saveData.postTestStatistik = (int)(((float)correctAnswers / totalQuestions) * 100f); saveData.postTestStatistik = (int)(((float)correctAnswers / totalQuestions) * 100f);
} }
void ShowCorrectAnswer() void ShowCorrectAnswer()
{ {
isAnswering = false; isAnswering = false;
@ -168,10 +168,22 @@ public class PostTestMenu : Menu<PostTestMenu>
private async Task EndGame() private async Task EndGame()
{ {
isComplete = true; isComplete = true;
int finalScore = (int)(((float)correctAnswers / totalQuestions) * 100f); int finalScore = (int)(((float)correctAnswers / totalQuestions) * 100f);
saveData.postTestStatistik = finalScore; saveData.postTestStatistik = finalScore;
await Cloudsave.SaveData(saveData, "DataPlayer"); await Cloudsave.SaveData(saveData, "DataPlayer");
MainMenu.Open(); MainMenu.Open();
SelectLevel.Open(); SelectLevel.Open();
} }
private void OnDisable()
{
audioController.Instance.StopDubbing();
}
public override void OnBackPressed()
{
base.OnBackPressed();
audioController.Instance.StopDubbing();
}
} }

View File

@ -14,8 +14,8 @@ public class PreTestMenu : Menu<PreTestMenu>
[Header("UI")] [Header("UI")]
[SerializeField] TextMeshProUGUI timerText; [SerializeField] TextMeshProUGUI timerText;
[Header("Answers")] [Header("Answers")]
[SerializeField] private Sprite normalButttonSprite; [SerializeField] private Sprite normalButttonSprite;
[SerializeField] private Sprite trueAnswerSprite; [SerializeField] private Sprite trueAnswerSprite;
[SerializeField] private Sprite falseAnswerSprite; [SerializeField] private Sprite falseAnswerSprite;
@ -31,10 +31,10 @@ public class PreTestMenu : Menu<PreTestMenu>
QuestionSO currentQuestion; QuestionSO currentQuestion;
bool isComplete = false; bool isComplete = false;
SaveData saveData; SaveData saveData;
int correctAnswers = 0; int correctAnswers = 0;
int totalQuestions = 10; int totalQuestions = 10;
private int indexEnable = 0; private int indexEnable = 0;
@ -51,15 +51,15 @@ public class PreTestMenu : Menu<PreTestMenu>
private async Task LoadAndRefresh() private async Task LoadAndRefresh()
{ {
saveData = await Cloudsave.LoadData<SaveData>("DataPlayer"); saveData = await Cloudsave.LoadData<SaveData>("DataPlayer");
saveData.isPreTestComplete = true; saveData.isPreTestComplete = true;
} }
void Update() void Update()
{ {
if (isComplete) return; if (isComplete) return;
if(indexEnable == 0) return; if (indexEnable == 0) return;
if (isComplete) return; if (isComplete) return;
timer -= Time.deltaTime; timer -= Time.deltaTime;
@ -113,7 +113,7 @@ public class PreTestMenu : Menu<PreTestMenu>
timer = timeToComplete; timer = timeToComplete;
isAnswering = true; isAnswering = true;
hasAnsweredEarly = false; hasAnsweredEarly = false;
audioController.Instance.StopDubbing(); audioController.Instance.StopDubbing();
audioController.Instance.PlayDubbing(currentQuestion.dubbingName); audioController.Instance.PlayDubbing(currentQuestion.dubbingName);
} }
@ -169,10 +169,21 @@ public class PreTestMenu : Menu<PreTestMenu>
private async Task EndGame() private async Task EndGame()
{ {
isComplete = true; isComplete = true;
int finalScore = (int)(((float)correctAnswers / totalQuestions) * 100f); int finalScore = (int)(((float)correctAnswers / totalQuestions) * 100f);
saveData.preTestStatistik = finalScore; saveData.preTestStatistik = finalScore;
await Cloudsave.SaveData(saveData, "DataPlayer"); await Cloudsave.SaveData(saveData, "DataPlayer");
MainMenu.Open(); MainMenu.Open();
SelectLevel.Open(); SelectLevel.Open();
} }
}
private void OnDisable()
{
audioController.Instance.StopDubbing();
}
public override void OnBackPressed()
{
base.OnBackPressed();
audioController.Instance.StopDubbing();
}
}

View File

@ -9,7 +9,7 @@ public class QuizPopUp : Menu<QuizPopUp>
[SerializeField] TextMeshProUGUI questionText; [SerializeField] TextMeshProUGUI questionText;
[SerializeField] QuestionSO currentQuestion; [SerializeField] QuestionSO currentQuestion;
[Header("Answers")] [Header("Answers")]
[SerializeField] private Sprite normalButttonSprite; [SerializeField] private Sprite normalButttonSprite;
[SerializeField] private Sprite trueAnswerSprite; [SerializeField] private Sprite trueAnswerSprite;
[SerializeField] private Sprite falseAnswerSprite; [SerializeField] private Sprite falseAnswerSprite;
@ -26,7 +26,7 @@ public class QuizPopUp : Menu<QuizPopUp>
public bool isComplete = false; public bool isComplete = false;
bool isGameOver = false; bool isGameOver = false;
//======================== //========================
[SerializeField] float timeToCompleteQuestion = 30f; [SerializeField] float timeToCompleteQuestion = 30f;
[SerializeField] float timeToShowCorrectAnswer = 10f; [SerializeField] float timeToShowCorrectAnswer = 10f;
@ -46,7 +46,7 @@ public class QuizPopUp : Menu<QuizPopUp>
correctAnswerIndex = currentQuestion.answerIndex; correctAnswerIndex = currentQuestion.answerIndex;
timerValue = timeToCompleteQuestion; timerValue = timeToCompleteQuestion;
isAnsweringQuestion = true; isAnsweringQuestion = true;
fillFraction = 1f; fillFraction = 1f;
loadNextQuestion = false; loadNextQuestion = false;
hasAnsweredEarly = false; hasAnsweredEarly = false;
@ -57,7 +57,7 @@ public class QuizPopUp : Menu<QuizPopUp>
PlayDubbingQuestion(); PlayDubbingQuestion();
audioController.Instance.bgmSource.volume = .1f; audioController.Instance.bgmSource.volume = .1f;
} }
private void OnDisable() private void OnDisable()
{ {
isAnsweringQuestion = false; isAnsweringQuestion = false;
@ -75,18 +75,22 @@ public class QuizPopUp : Menu<QuizPopUp>
button.interactable = true; button.interactable = true;
Image buttonImage = answerButtons[i].GetComponent<Image>(); Image buttonImage = answerButtons[i].GetComponent<Image>();
buttonImage.color = Color.white; buttonImage.color = Color.white;
} }
if (timerImage != null) if (timerImage != null)
{ {
timerImage.fillAmount = 1f; timerImage.fillAmount = 1f;
} }
audioController.Instance.bgmSource.volume = 1f;
if (audioController.Instance != null)
{
audioController.Instance.StopDubbing();
audioController.Instance.bgmSource.volume = 1f;
}
} }
void Update() void Update()
{ {
if (gameManager == null) if (gameManager == null)
@ -95,13 +99,13 @@ public class QuizPopUp : Menu<QuizPopUp>
} }
StateLoadQuestion(); StateLoadQuestion();
UpdateTimer(); UpdateTimer();
if(isComplete) if (isComplete)
{ {
Debug.Log("Game Over"); Debug.Log("Game Over");
isComplete = false; isComplete = false;
} }
} }
public void CancelTimer() public void CancelTimer()
{ {
timerValue = 0; timerValue = 0;
@ -223,11 +227,11 @@ public class QuizPopUp : Menu<QuizPopUp>
buttonImage.sprite = normalButttonSprite; buttonImage.sprite = normalButttonSprite;
TextMeshProUGUI buttonText = answerButtons[i].GetComponentInChildren<TextMeshProUGUI>(); TextMeshProUGUI buttonText = answerButtons[i].GetComponentInChildren<TextMeshProUGUI>();
buttonText.text = currentQuestion.answers[i]; buttonText.text = currentQuestion.answers[i];
} }
} }
private async void DelayAfterAnswerTrue() private async void DelayAfterAnswerTrue()
{ {
SaveData saveData = await Cloudsave.LoadData<SaveData>("DataPlayer"); SaveData saveData = await Cloudsave.LoadData<SaveData>("DataPlayer");
@ -271,7 +275,7 @@ public class QuizPopUp : Menu<QuizPopUp>
GameMenu.Open(); GameMenu.Open();
} }
IEnumerator DelayAfterAnswerFalse() IEnumerator DelayAfterAnswerFalse()
{ {
yield return new WaitForSeconds(1f); yield return new WaitForSeconds(1f);
@ -293,5 +297,13 @@ public class QuizPopUp : Menu<QuizPopUp>
{ {
audioController.Instance.StopDubbing(); audioController.Instance.StopDubbing();
audioController.Instance.PlayDubbing(currentQuestion.dubbingName); audioController.Instance.PlayDubbing(currentQuestion.dubbingName);
} }
public override void OnBackPressed()
{
base.OnBackPressed();
audioController.Instance.StopDubbing();
} }
}