店舗レベルがMaxのときの表示を追加

This commit is contained in:
kimura 2021-11-05 13:27:31 +09:00
parent 6ae1b29e0b
commit 2a1938bc5f
3 changed files with 63 additions and 12 deletions

View File

@ -1851,18 +1851,18 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} 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 --- !u!1 &3664916833752817996 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691, m_CorrespondingSourceObject: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691,
type: 3} type: 3}
m_PrefabInstance: {fileID: 2246654624185019878} m_PrefabInstance: {fileID: 2246654624185019878}
m_PrefabAsset: {fileID: 0} 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 --- !u!1001 &3691625806369805098
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1925,6 +1925,46 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 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, - target: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -2045,6 +2085,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4558166201082566443, guid: ac3be7383b736d941b251a588e626963,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7885431782403753906, guid: ac3be7383b736d941b251a588e626963, - target: {fileID: 7885431782403753906, guid: ac3be7383b736d941b251a588e626963,
type: 3} type: 3}
propertyPath: coinPrefab propertyPath: coinPrefab
@ -2059,18 +2104,18 @@ PrefabInstance:
m_RemovedComponents: m_RemovedComponents:
- {fileID: 3928365105026016678, guid: ac3be7383b736d941b251a588e626963, type: 3} - {fileID: 3928365105026016678, guid: ac3be7383b736d941b251a588e626963, type: 3}
m_SourcePrefab: {fileID: 100100000, 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 --- !u!1 &3664916834242367712 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963,
type: 3} type: 3}
m_PrefabInstance: {fileID: 3691625806369805098} m_PrefabInstance: {fileID: 3691625806369805098}
m_PrefabAsset: {fileID: 0} 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 --- !u!1001 &7577981076568039546
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -1003,6 +1003,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
slider: {fileID: 137127162796222319} slider: {fileID: 137127162796222319}
heartLevel: {fileID: 137127163584464916} heartLevel: {fileID: 137127163584464916}
maxObject: {fileID: 4558166201082566443}
--- !u!1 &137127164258565650 --- !u!1 &137127164258565650
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -10,6 +10,7 @@ public class HeartMeter : SingletonMonoBehaviour<HeartMeter>
{ {
[SerializeField] private Slider slider; [SerializeField] private Slider slider;
[SerializeField] private TextMeshProUGUI heartLevel; [SerializeField] private TextMeshProUGUI heartLevel;
[SerializeField] private GameObject maxObject;
private Coroutine coroutine; private Coroutine coroutine;
private List<ShopLevelData> shopLevelList = new List<ShopLevelData>(); private List<ShopLevelData> shopLevelList = new List<ShopLevelData>();
@ -64,6 +65,10 @@ public class HeartMeter : SingletonMonoBehaviour<HeartMeter>
{ {
var maxLevel = shopLevelList.Last().shopLevel; var maxLevel = shopLevelList.Last().shopLevel;
var level = Mathf.Min(newShopLevel, maxLevel); var level = Mathf.Min(newShopLevel, maxLevel);
if (level == maxLevel)
{
maxObject.SetActive(true);
}
shopLevel.Value = level; shopLevel.Value = level;
heartLevel.text = $"{level}"; heartLevel.text = $"{level}";
minHeart = shopLevelList.FirstOrDefault(data => data.shopLevel == level)?.heart ?? 0; minHeart = shopLevelList.FirstOrDefault(data => data.shopLevel == level)?.heart ?? 0;