Skip to content

S
SSBookMinigames
Commit 2f3b6762 authored by Yousef Sameh's avatar Yousef Sameh
Browse files
Options

Merge remote-tracking branch 'origin/True-or-False--(Race-Condition)' into NewUI

parents d0cfc2ff b1508c50
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 26 deletions
My project/Assets/Prefabs/TF/Art/TfUI.prefab
View file @ 2f3b6762
......@@ -1321,20 +1321,27 @@ MonoBehaviour:
_loadingUI: {fileID: 4105729685514656015}
_errorUI: {fileID: 8668403456112399721}
_resultsUI: {fileID: 8614017441097344094}
_feedbackGroup: {fileID: 5181556637890600282}
_scoreText: {fileID: 5935917613051726348}
_streakText: {fileID: 6655817245277015576}
_scoreLbl: {fileID: 0}
_loadingText: {fileID: 2750036649835959240}
_errorText: {fileID: 5202410726077148544}
_progressLabel: {fileID: 876496144990673683}
_resultTitle: {fileID: 7300533697225226430}
_resultScore: {fileID: 5737192048517657640}
_resultStats: {fileID: 1630567241621742439}
_feedbackText: {fileID: 2735330587039562112}
_feedbackBg: {fileID: 8779464442449399176}
_restartButton: {fileID: 7997833608038347806}
_returnToHomeButton: {fileID: 7997833608038347806}
_timerSlider: {fileID: 4514849613205295364}
_timerFill: {fileID: 4203006633935581820}
_timerText: {fileID: 1760636326841778451}
_maxTime: 30
_pointsContainer: {fileID: 0}
_activePointColor: {r: 0, g: 0, b: 0, a: 0}
_inactivePointColor: {r: 0, g: 0, b: 0, a: 0}
onRestartClicked:
m_PersistentCalls:
m_Calls: []
......
My project/Assets/Prefabs/TF/Phone Art/TfUI.prefab
View file @ 2f3b6762
......@@ -33,10 +33,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5824509147393400757}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 22.572838, y: -25.96685}
m_SizeDelta: {x: 0, y: 51.9337}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.572838, y: 0}
m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9055497536415541340
CanvasRenderer:
......@@ -868,10 +868,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5824509147393400757}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 144.8642, y: -25.96685}
m_SizeDelta: {x: 0, y: 51.9337}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 144.8642, y: 0}
m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6316850651786239132
CanvasRenderer:
......@@ -1210,10 +1210,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5824509147393400757}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 83.71851, y: -25.96685}
m_SizeDelta: {x: 0, y: 51.9337}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 83.71851, y: 0}
m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6319844450247911941
CanvasRenderer:
......@@ -2195,10 +2195,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5824509147393400757}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 206.00986, y: -25.96685}
m_SizeDelta: {x: 0, y: 51.9337}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 206.00986, y: 0}
m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3778932895135096301
CanvasRenderer:
......@@ -2381,6 +2381,7 @@ MonoBehaviour:
_loadingUI: {fileID: 948396739458356726}
_errorUI: {fileID: 4448024252030771562}
_resultsUI: {fileID: 1265578760517736726}
_feedbackGroup: {fileID: 4497114863431471683}
_scoreText: {fileID: 7283828466168530179}
_streakText: {fileID: 3088443959907424236}
_scoreLbl: {fileID: 5924483057703210132}
......@@ -2390,6 +2391,8 @@ MonoBehaviour:
_resultTitle: {fileID: 3377821766872872317}
_resultScore: {fileID: 2058651398905202117}
_resultStats: {fileID: 2189195751882486028}
_feedbackText: {fileID: 2715045871399486055}
_feedbackBg: {fileID: 609508365388699558}
_restartButton: {fileID: 2142933248170327394}
_returnToHomeButton: {fileID: 6128910297614538796}
_timerSlider: {fileID: 3613290988306101471}
......@@ -2829,10 +2832,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5824509147393400757}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 267.15555, y: -25.96685}
m_SizeDelta: {x: 0, y: 51.9337}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 267.15555, y: 0}
m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1293769170803587111
CanvasRenderer:
......
My project/Assets/ScienceStreet/TF/Scripts/TfGameManager.cs
View file @ 2f3b6762
......@@ -200,12 +200,22 @@ namespace com.al_arcade.tf
_correctCount++;
_streak++;
_progress++;
_score += CalculateStreakScore();
int points = CalculateStreakScore();
_score += points;
// timer before productionLine to avoid Race Condition
UpdateTimerBy(4f);
uiManager?.UpdateTimer(_timeLeft, true);
if (handController != null) handController.PlayCorrectFeedback(playerSaidTrue);
if (productionLine != null) yield return productionLine.MoveForward(stepDistance);
if (questionScreen != null) questionScreen.ShowFeedback(true, _streak);
if (uiManager != null) uiManager.ShowFeedback($"ممتاز! {points}+", true);
var audio = SSAudioManager.Instance;
if (audio != null)
{ if (audio.sfxCorrect != null) audio.PlayCorrect(); else audio.PlayCorrectBeep(); }
......@@ -214,8 +224,7 @@ namespace com.al_arcade.tf
if (particles != null)
particles.PlayCorrectBurst(new Vector3(-2, 6f, 13));
UpdateTimerBy(4f);
uiManager?.UpdateTimer(_timeLeft, true);
}
else
{
......@@ -223,10 +232,17 @@ namespace com.al_arcade.tf
_streak = 0;
_progress = Mathf.Max(0, _progress - 1);
// timer before productionLine to avoid Race Condition
UpdateTimerBy(-2f);
uiManager?.UpdateTimer(_timeLeft, false);
if (handController != null) handController.PlayWrongFeedback(playerSaidTrue);
if (productionLine != null) yield return productionLine.MoveBackward(stepDistance);
if (questionScreen != null) questionScreen.ShowFeedback(false, 0);
if (uiManager != null) uiManager.ShowFeedback("حاول مرة أخرى", false);
var audio = SSAudioManager.Instance;
if (audio != null)
{ if (audio.sfxWrong != null) audio.PlayWrong(); else audio.PlayWrongBeep(); }
......@@ -238,8 +254,6 @@ namespace com.al_arcade.tf
.SetEase(Ease.OutQuad).SetId("camShake");
}
UpdateTimerBy(-2f);
uiManager?.UpdateTimer(_timeLeft, false);
}
onAnswerGiven?.Invoke(isCorrect);
......
My project/Assets/ScienceStreet/TF/Scripts/TfUIManager.cs
View file @ 2f3b6762
......@@ -14,11 +14,13 @@ namespace com.al_arcade.tf
public class TfUIManager : MonoBehaviour
{
[SerializeField] private Canvas _canvas;
[SerializeField] private CanvasGroup _gameUI, _loadingUI, _errorUI, _resultsUI;
[SerializeField] private CanvasGroup _gameUI, _loadingUI, _errorUI, _resultsUI , _feedbackGroup;
[SerializeField] private UniText _scoreText, _streakText, _scoreLbl;
[SerializeField] private ArabicTextMeshProUGUI _loadingText, _errorText;
[SerializeField] private UniText _progressLabel;
[SerializeField] private UniText _resultTitle, _resultScore, _resultStats;
[SerializeField] private UniText _feedbackText;
[SerializeField] private Image _feedbackBg;
[SerializeField] private Button _restartButton;
[SerializeField] protected Button _returnToHomeButton;
......@@ -180,6 +182,27 @@ namespace com.al_arcade.tf
if (_progressLabel != null)
_progressLabel.Text = $"{cur} / {total}";
}
public void ShowFeedback(string message, bool isCorrect)
{
if (_feedbackText != null) _feedbackText.Text = message;
if (_feedbackBg != null)
_feedbackBg.color = SSColorPalette.WithAlpha(
isCorrect ? SSColorPalette.Success : SSColorPalette.Danger, 0.92f);
DOTween.Kill(_feedbackGroup, "fbAnim");
_feedbackGroup.alpha = 0;
var bgRect = _feedbackBg?.rectTransform;
if (bgRect != null)
{
bgRect.localScale = new Vector3(0.3f, 0f, 1f);
var seq = DOTween.Sequence().SetId("fbAnim");
seq.Append(_feedbackGroup.DOFade(1f, 0.12f));
seq.Join(bgRect.DOScaleX(1f, 0.25f).SetEase(Ease.OutBack));
seq.Join(bgRect.DOScaleY(1f, 0.2f).SetEase(Ease.OutBack).SetDelay(0.04f));
seq.AppendInterval(1f);
seq.Append(_feedbackGroup.DOFade(0f, 0.3f));
}
}
// ─── Loading / Error ──────────────────────────────────────────────────
......
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