Merge branch 'NewUI' of http://gitlab.caprover.al-arcade.com/root/ssbookminigames into NewUI

# Conflicts:
#	My project/UserSettings/EditorUserSettings.asset
#	My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt

My project/Assets/Prefabs/MCQ/Canvas.prefab.meta

+fileFormatVersion: 2
+guid: 3521ed1202c86f54caa37c5ff471b073
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

My project/Assets/Prefabs/MCQ/MCQ_Canvas.prefab

@@ -735,7 +735,7 @@ RectTransform:
   m_Father: {fileID: 6971971673489850211}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1488,17 +1488,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3263744892954279339}
-  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_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 3165936188790350234}
   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: 31.7474, y: 165.5558}
+  m_AnchoredPosition: {x: 21.164934, y: 882.41}
   m_SizeDelta: {x: 463.4949, y: 81.1116}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &371995109982324543
@@ -2231,7 +2231,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7945613461064983669
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2241,16 +2241,16 @@ RectTransform:
   m_GameObject: {fileID: 5617419797347366674}
   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_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+  m_ConstrainProportionsScale: 1
   m_Children:
+  - {fileID: 8256024418768339382}
   - {fileID: 3417678416900399703}
   - {fileID: 5976902598063249997}
   - {fileID: 7749348731991042334}
   - {fileID: 6470034207774423138}
   - {fileID: 1267719597953320386}
   - {fileID: 9012017541471115883}
-  - {fileID: 8256024418768339382}
   - {fileID: 7623090494567273093}
   - {fileID: 6193796730385976001}
   - {fileID: 755217212105421055}
@@ -2787,7 +2787,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7277132822530864984
 RectTransform:
   m_ObjectHideFlags: 0

My project/Assets/Prefabs/MCQ/QuestionDisplay.prefab

@@ -130,7 +130,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::com.al_arcade.mcq.McqQuestionDisplay
   floatHeight: 8
   followSpeed: 5
-  forwardOffset: 14
+  forwardOffset: 7
   _questionText: {fileID: 1752089400664981402}
   _questionTextShadow: {fileID: 5540184795202640518}
   _sourceText: {fileID: 6948226220845613902}

My project/Assets/Resources/PerformanceTestRunInfo.json

+{"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

My project/Assets/Resources/PerformanceTestRunSettings.json

+{"MeasurementCount":-1}
\ No newline at end of file

My project/Assets/Scenes/MCQ/MCQ.unity

@@ -181,7 +181,7 @@ Camera:
     height: 1
   near clip plane: 0.3
   far clip plane: 1000
-  field of view: 60
+  field of view: 80
   orthographic: 0
   orthographic size: 5
   m_Depth: -1
@@ -701,8 +701,8 @@ MonoBehaviour:
   competitorPrefab: {fileID: 1751382728646269656, guid: d9891b839842aaa47b82de83a501bb13, type: 3}
   gatePrefab: {fileID: 3359827651679123104, guid: 42117f56d26465849a8d9625da3bb1ca, type: 3}
   questionDisplayPrefab: {fileID: 5658176873693731764, guid: 68bdbb203201e184ab4984036d94d106, type: 3}
-  questionDisplayOffset: {x: 0, y: 8, z: 22}
-  canvasPrefab: {fileID: 4511166262564350541, guid: 822b24d146997b94a83a69760d543528, type: 3}
+  questionDisplayOffset: {x: 0, y: 8, z: 12}
+  canvasPrefab: {fileID: 3914670067425107175, guid: 3521ed1202c86f54caa37c5ff471b073, type: 3}
   sfxCorrect: {fileID: 0}
   sfxWrong: {fileID: 0}
   sfxClick: {fileID: 0}

My project/Assets/ScienceStreet/Features/Challenge/ChallengeManager.prefab

@@ -603,6 +603,7 @@ MonoBehaviour:
   gameSceneNames:
   - cs
   - tf
+  - mcq
   transitionSettings: {fileID: 11400000, guid: 057babd6f13132c449650d99e3c4e99c, type: 2}
   winningPoints: 100
   timeSavedBonusMultiplier: 2

My project/Assets/ScienceStreet/MCQ/Scripts/McqGameManager.cs

@@ -421,7 +421,7 @@ namespace com.al_arcade.mcq
 
         private void CameraFeedback(bool correct)
         {
-            _mainCamera.DOFieldOfView(correct ? 100f : 80f, 0.2f).SetEase(Ease.OutQuad);
+            _mainCamera.DOFieldOfView(correct ? 90f : 80f, 0.2f).SetEase(Ease.OutQuad);
         }
 
         // ─── End Sequences ───────────────────────────────────────────────────

My project/Assets/UniversalRenderPipelineGlobalSettings.asset

@@ -68,7 +68,23 @@ MonoBehaviour:
       - rid: 5240940957688397888
       - rid: 5240940957688397889
     m_RuntimeSettings:
-      m_List: []
+      m_List:
+      - rid: 1321912066682388550
+      - rid: 5227943654909018112
+      - rid: 1321912066682388552
+      - rid: 1321912066682388554
+      - rid: 1321912066682388556
+      - rid: 1321912066682388558
+      - rid: 1321912066682388559
+      - rid: 1321912066682388560
+      - rid: 1321912066682388561
+      - rid: 1321912066682388562
+      - rid: 1321912066682388568
+      - rid: 1321912066682388569
+      - rid: 1321912066682388570
+      - rid: 1321912066682388573
+      - rid: 1321912066682388574
+      - rid: 5240940957688397889
   m_AssetVersion: 10
   m_ObsoleteDefaultVolumeProfile: {fileID: 0}
   m_RenderingLayerNames:

My project/UserSettings/EditorUserSettings.asset

@@ -33,16 +33,16 @@ EditorUserSettings:
       value: 060203560401505a595d0a7345200d44404e1b7e2d707e617b7f4d63e7b6606b
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 540151565c06080b0808547711705a44474f1b297b7f25677e7b1f30bbe56060
+      value: 575755530005085a5556097346745b4417164b2e292a73347a2b486be7e6306a
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 575755530005085a5556097346745b4417164b2e292a73347a2b486be7e6306a
+      value: 515251560603590259570f76147a5d4447154b282e7e25667e714830b6e36d6d
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 515251560603590259570f76147a5d4447154b282e7e25667e714830b6e36d6d
+      value: 5b0855530654590a090a0f74447a5e444f4f1b2e2d7022337d7b1e35b0b8316b
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5b0855530654590a090a0f74447a5e444f4f1b2e2d7022337d7b1e35b0b8316b
+      value: 540151565c06080b0808547711705a44474f1b297b7f25677e7b1f30bbe56060
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7