Commit 9c6b046c authored by Yousef Sameh's avatar Yousef Sameh

MCQ

parent 7365daa2
...@@ -92,4 +92,10 @@ public class HomeController : MonoBehaviour ...@@ -92,4 +92,10 @@ public class HomeController : MonoBehaviour
challengeManager.StartChallenge(); challengeManager.StartChallenge();
} }
private void OnDestroy()
{
UserService.Instance.OnUserChanged -= OnUserChange;
challengeButton.clicked -= OnChallengeButtonClicked;
}
} }
This diff is collapsed.
...@@ -343,10 +343,6 @@ ...@@ -343,10 +343,6 @@
margin-right: 11px; margin-right: 11px;
} }
.action-btn { .action-btn {
margin-top: 0; margin-top: 0;
margin-right: 0; margin-right: 0;
...@@ -413,6 +409,11 @@ ...@@ -413,6 +409,11 @@
border-bottom-color: rgba(0, 0, 0, 0.1); border-bottom-color: rgba(0, 0, 0, 0.1);
transition-duration: 0.15s; transition-duration: 0.15s;
height: 120px; height: 120px;
align-self: stretch;
align-items: stretch;
align-content: flex-start;
justify-content: space-between;
flex-wrap: nowrap;
} }
.textField:focus { .textField:focus {
......
fileFormatVersion: 2
guid: 745e9c17df962b24a80a69d5da8e5d38
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: d308d9efe86ef6242a75802e1f37de49
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e5036f96e3c15ea49b96f7ee989dd3c1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9e9f7f46a1ba34c338eb95b193ae1327
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b18b93d4b5d00384ba417df18aeac5a3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 92a80e6f6cd90464b8f87b98fc72999a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -4229,4 +4229,16 @@ MonoBehaviour: ...@@ -4229,4 +4229,16 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1122678494220450329} m_TargetGraphic: {fileID: 1122678494220450329}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 6933321303257031031}
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
fileFormatVersion: 2
guid: ac0d545202230b34f816aa66913a8e60
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 116b82ecf61ab2442a19d3ab0ab7a489
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
...@@ -123,7 +123,7 @@ public class ChallengeManager : MonoBehaviour ...@@ -123,7 +123,7 @@ public class ChallengeManager : MonoBehaviour
// Show results, reset challenge, etc. // Show results, reset challenge, etc.
challengeCanvas.ShowChallengeResult(false, 0, penaltiesPerGame[currentGameIndex]); challengeCanvas.ShowChallengeResult(false, 0, penaltiesPerGame[currentGameIndex]);
await ChallengeService.Instance.AddChallenge(false, -penaltiesPerGame[currentGameIndex], 0, startTime, DateTime.UtcNow); await ChallengeService.Instance.AddChallenge(false, 0, -penaltiesPerGame[currentGameIndex], startTime, DateTime.UtcNow);
} }
private async UniTask WonChallenge(int timeSaved, int pointsEarned) private async UniTask WonChallenge(int timeSaved, int pointsEarned)
...@@ -132,6 +132,7 @@ public class ChallengeManager : MonoBehaviour ...@@ -132,6 +132,7 @@ public class ChallengeManager : MonoBehaviour
challengeCanvas.ShowChallengeResult(true, timeSaved, pointsEarned); challengeCanvas.ShowChallengeResult(true, timeSaved, pointsEarned);
await ChallengeService.Instance.AddChallenge(true, timeSaved, pointsEarned, startTime, DateTime.UtcNow); await ChallengeService.Instance.AddChallenge(true, timeSaved, pointsEarned, startTime, DateTime.UtcNow);
} }
public void EndChallenge() public void EndChallenge()
......
...@@ -421,7 +421,7 @@ namespace com.al_arcade.mcq ...@@ -421,7 +421,7 @@ namespace com.al_arcade.mcq
private void CameraFeedback(bool correct) private void CameraFeedback(bool correct)
{ {
_mainCamera.DOFieldOfView(correct ? 80f : 70f, 0.2f).SetEase(Ease.OutQuad); _mainCamera.DOFieldOfView(correct ? 85f : 80f, 0.2f).SetEase(Ease.OutQuad);
} }
// ─── End Sequences ─────────────────────────────────────────────────── // ─── End Sequences ───────────────────────────────────────────────────
......
This diff is collapsed.
fileFormatVersion: 2
guid: 9d874e43b47c4a948ae4cd1ed4b78789
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 0004554260dae21818b21dc2f7e87407
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 72e6684cb6b9fa04cb697c3f78b8b689
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 8074a46816a025cd08656b68179a7b7c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 61ee060f0d57f914b98361b3f58852f8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 2d39cb61bfb87d147a154c8f17099912
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: de40610948d2a2447aa5a9a9d4e5deac
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 03b90b40492b121419ff3e2b51d6ea5a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: c213840a13dc336ae9d97c135ed17325
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -66,14 +66,14 @@ ...@@ -66,14 +66,14 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.collections": { "com.unity.collections": {
"version": "2.6.2", "version": "2.6.5",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.burst": "1.8.23", "com.unity.burst": "1.8.27",
"com.unity.mathematics": "1.3.2", "com.unity.mathematics": "1.3.2",
"com.unity.test-framework": "1.4.6", "com.unity.test-framework": "1.4.6",
"com.unity.nuget.mono-cecil": "1.11.5", "com.unity.nuget.mono-cecil": "1.11.6",
"com.unity.test-framework.performance": "3.0.3" "com.unity.test-framework.performance": "3.0.3"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
} }
}, },
"com.unity.splines": { "com.unity.splines": {
"version": "2.8.2", "version": "2.8.4",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
......
...@@ -17,12 +17,12 @@ EditorBuildSettings: ...@@ -17,12 +17,12 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/TF/TF.unity path: Assets/Scenes/TF/TF.unity
guid: c2f60049cef0f6b44b9445afcf550aff guid: c2f60049cef0f6b44b9445afcf550aff
- enabled: 1
path: Assets/Scenes/MCQ/Deprecated_MCQ.unity
guid: dc77d4f7977b6514e96035771e5e547f
- enabled: 1 - enabled: 1
path: Assets/Scenes/CS/CS.unity path: Assets/Scenes/CS/CS.unity
guid: 4013c5c8b28e4e746859513f1ec95b1e guid: 4013c5c8b28e4e746859513f1ec95b1e
- enabled: 1
path: Assets/Scenes/MCQ/MCQ.unity
guid: 70e093a0ef85a3e418cc77c732bc9e48
m_configObjects: m_configObjects:
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
m_UseUCBPForAssetBundles: 0 m_UseUCBPForAssetBundles: 0
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