Commit 7365daa2 authored by Yousef Sameh's avatar Yousef Sameh

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
parents 88404bf9 d5fa2fe6
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:
...@@ -130,7 +130,7 @@ MonoBehaviour: ...@@ -130,7 +130,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::com.al_arcade.mcq.McqQuestionDisplay m_EditorClassIdentifier: Assembly-CSharp::com.al_arcade.mcq.McqQuestionDisplay
floatHeight: 8 floatHeight: 8
followSpeed: 5 followSpeed: 5
forwardOffset: 7 forwardOffset: 9
_questionText: {fileID: 1752089400664981402} _questionText: {fileID: 1752089400664981402}
_questionTextShadow: {fileID: 5540184795202640518} _questionTextShadow: {fileID: 5540184795202640518}
_sourceText: {fileID: 6948226220845613902} _sourceText: {fileID: 6948226220845613902}
...@@ -369,7 +369,7 @@ GameObject: ...@@ -369,7 +369,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 &7008253857661791030 --- !u!224 &7008253857661791030
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
fileFormatVersion: 2
guid: ac0d545202230b34f816aa66913a8e60
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 116b82ecf61ab2442a19d3ab0ab7a489
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -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 ? 90f : 80f, 0.2f).SetEase(Ease.OutQuad); _mainCamera.DOFieldOfView(correct ? 80f : 70f, 0.2f).SetEase(Ease.OutQuad);
} }
// ─── End Sequences ─────────────────────────────────────────────────── // ─── End Sequences ───────────────────────────────────────────────────
......
...@@ -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.5", "version": "2.6.2",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.burst": "1.8.27", "com.unity.burst": "1.8.23",
"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.6", "com.unity.nuget.mono-cecil": "1.11.5",
"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.4", "version": "2.8.2",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
......
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