Commit 470e79b1 authored by saad's avatar saad

fix the timer bar and add return btn

parent 7365daa2
...@@ -1116,10 +1116,10 @@ RectTransform: ...@@ -1116,10 +1116,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.572838, y: -25.96685} m_AnchoredPosition: {x: 22.572838, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1367268893384981932 --- !u!222 &1367268893384981932
CanvasRenderer: CanvasRenderer:
...@@ -3222,10 +3222,10 @@ RectTransform: ...@@ -3222,10 +3222,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 83.71851, y: -25.96685} m_AnchoredPosition: {x: 83.71851, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6044436298841298018 --- !u!222 &6044436298841298018
CanvasRenderer: CanvasRenderer:
...@@ -3406,10 +3406,10 @@ RectTransform: ...@@ -3406,10 +3406,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 267.15555, y: -25.96685} m_AnchoredPosition: {x: 267.15555, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7681831561278972478 --- !u!222 &7681831561278972478
CanvasRenderer: CanvasRenderer:
...@@ -3793,10 +3793,10 @@ RectTransform: ...@@ -3793,10 +3793,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 206.00986, y: -25.96685} m_AnchoredPosition: {x: 206.00986, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8749602556167845090 --- !u!222 &8749602556167845090
CanvasRenderer: CanvasRenderer:
...@@ -4052,10 +4052,10 @@ RectTransform: ...@@ -4052,10 +4052,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 144.8642, y: -25.96685} m_AnchoredPosition: {x: 144.8642, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8187631058268110602 --- !u!222 &8187631058268110602
CanvasRenderer: CanvasRenderer:
......
...@@ -1330,7 +1330,7 @@ MonoBehaviour: ...@@ -1330,7 +1330,7 @@ MonoBehaviour:
_resultScore: {fileID: 5737192048517657640} _resultScore: {fileID: 5737192048517657640}
_resultStats: {fileID: 1630567241621742439} _resultStats: {fileID: 1630567241621742439}
_restartButton: {fileID: 7997833608038347806} _restartButton: {fileID: 7997833608038347806}
_returnToHomeButton: {fileID: 5365185501250057217} _returnToHomeButton: {fileID: 7997833608038347806}
_timerSlider: {fileID: 4514849613205295364} _timerSlider: {fileID: 4514849613205295364}
_timerFill: {fileID: 4203006633935581820} _timerFill: {fileID: 4203006633935581820}
_timerText: {fileID: 1760636326841778451} _timerText: {fileID: 1760636326841778451}
......
...@@ -856,6 +856,127 @@ RectTransform: ...@@ -856,6 +856,127 @@ RectTransform:
m_AnchoredPosition: {x: 140.8, y: -209.9} m_AnchoredPosition: {x: 140.8, y: -209.9}
m_SizeDelta: {x: 60, y: 60} m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2092337265019946091
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4796156494836484259}
- component: {fileID: 1728165164860080967}
- component: {fileID: 1472932425219118657}
- component: {fileID: 6128910297614538796}
m_Layer: 0
m_Name: ReturnToHome
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4796156494836484259
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2092337265019946091}
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: 1
m_Children:
- {fileID: 7988910427567040379}
m_Father: {fileID: 6731220212880752973}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000061035156, y: -350}
m_SizeDelta: {x: 361.5802, y: 85.0291}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1728165164860080967
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2092337265019946091}
m_CullTransparentMesh: 1
--- !u!114 &1472932425219118657
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2092337265019946091}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b94ad4425888548039a8c69d289a39d6, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &6128910297614538796
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2092337265019946091}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1472932425219118657}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &2926242221124717045 --- !u!1 &2926242221124717045
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1264,7 +1385,7 @@ MonoBehaviour: ...@@ -1264,7 +1385,7 @@ MonoBehaviour:
m_MinValue: 0 m_MinValue: 0
m_MaxValue: 1 m_MaxValue: 1
m_WholeNumbers: 0 m_WholeNumbers: 0
m_Value: 1 m_Value: 0.711
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
...@@ -1302,6 +1423,7 @@ RectTransform: ...@@ -1302,6 +1423,7 @@ RectTransform:
- {fileID: 1678379179440431643} - {fileID: 1678379179440431643}
- {fileID: 686057142080516293} - {fileID: 686057142080516293}
- {fileID: 6042964170137528694} - {fileID: 6042964170137528694}
- {fileID: 4796156494836484259}
- {fileID: 8322831726690048950} - {fileID: 8322831726690048950}
m_Father: {fileID: 6341582480915548861} m_Father: {fileID: 6341582480915548861}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -2179,6 +2301,7 @@ MonoBehaviour: ...@@ -2179,6 +2301,7 @@ MonoBehaviour:
_resultScore: {fileID: 2058651398905202117} _resultScore: {fileID: 2058651398905202117}
_resultStats: {fileID: 2189195751882486028} _resultStats: {fileID: 2189195751882486028}
_restartButton: {fileID: 2142933248170327394} _restartButton: {fileID: 2142933248170327394}
_returnToHomeButton: {fileID: 6128910297614538796}
_timerSlider: {fileID: 3613290988306101471} _timerSlider: {fileID: 3613290988306101471}
_timerFill: {fileID: 2112913333798308398} _timerFill: {fileID: 2112913333798308398}
_timerText: {fileID: 2818046317742382419} _timerText: {fileID: 2818046317742382419}
...@@ -2930,6 +3053,100 @@ CanvasGroup: ...@@ -2930,6 +3053,100 @@ CanvasGroup:
m_Interactable: 1 m_Interactable: 1
m_BlocksRaycasts: 1 m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0 m_IgnoreParentGroups: 0
--- !u!1 &7939404868617013299
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7988910427567040379}
- component: {fileID: 7803124920514966639}
- component: {fileID: 6770493662541574951}
m_Layer: 0
m_Name: BtnTxt
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7988910427567040379
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7939404868617013299}
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_Children: []
m_Father: {fileID: 4796156494836484259}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!222 &7803124920514966639
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7939404868617013299}
m_CullTransparentMesh: 1
--- !u!114 &6770493662541574951
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7939404868617013299}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: beaa34cb0e58d624bb3a264b28600785, type: 3}
m_Name:
m_EditorClassIdentifier: LightSide.UniText::LightSide.UniText
m_Material: {fileID: 0}
m_Color: {r: 0.1882353, g: 0.1882353, b: 0.8156863, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
text: "\u0627\u0644\u0631\u062C\u0648\u0639"
fontStack: {fileID: 11400000, guid: 0029e5efb4c7a12f1ac9136de794e6dc, type: 2}
appearance: {fileID: 11400000, guid: 3a559cf5d653f05ea807e1be5655df92, type: 2}
fontSize: 40
baseDirection: 2
wordWrap: 1
horizontalAlignment: 1
verticalAlignment: 1
overEdge: 0
underEdge: 0
leadingDistribution: 0
autoSize: 0
minFontSize: 10
maxFontSize: 72
modRegisters:
items: []
modRegisterConfigs:
items: []
highlighter:
rid: 8615661501950984685
references:
version: 2
RefIds:
- rid: 8615661501950984685
type: {class: DefaultTextHighlighter, ns: LightSide, asm: LightSide.UniText}
data:
clickColor: {r: 0.2, g: 0.5, b: 1, a: 0.6}
fadeDuration: 0.25
hoverColor: {r: 0.2, g: 0.5, b: 1, a: 0.1}
--- !u!1 &7958168710864965673 --- !u!1 &7958168710864965673
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
fileFormatVersion: 2
guid: ac0d545202230b34f816aa66913a8e60
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 116b82ecf61ab2442a19d3ab0ab7a489
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -38,12 +38,13 @@ namespace com.al_arcade.tf ...@@ -38,12 +38,13 @@ namespace com.al_arcade.tf
private void Start() private void Start()
{ {
_restartButton.onClick.AddListener(RestartButton); _restartButton.onClick.AddListener(RestartButton);
if (_timerFill != null)
_timerDefaultColor = _timerFill.color;
_returnToHomeButton.onClick.AddListener(() => _returnToHomeButton.onClick.AddListener(() =>
{ {
SceneManager.LoadScene("MainMenu"); SceneManager.LoadScene("MainMenu");
}); });
if (_timerFill != null)
_timerDefaultColor = _timerFill.color;
} }
// --- ADDED: Basic timer update (called every frame from GameManager) --- // --- ADDED: Basic timer update (called every frame from GameManager) ---
public void SetTimer(float time) public void SetTimer(float time)
...@@ -68,37 +69,25 @@ namespace com.al_arcade.tf ...@@ -68,37 +69,25 @@ namespace com.al_arcade.tf
_isTweening = true; _isTweening = true;
// Choose flash color var flashColor = positive ? SSColorPalette.Success : SSColorPalette.Danger;
var flashColor = positive
? SSColorPalette.Success
: SSColorPalette.Danger;
// Punch animation _timerSlider.transform.DOPunchScale(Vector3.one * 0.1f, 0.3f, 8, 0.3f);
_timerSlider.transform
.DOPunchScale(Vector3.one * 0.1f, 0.3f, 8, 0.3f);
// Flash color // Color tween owns the _isTweening flag — NOT the slider
_timerFill _timerFill
.DOColor(flashColor, 0.2f) .DOColor(flashColor, 0.2f)
.OnComplete(() => .OnComplete(() =>
{ {
_timerFill.DOColor(_timerDefaultColor, 0.2f); _timerFill.DOColor(_timerDefaultColor, 0.2f)
.OnComplete(() => _isTweening = false); // ← moved here
}); });
float targetTime = time; float targetTime = !positive ? time - 0.3f : time;
// Small compensation when losing time (same logic as CsUIManager)
if (!positive)
targetTime -= 0.3f;
// Animate slider value
_timerSlider _timerSlider
.DOValue(Mathf.Min(targetTime / _maxTime , _maxTime), 0.3f) .DOValue(Mathf.Min(targetTime / _maxTime, _maxTime), 0.3f)
.SetEase(Ease.OutQuad) .SetEase(Ease.OutQuad);
.OnComplete(() => // ← removed OnComplete here
{
_isTweening = false;
});
} }
void RestartButton() void RestartButton()
{ {
......
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