Commit d062e8b2 authored by Yousef Sameh's avatar Yousef Sameh

music still playing in background after game exit - tf timer prefab reset

parent 0d864ac7
...@@ -33,10 +33,10 @@ RectTransform: ...@@ -33,10 +33,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5824509147393400757} m_Father: {fileID: 5824509147393400757}
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 &9055497536415541340 --- !u!222 &9055497536415541340
CanvasRenderer: CanvasRenderer:
...@@ -868,10 +868,10 @@ RectTransform: ...@@ -868,10 +868,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5824509147393400757} m_Father: {fileID: 5824509147393400757}
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 &6316850651786239132 --- !u!222 &6316850651786239132
CanvasRenderer: CanvasRenderer:
...@@ -1210,10 +1210,10 @@ RectTransform: ...@@ -1210,10 +1210,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5824509147393400757} m_Father: {fileID: 5824509147393400757}
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 &6319844450247911941 --- !u!222 &6319844450247911941
CanvasRenderer: CanvasRenderer:
...@@ -1391,7 +1391,7 @@ MonoBehaviour: ...@@ -1391,7 +1391,7 @@ MonoBehaviour:
m_MinValue: 0 m_MinValue: 0
m_MaxValue: 1 m_MaxValue: 1
m_WholeNumbers: 0 m_WholeNumbers: 0
m_Value: 0.711 m_Value: 1
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
...@@ -2195,10 +2195,10 @@ RectTransform: ...@@ -2195,10 +2195,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5824509147393400757} m_Father: {fileID: 5824509147393400757}
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 &3778932895135096301 --- !u!222 &3778932895135096301
CanvasRenderer: CanvasRenderer:
...@@ -2832,10 +2832,10 @@ RectTransform: ...@@ -2832,10 +2832,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5824509147393400757} m_Father: {fileID: 5824509147393400757}
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 &1293769170803587111 --- !u!222 &1293769170803587111
CanvasRenderer: CanvasRenderer:
......
...@@ -67,6 +67,7 @@ namespace com.al_arcade.cs ...@@ -67,6 +67,7 @@ namespace com.al_arcade.cs
_returnToHomeButton.onClick.AddListener(() => _returnToHomeButton.onClick.AddListener(() =>
{ {
SceneManager.LoadScene("MainMenu"); SceneManager.LoadScene("MainMenu");
SSAudioManager.Instance.StopMusic();
}); });
isMusicOn = true; isMusicOn = true;
......
...@@ -378,6 +378,7 @@ namespace com.al_arcade.mcq ...@@ -378,6 +378,7 @@ namespace com.al_arcade.mcq
public void BackToMenuButtonFunction() public void BackToMenuButtonFunction()
{ {
SceneManager.LoadScene("MainMenu"); SceneManager.LoadScene("MainMenu");
SSAudioManager.Instance.StopMusic();
} }
} }
} }
\ No newline at end of file
...@@ -14,7 +14,7 @@ namespace com.al_arcade.tf ...@@ -14,7 +14,7 @@ namespace com.al_arcade.tf
public class TfUIManager : MonoBehaviour public class TfUIManager : MonoBehaviour
{ {
[SerializeField] private Canvas _canvas; [SerializeField] private Canvas _canvas;
[SerializeField] private CanvasGroup _gameUI, _loadingUI, _errorUI, _resultsUI , _feedbackGroup; [SerializeField] private CanvasGroup _gameUI, _loadingUI, _errorUI, _resultsUI, _feedbackGroup;
[SerializeField] private UniText _scoreText, _streakText, _scoreLbl; [SerializeField] private UniText _scoreText, _streakText, _scoreLbl;
[SerializeField] private ArabicTextMeshProUGUI _loadingText, _errorText; [SerializeField] private ArabicTextMeshProUGUI _loadingText, _errorText;
[SerializeField] private UniText _progressLabel; [SerializeField] private UniText _progressLabel;
...@@ -54,6 +54,7 @@ namespace com.al_arcade.tf ...@@ -54,6 +54,7 @@ namespace com.al_arcade.tf
_returnToHomeButton.onClick.AddListener(() => _returnToHomeButton.onClick.AddListener(() =>
{ {
SSAudioManager.Instance.StopMusic();
SceneManager.LoadScene("MainMenu"); SceneManager.LoadScene("MainMenu");
}); });
...@@ -237,7 +238,7 @@ namespace com.al_arcade.tf ...@@ -237,7 +238,7 @@ namespace com.al_arcade.tf
//if (_resultScore != null) _resultScore.Text = score.ToString("N0"); //if (_resultScore != null) _resultScore.Text = score.ToString("N0");
if (_resultStats != null) if (_resultStats != null)
_resultStats.Text = $"صحيح: {correct} | " + _resultStats.Text = $"صحيح: {correct} | " +
$"المحاولات الخاطئة: {wrong} | " + $"المحاولات الخاطئة: {wrong} | " +
$"أعلى سلسلة: {bestStreak}"; ; $"أعلى سلسلة: {bestStreak}"; ;
var seq = DOTween.Sequence(); var seq = DOTween.Sequence();
......
<Solution> <Solution>
<Project Path="Assembly-CSharp.csproj" /> <Project Path="Assembly-CSharp.csproj" />
<Project Path="LightSide.UniText.csproj" /> <Project Path="LightSide.UniText.csproj" />
<Project Path="LeanCommon.csproj" />
<Project Path="UniTask.csproj" /> <Project Path="UniTask.csproj" />
<Project Path="Unity.RenderPipelines.Universal.Runtime.csproj" /> <Project Path="Unity.RenderPipelines.Universal.Runtime.csproj" />
<Project Path="FlatKit.Utils.Editor.csproj" /> <Project Path="FlatKit.Utils.Editor.csproj" />
...@@ -12,6 +13,7 @@ ...@@ -12,6 +13,7 @@
<Project Path="NuGetForUnity.csproj" /> <Project Path="NuGetForUnity.csproj" />
<Project Path="CFXRDemo.csproj" /> <Project Path="CFXRDemo.csproj" />
<Project Path="CFXREditor.csproj" /> <Project Path="CFXREditor.csproj" />
<Project Path="CW.Common.csproj" />
<Project Path="Assembly-CSharp-firstpass.csproj" /> <Project Path="Assembly-CSharp-firstpass.csproj" />
<Project Path="Assembly-CSharp-Editor.csproj" /> <Project Path="Assembly-CSharp-Editor.csproj" />
<Project Path="UniTask.TextMeshPro.csproj" /> <Project Path="UniTask.TextMeshPro.csproj" />
...@@ -20,6 +22,7 @@ ...@@ -20,6 +22,7 @@
<Project Path="CFXR.WelcomeScreen.csproj" /> <Project Path="CFXR.WelcomeScreen.csproj" />
<Project Path="UniTask.Editor.csproj" /> <Project Path="UniTask.Editor.csproj" />
<Project Path="ToonyColorsPro.Demo.Editor.csproj" /> <Project Path="ToonyColorsPro.Demo.Editor.csproj" />
<Project Path="LeanPool.csproj" />
<Project Path="UniTask.Addressables.csproj" /> <Project Path="UniTask.Addressables.csproj" />
<Project Path="UniTask.DOTween.csproj" /> <Project Path="UniTask.DOTween.csproj" />
</Solution> </Solution>
...@@ -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"
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,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": {
......
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