From fd88a7aa199a0b47eef1f463e3f4a86ddecdab4a Mon Sep 17 00:00:00 2001 From: Hazim Bin Ijaz Date: Fri, 24 Jan 2025 18:46:14 +0500 Subject: [PATCH] Added BG in cooldown --- Assets/Scenes/BossRoom.unity | 346 +++++++++++++++++++++++++-- Assets/Scripts/Gameplay/AbilityUI.cs | 7 +- 2 files changed, 332 insertions(+), 21 deletions(-) diff --git a/Assets/Scenes/BossRoom.unity b/Assets/Scenes/BossRoom.unity index 6d920ef..180b897 100644 --- a/Assets/Scenes/BossRoom.unity +++ b/Assets/Scenes/BossRoom.unity @@ -123,6 +123,82 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 23800000, guid: c09f9b0db49ccb249910b01357c98e1c, type: 2} +--- !u!1 &33984975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 33984976} + - component: {fileID: 33984978} + - component: {fileID: 33984977} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &33984976 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33984975} + 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: + - {fileID: 785551901} + m_Father: {fileID: 1878242783} + 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, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &33984977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33984975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.70980394} + 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: 0} + m_Type: 0 + 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!222 &33984978 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33984975} + m_CullTransparentMesh: 1 --- !u!114 &87190345 MonoBehaviour: m_ObjectHideFlags: 0 @@ -707,7 +783,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &192475867 RectTransform: m_ObjectHideFlags: 0 @@ -720,7 +796,7 @@ RectTransform: m_LocalScale: {x: 1.000011, y: 1.000011, z: 1.000011} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1878242782} + m_Father: {fileID: 198499038} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -740,7 +816,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.030203495, g: 0, b: 0.6226415, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -765,6 +841,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192475866} m_CullTransparentMesh: 1 +--- !u!1 &198499037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 198499038} + - component: {fileID: 198499040} + - component: {fileID: 198499039} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &198499038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 198499037} + 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: + - {fileID: 192475867} + m_Father: {fileID: 1878242782} + 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, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &198499039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 198499037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.70980394} + 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: 0} + m_Type: 0 + 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!222 &198499040 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 198499037} + m_CullTransparentMesh: 1 --- !u!1 &222782634 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2885098433089441387, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} @@ -787,7 +939,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &299397430 RectTransform: m_ObjectHideFlags: 0 @@ -795,12 +947,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 299397429} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 3784538605243177484} + m_Father: {fileID: 1805130582} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -820,7 +972,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.030203495, g: 0, b: 0.6226415, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1652,7 +1804,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &785551901 RectTransform: m_ObjectHideFlags: 0 @@ -1665,7 +1817,7 @@ RectTransform: m_LocalScale: {x: 1.000011, y: 1.000011, z: 1.000011} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1878242783} + m_Father: {fileID: 33984976} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1685,7 +1837,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.030203495, g: 0, b: 0.6226415, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -9102,7 +9254,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &914389893 RectTransform: m_ObjectHideFlags: 0 @@ -9115,7 +9267,7 @@ RectTransform: m_LocalScale: {x: 1.000011, y: 1.000011, z: 1.000011} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3784538605243177481} + m_Father: {fileID: 1890998792} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9135,7 +9287,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.030203495, g: 0, b: 0.6226415, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -9377,11 +9529,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.y - value: 0.28987604 + value: 0.28987613 objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.z - value: -0.1815203 + value: -0.1815204 objectReference: {fileID: 0} - target: {fileID: 1676734516302391364, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_UpdateMethod @@ -11333,6 +11485,82 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 +--- !u!1 &1805130581 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1805130582} + - component: {fileID: 1805130584} + - component: {fileID: 1805130583} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1805130582 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805130581} + 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: + - {fileID: 299397430} + m_Father: {fileID: 3784538605243177484} + 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, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1805130583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805130581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.70980394} + 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: 0} + m_Type: 0 + 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!222 &1805130584 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805130581} + m_CullTransparentMesh: 1 --- !u!224 &1878242782 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9059929380243764539, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} @@ -11343,6 +11571,82 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 9059929380544550687, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} m_PrefabInstance: {fileID: 3784538605243177479} m_PrefabAsset: {fileID: 0} +--- !u!1 &1890998791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1890998792} + - component: {fileID: 1890998794} + - component: {fileID: 1890998793} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1890998792 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890998791} + 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: + - {fileID: 914389893} + m_Father: {fileID: 3784538605243177481} + 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, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1890998793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890998791} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.70980394} + 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: 0} + m_Type: 0 + 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!222 &1890998794 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890998791} + m_CullTransparentMesh: 1 --- !u!114 &1893001415 MonoBehaviour: m_ObjectHideFlags: 0 @@ -126211,16 +126515,16 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 9059929380544550687, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} insertIndex: -1 - addedObject: {fileID: 785551901} + addedObject: {fileID: 33984976} - targetCorrespondingSourceObject: {fileID: 9059929381734582209, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} insertIndex: -1 - addedObject: {fileID: 914389893} + addedObject: {fileID: 1890998792} - targetCorrespondingSourceObject: {fileID: 9059929380243764539, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} insertIndex: -1 - addedObject: {fileID: 192475867} + addedObject: {fileID: 198499038} - targetCorrespondingSourceObject: {fileID: 9059929381413149715, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} insertIndex: -1 - addedObject: {fileID: 299397430} + addedObject: {fileID: 1805130582} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 9059929380544550686, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} insertIndex: -1 @@ -126264,6 +126568,7 @@ MonoBehaviour: m_EditorClassIdentifier: key: DashNCrash CoolDownImg: {fileID: 914389894} + CoolDownImgParent: {fileID: 1890998791} --- !u!224 &3784538605243177484 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9059929381413149715, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} @@ -126298,6 +126603,7 @@ MonoBehaviour: m_EditorClassIdentifier: key: VectorFence CoolDownImg: {fileID: 299397431} + CoolDownImgParent: {fileID: 1805130581} --- !u!114 &3784538605243177489 MonoBehaviour: m_ObjectHideFlags: 0 @@ -126312,6 +126618,7 @@ MonoBehaviour: m_EditorClassIdentifier: key: FreezeThrow CoolDownImg: {fileID: 192475868} + CoolDownImgParent: {fileID: 198499037} --- !u!114 &3784538605243177490 MonoBehaviour: m_ObjectHideFlags: 0 @@ -126326,6 +126633,7 @@ MonoBehaviour: m_EditorClassIdentifier: key: Swap CoolDownImg: {fileID: 785551902} + CoolDownImgParent: {fileID: 33984975} --- !u!65 &3790878148979662611 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Gameplay/AbilityUI.cs b/Assets/Scripts/Gameplay/AbilityUI.cs index 6567434..63bdd64 100644 --- a/Assets/Scripts/Gameplay/AbilityUI.cs +++ b/Assets/Scripts/Gameplay/AbilityUI.cs @@ -10,6 +10,7 @@ namespace Unity.Multiplayer.Samples.BossRoom { public string key; public Image CoolDownImg; + public GameObject CoolDownImgParent; public IEnumerator StopWatchRoutine; public void StopWatchFiller(float coolDownTime) { @@ -28,7 +29,8 @@ namespace Unity.Multiplayer.Samples.BossRoom public IEnumerator StopWatchFillerRoutine(float coolDownTime) { float factor = coolDownTime; - CoolDownImg.gameObject.SetActive(true); + CoolDownImgParent.SetActive(true); + // CoolDownImg.gameObject.SetActive(true); CoolDownImg.fillAmount = 1; while (coolDownTime > 0) { @@ -36,7 +38,8 @@ namespace Unity.Multiplayer.Samples.BossRoom CoolDownImg.fillAmount = coolDownTime / factor; yield return new WaitForSeconds(Time.deltaTime); } - CoolDownImg.gameObject.SetActive(false); + CoolDownImgParent.SetActive(false); + // CoolDownImg.gameObject.SetActive(false); StopWatchRoutine = null; } }