diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 7a633266..c373d119 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -1851,18 +1851,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} ---- !u!224 &3664916833752817997 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3310671341541575851, guid: 42b6e2c5e0aa46a4e973df1237dc5691, - type: 3} - m_PrefabInstance: {fileID: 2246654624185019878} - m_PrefabAsset: {fileID: 0} --- !u!1 &3664916833752817996 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} m_PrefabInstance: {fileID: 2246654624185019878} m_PrefabAsset: {fileID: 0} +--- !u!224 &3664916833752817997 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3310671341541575851, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + m_PrefabInstance: {fileID: 2246654624185019878} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3691625806369805098 PrefabInstance: m_ObjectHideFlags: 0 @@ -1925,6 +1925,46 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_fontSize + value: 34.06 + objectReference: {fileID: 0} + - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_fontStyle + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_isRichText + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_fontSizeBase + value: 34.06 + objectReference: {fileID: 0} + - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_enableKerning + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 6b0ec8d08c1e64575b9889e8f2732bd0, type: 2} + - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_horizontalMapping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_useMaxVisibleDescender + value: 1 + objectReference: {fileID: 0} - target: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_Name @@ -2045,6 +2085,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4558166201082566443, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7885431782403753906, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: coinPrefab @@ -2059,18 +2104,18 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3928365105026016678, guid: ac3be7383b736d941b251a588e626963, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ac3be7383b736d941b251a588e626963, type: 3} ---- !u!224 &3664916834242367713 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, - type: 3} - m_PrefabInstance: {fileID: 3691625806369805098} - m_PrefabAsset: {fileID: 0} --- !u!1 &3664916834242367712 stripped GameObject: m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, type: 3} m_PrefabInstance: {fileID: 3691625806369805098} m_PrefabAsset: {fileID: 0} +--- !u!224 &3664916834242367713 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, + type: 3} + m_PrefabInstance: {fileID: 3691625806369805098} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7577981076568039546 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 8533a88a..3a086b82 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -1003,6 +1003,7 @@ MonoBehaviour: m_EditorClassIdentifier: slider: {fileID: 137127162796222319} heartLevel: {fileID: 137127163584464916} + maxObject: {fileID: 4558166201082566443} --- !u!1 &137127164258565650 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/HeartMeter.cs b/popcorn/Assets/MyGame/Scripts/HeartMeter.cs index 3c21b89b..b314d2d6 100644 --- a/popcorn/Assets/MyGame/Scripts/HeartMeter.cs +++ b/popcorn/Assets/MyGame/Scripts/HeartMeter.cs @@ -10,6 +10,7 @@ public class HeartMeter : SingletonMonoBehaviour { [SerializeField] private Slider slider; [SerializeField] private TextMeshProUGUI heartLevel; + [SerializeField] private GameObject maxObject; private Coroutine coroutine; private List shopLevelList = new List(); @@ -64,6 +65,10 @@ public class HeartMeter : SingletonMonoBehaviour { var maxLevel = shopLevelList.Last().shopLevel; var level = Mathf.Min(newShopLevel, maxLevel); + if (level == maxLevel) + { + maxObject.SetActive(true); + } shopLevel.Value = level; heartLevel.text = $"{level}"; minHeart = shopLevelList.FirstOrDefault(data => data.shopLevel == level)?.heart ?? 0;