diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs index 12fbee5b..34fe6670 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs @@ -94,10 +94,8 @@ namespace MyGame.Scenes.MiniGame.Scripts { // スコア更新 var placeScore = gameData.ScrollGamePlaceScoreList.FirstOrDefault(data => data.Id == placeId)?.Score ?? 0; - stageSelectView.SetScore(placeScore); + stageSelectView.SetTotalScore(placeScore); stageSelectView.SetStageHiScore(gameData.ScrollGameStageScoreList.FirstOrDefault(data => data.Id == stageData.id)?.Score ?? 0); - // 達成報酬更新 - stageSelectView.SetRecipeActive(placeScore < levelPlaceList[1].NeedScore); }).AddTo(this); stageSelectView.OnClick.ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => { diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs index cb78e6b2..3fa4c4c9 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs @@ -17,16 +17,14 @@ namespace MyGame.Scenes.MiniGame.Scripts [SerializeField] private Text totalScore; [SerializeField] private Text stageHiScore; [SerializeField] private Button selectButton; - [SerializeField] private GameObject achievementObject; [SerializeField] private GameObject recipeObject; - [SerializeField] private GameObject customizeObject; private ScrollGamePlaceData[] sortedPlaceDataListByNeedScore; public IObservable OnClick => selectButton.OnClickAsObservable().TakeUntilDestroy(this); public void SetStageHiScore(int num) => stageHiScore.text = $"{LocalizationManager.GetTranslation("UI/HiScore")}{num}"; public void SetTotalScore(int num) { totalScore.text = $"{LocalizationManager.GetTranslation("UI/TotalScore")}{num}"; - achievementObject.SetActive(num < sortedPlaceDataListByNeedScore.Max(data => data.NeedScore)); + recipeObject.SetActive(num < sortedPlaceDataListByNeedScore.Max(data => data.NeedScore)); UpdateAchievement(num); } @@ -61,8 +59,6 @@ namespace MyGame.Scenes.MiniGame.Scripts private void SetAchievement(ScrollGamePlaceData placeData) { - recipeObject.SetActive(placeData.recipeId != 0); - customizeObject.SetActive(placeData.customizeId != 0); var productDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); var customizeDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopCustomizeDataSheet); if (placeData.recipeId != 0)