Commit fd0c5d38 authored by Yousef Sameh's avatar Yousef Sameh

CS and MCQ fix

parent 0f439457
This diff is collapsed.
...@@ -1526,10 +1526,10 @@ RectTransform: ...@@ -1526,10 +1526,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
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: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 22.572838, y: 0} m_AnchoredPosition: {x: 22.572838, y: -25.96685}
m_SizeDelta: {x: 51.9337, y: 0} m_SizeDelta: {x: 0, y: 51.9337}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5599785267463442964 --- !u!222 &5599785267463442964
CanvasRenderer: CanvasRenderer:
...@@ -1874,10 +1874,10 @@ RectTransform: ...@@ -1874,10 +1874,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
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: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 267.15555, y: 0} m_AnchoredPosition: {x: 267.15555, y: -25.96685}
m_SizeDelta: {x: 51.9337, y: 0} m_SizeDelta: {x: 0, y: 51.9337}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5340325998096306428 --- !u!222 &5340325998096306428
CanvasRenderer: CanvasRenderer:
...@@ -2987,10 +2987,10 @@ RectTransform: ...@@ -2987,10 +2987,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
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: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 206.00986, y: 0} m_AnchoredPosition: {x: 206.00986, y: -25.96685}
m_SizeDelta: {x: 51.9337, y: 0} m_SizeDelta: {x: 0, y: 51.9337}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4280031676036218401 --- !u!222 &4280031676036218401
CanvasRenderer: CanvasRenderer:
...@@ -3385,10 +3385,10 @@ RectTransform: ...@@ -3385,10 +3385,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
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: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 144.8642, y: 0} m_AnchoredPosition: {x: 144.8642, y: -25.96685}
m_SizeDelta: {x: 51.9337, y: 0} m_SizeDelta: {x: 0, y: 51.9337}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3352223824432655738 --- !u!222 &3352223824432655738
CanvasRenderer: CanvasRenderer:
...@@ -3662,10 +3662,10 @@ RectTransform: ...@@ -3662,10 +3662,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
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: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 83.71851, y: 0} m_AnchoredPosition: {x: 83.71851, y: -25.96685}
m_SizeDelta: {x: 51.9337, y: 0} m_SizeDelta: {x: 0, y: 51.9337}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2582842219960060486 --- !u!222 &2582842219960060486
CanvasRenderer: CanvasRenderer:
......
...@@ -75,6 +75,139 @@ MonoBehaviour: ...@@ -75,6 +75,139 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &348756336880532277
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8576151486170840970}
- component: {fileID: 2669900088891917307}
- component: {fileID: 7177066019266770578}
- component: {fileID: 121806169354175942}
m_Layer: 5
m_Name: ReturnButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8576151486170840970
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 348756336880532277}
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: 1
m_Children:
- {fileID: 6208705012973080550}
m_Father: {fileID: 7945613461064983669}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 21.164934, y: 611}
m_SizeDelta: {x: 463.4949, y: 81.1116}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2669900088891917307
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 348756336880532277}
m_CullTransparentMesh: 1
--- !u!114 &7177066019266770578
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 348756336880532277}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
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: b94ad4425888548039a8c69d289a39d6, type: 3}
m_Type: 1
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!114 &121806169354175942
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 348756336880532277}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button
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: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
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: 1
m_TargetGraphic: {fileID: 7177066019266770578}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4101697023267542320}
m_TargetAssemblyTypeName: com.al_arcade.mcq.McqUIManager, Assembly-CSharp
m_MethodName: BackToMenuButtonFunction
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &535222808048854700 --- !u!1 &535222808048854700
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1498,7 +1631,7 @@ RectTransform: ...@@ -1498,7 +1631,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} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 21.164934, y: 882.41} m_AnchoredPosition: {x: 21.164934, y: 739}
m_SizeDelta: {x: 463.4949, y: 81.1116} m_SizeDelta: {x: 463.4949, y: 81.1116}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &371995109982324543 --- !u!222 &371995109982324543
...@@ -1903,6 +2036,7 @@ MonoBehaviour: ...@@ -1903,6 +2036,7 @@ MonoBehaviour:
_resultWrong: {fileID: 378215031485473278} _resultWrong: {fileID: 378215031485473278}
_resultStreak: {fileID: 176358230604167038} _resultStreak: {fileID: 176358230604167038}
_resultRestartBtn: {fileID: 3358587681461417824} _resultRestartBtn: {fileID: 3358587681461417824}
_backToMenuBtn: {fileID: 0}
_progressSlider: {fileID: 3938213566708148652} _progressSlider: {fileID: 3938213566708148652}
_winIcon: {fileID: 7706448102103552522} _winIcon: {fileID: 7706448102103552522}
_loseIcon: {fileID: 1395660648641246130} _loseIcon: {fileID: 1395660648641246130}
...@@ -2142,7 +2276,7 @@ GameObject: ...@@ -2142,7 +2276,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 &5306911550780529118 --- !u!224 &5306911550780529118
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2241,10 +2375,11 @@ RectTransform: ...@@ -2241,10 +2375,11 @@ RectTransform:
m_GameObject: {fileID: 5617419797347366674} m_GameObject: {fileID: 5617419797347366674}
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 8256024418768339382} - {fileID: 8256024418768339382}
- {fileID: 8576151486170840970}
- {fileID: 3417678416900399703} - {fileID: 3417678416900399703}
- {fileID: 5976902598063249997} - {fileID: 5976902598063249997}
- {fileID: 7749348731991042334} - {fileID: 7749348731991042334}
...@@ -3228,9 +3363,9 @@ RectTransform: ...@@ -3228,9 +3363,9 @@ RectTransform:
- {fileID: 2702829056134854561} - {fileID: 2702829056134854561}
m_Father: {fileID: 2005858786777306286} m_Father: {fileID: 2005858786777306286}
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: 1, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 778.5232, y: -5.2958} m_AnchoredPosition: {x: -149, y: -0.0000009536743}
m_SizeDelta: {x: 264.4425, y: 69.408} m_SizeDelta: {x: 264.4425, y: 69.408}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6442229607785571722 --- !u!222 &6442229607785571722
...@@ -3424,3 +3559,97 @@ CanvasGroup: ...@@ -3424,3 +3559,97 @@ CanvasGroup:
m_Interactable: 1 m_Interactable: 1
m_BlocksRaycasts: 1 m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0 m_IgnoreParentGroups: 0
--- !u!1 &8978864379767137331
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6208705012973080550}
- component: {fileID: 5468284919342967130}
- component: {fileID: 7828184999535305477}
m_Layer: 5
m_Name: Return
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6208705012973080550
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8978864379767137331}
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: 8576151486170840970}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5468284919342967130
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8978864379767137331}
m_CullTransparentMesh: 1
--- !u!114 &7828184999535305477
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8978864379767137331}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: beaa34cb0e58d624bb3a264b28600785, type: 3}
m_Name:
m_EditorClassIdentifier: LightSide.UniText::LightSide.UniText
m_Material: {fileID: 0}
m_Color: {r: 0.1882353, g: 0.1882353, b: 0.8156863, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
text: "\u0627\u0644\u0631\u062C\u0648\u0639"
fontStack: {fileID: 11400000, guid: 0029e5efb4c7a12f1ac9136de794e6dc, type: 2}
appearance: {fileID: 11400000, guid: 3a559cf5d653f05ea807e1be5655df92, type: 2}
fontSize: 40
baseDirection: 2
wordWrap: 1
horizontalAlignment: 1
verticalAlignment: 1
overEdge: 0
underEdge: 0
leadingDistribution: 0
autoSize: 0
minFontSize: 10
maxFontSize: 72
modRegisters:
items: []
modRegisterConfigs:
items: []
highlighter:
rid: 8615661554818614070
references:
version: 2
RefIds:
- rid: 8615661554818614070
type: {class: DefaultTextHighlighter, ns: LightSide, asm: LightSide.UniText}
data:
clickColor: {r: 0.2, g: 0.5, b: 1, a: 0.6}
fadeDuration: 0.25
hoverColor: {r: 0.2, g: 0.5, b: 1, a: 0.1}
{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","MtRendering":false,"GraphicsJobs":false,"GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"Android","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.3.12f1","Branch":"6000.3/staging","Changeset":"fca03ac9b0d5","Date":1773805432},"Dependencies":["com.cysharp.unitask@2.5.10","com.github-glitchenzo.nugetforunity@4.5.0","com.unity.2d.sprite@1.0.0","com.unity.ai.navigation@2.0.11","com.unity.cinemachine@3.1.6","com.unity.collab-proxy@2.11.4","com.unity.ide.rider@3.0.39","com.unity.ide.visualstudio@2.0.26","com.unity.inputsystem@1.19.0","com.unity.multiplayer.center@1.0.1","com.unity.nuget.newtonsoft-json@3.2.2","com.unity.postprocessing@3.5.4","com.unity.recorder@5.1.6","com.unity.render-pipelines.universal@17.3.0","com.unity.shadergraph@17.3.0","com.unity.test-framework@1.6.0","com.unity.timeline@1.8.11","com.unity.ugui@2.0.0","com.unity.visualeffectgraph@17.3.0","com.unity.visualscripting@1.9.11","media.lightside.unitext@1.0.0","com.unity.modules.accessibility@1.0.0","com.unity.modules.adaptiveperformance@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vectorgraphics@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.render-pipelines.core@17.3.0","com.unity.ext.nunit@2.0.5","com.unity.searcher@4.9.4","com.unity.render-pipelines.universal-config@17.0.3","com.unity.collections@2.6.5","com.unity.bindings.openimageio@1.0.2","com.unity.splines@2.8.4","com.unity.burst@1.8.28","com.unity.mathematics@1.3.3","com.unity.nuget.mono-cecil@1.11.6","com.unity.test-framework.performance@3.2.0","com.unity.settings-manager@2.1.1"],"Results":[]}
\ No newline at end of file
{"MeasurementCount":-1}
\ No newline at end of file
...@@ -152,11 +152,13 @@ namespace com.al_arcade.cs ...@@ -152,11 +152,13 @@ namespace com.al_arcade.cs
bool droppedOnTarget = false; bool droppedOnTarget = false;
if (_targetWord != null && Camera.main != null) if (_targetWord != null && Camera.main != null)
{ {
Vector3 worldPos = _targetWord.transform.position; // Vector3 worldPos = _targetWord.transform.position;
Vector3 screenPos = Camera.main.WorldToScreenPoint(worldPos); // Vector3 screenPos = Camera.main.WorldToScreenPoint(worldPos);
float distance = Vector2.Distance(eventData.position, (Vector2)screenPos); // float distance = Vector2.Distance(eventData., (Vector2)screenPos);
Vector2 worldPos = Camera.main.ScreenToWorldPoint(eventData.position);
var hit = _targetWord.GetComponent<BoxCollider2D>().OverlapPoint(worldPos);
if (distance < 120f) if (hit)
{ {
droppedOnTarget = true; droppedOnTarget = true;
......
...@@ -251,7 +251,8 @@ namespace com.al_arcade.mcq ...@@ -251,7 +251,8 @@ namespace com.al_arcade.mcq
if (useOfflineTestData) if (useOfflineTestData)
_gm.StartWithQuestions(GetTestQuestions()); _gm.StartWithQuestions(GetTestQuestions());
else else
_gm.StartGame(); if (!_gm.IsChallengeMode)
_gm.StartGame();
} }
...@@ -288,14 +289,14 @@ namespace com.al_arcade.mcq ...@@ -288,14 +289,14 @@ namespace com.al_arcade.mcq
private void SetupAudioManager() private void SetupAudioManager()
{ {
var a = SSAudioManager.EnsureInstance(); var a = SSAudioManager.EnsureInstance();
if (sfxCorrect != null) a.sfxCorrect = sfxCorrect; if (sfxCorrect != null) a.sfxCorrect = sfxCorrect;
if (sfxWrong != null) a.sfxWrong = sfxWrong; if (sfxWrong != null) a.sfxWrong = sfxWrong;
if (sfxClick != null) a.sfxClick = sfxClick; if (sfxClick != null) a.sfxClick = sfxClick;
if (sfxVictory != null) a.sfxVictory = sfxVictory; if (sfxVictory != null) a.sfxVictory = sfxVictory;
if (sfxDefeat != null) a.sfxDefeat = sfxDefeat; if (sfxDefeat != null) a.sfxDefeat = sfxDefeat;
if (sfxWhoosh != null) a.sfxWhoosh = sfxWhoosh; if (sfxWhoosh != null) a.sfxWhoosh = sfxWhoosh;
if (sfxPop != null) a.sfxPop = sfxPop; if (sfxPop != null) a.sfxPop = sfxPop;
if (sfxCheer != null) a.sfxCheer = sfxCheer; if (sfxCheer != null) a.sfxCheer = sfxCheer;
if (sfxCountdown != null) a.sfxCountdown = sfxCountdown; if (sfxCountdown != null) a.sfxCountdown = sfxCountdown;
} }
...@@ -303,10 +304,10 @@ namespace com.al_arcade.mcq ...@@ -303,10 +304,10 @@ namespace com.al_arcade.mcq
{ {
var p = SSParticleManager.EnsureInstance(); var p = SSParticleManager.EnsureInstance();
if (correctBurstParticle != null) p.correctBurstPrefab = correctBurstParticle; if (correctBurstParticle != null) p.correctBurstPrefab = correctBurstParticle;
if (wrongBurstParticle != null) p.wrongBurstPrefab = wrongBurstParticle; if (wrongBurstParticle != null) p.wrongBurstPrefab = wrongBurstParticle;
if (confettiParticle != null) p.confettiPrefab = confettiParticle; if (confettiParticle != null) p.confettiPrefab = confettiParticle;
if (sparksParticle != null) p.sparksPrefab = sparksParticle; if (sparksParticle != null) p.sparksPrefab = sparksParticle;
if (starBurstParticle != null) p.starBurstPrefab = starBurstParticle; if (starBurstParticle != null) p.starBurstPrefab = starBurstParticle;
} }
private void OnRestartClicked() private void OnRestartClicked()
......
...@@ -8,6 +8,7 @@ namespace com.al_arcade.mcq ...@@ -8,6 +8,7 @@ namespace com.al_arcade.mcq
using DG.Tweening; using DG.Tweening;
using LightSide; using LightSide;
using shared; using shared;
using UnityEngine.SceneManagement;
public class McqUIManager : MonoBehaviour public class McqUIManager : MonoBehaviour
{ {
...@@ -36,6 +37,7 @@ namespace com.al_arcade.mcq ...@@ -36,6 +37,7 @@ namespace com.al_arcade.mcq
[SerializeField] private UniText _resultWrong; [SerializeField] private UniText _resultWrong;
[SerializeField] private UniText _resultStreak; [SerializeField] private UniText _resultStreak;
[SerializeField] private Button _resultRestartBtn; [SerializeField] private Button _resultRestartBtn;
[SerializeField] private Button _backToMenuBtn;
[SerializeField] private Slider _progressSlider; [SerializeField] private Slider _progressSlider;
[SerializeField] private GameObject _winIcon; [SerializeField] private GameObject _winIcon;
[SerializeField] private GameObject _loseIcon; [SerializeField] private GameObject _loseIcon;
...@@ -440,6 +442,11 @@ namespace com.al_arcade.mcq ...@@ -440,6 +442,11 @@ namespace com.al_arcade.mcq
McqGameManager.Instance.StartGame(); McqGameManager.Instance.StartGame();
} }
public void BackToMenuButtonFunction()
{
SceneManager.LoadScene("MainMenu");
}
public void ResetUI() public void ResetUI()
{ {
_gameUI.gameObject.SetActive(false); _gameUI.gameObject.SetActive(false);
......
...@@ -271,7 +271,6 @@ namespace com.al_arcade.shared ...@@ -271,7 +271,6 @@ namespace com.al_arcade.shared
yield return NoChallengeVictorySequence(); yield return NoChallengeVictorySequence();
} }
protected IEnumerator LoseSequence() protected IEnumerator LoseSequence()
{ {
yield return SharedLoseSequence(); yield return SharedLoseSequence();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment