From a28c1dc2e11d2e49818f014f523c63ef1254fd23 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 25 Oct 2021 13:57:00 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=82=A4=E3=83=AA=E3=83=BC=E3=83=9F?= =?UTF-8?q?=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DebugOption/Scripts/DebugOptionManager.cs | 2 +- .../MyGame/Scenes/Main/Scripts/MissionManager.cs | 14 ++++++++++++-- .../MyGame/Scenes/Main/Scripts/MissionView.cs | 6 ++++++ popcorn/Assets/MyGame/Scripts/GameDataManager.cs | 6 +++--- popcorn/Assets/MyGame/Scripts/GameDataObserver.cs | 4 ++++ popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs | 4 ++-- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index e22dc210..cb05b7a1 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -79,7 +79,7 @@ public class DebugOptionManager : MonoBehaviour gameData.StorageTanks.Add(new StorageTank() { Capacity = 50, - FlavorId = 6, + FlavorId = 5, Stocks = new List { new ProductStockData diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs index e8226fcb..284f6c41 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs @@ -88,9 +88,17 @@ public class MissionManager : MonoBehaviour // dailyMission // コンプリートミッション + MissionView completeMissionView; { var missionView = listView.AddDailyCompleteItemView(); - var missionData = new MissionData(){count = 3, reward = dailyMissionCompleteRewardCoin, text = "デイリーミッションすべて完了で達成"}; + completeMissionView = missionView; + var missionData = new MissionData() + { + count = gameData.dailyMissionIdArray.Length, + reward = dailyMissionCompleteRewardCoin, + text = "デイリーミッションすべて完了で達成", + category = (int)MissionCategory.Daily, + }; var progressValue = gameData.dailyMissionAchievedIdArray.Length; missionView.SetData(missionData, progressValue); missionView.SetButtonActive(missionData.count <= progressValue); @@ -132,8 +140,10 @@ public class MissionManager : MonoBehaviour GetReward(missionData); missionView.SetRewarded(); // 達成ID保存 - gameData.dailyMissionAchievedIdArray = new List(gameData.dailyMissionIdArray){missionData.id}.ToArray(); + gameData.dailyMissionAchievedIdArray = new List(gameData.dailyMissionAchievedIdArray){missionData.id}.ToArray(); GameDataManager.SaveGameData(); + completeMissionView.ChangeProgress(gameData.dailyMissionIdArray.Length, gameData.dailyMissionAchievedIdArray.Length); + completeMissionView.SetButtonActive(gameData.dailyMissionIdArray.Length <= gameData.dailyMissionAchievedIdArray.Length); }))); TransitionManager.Instance.LoadSceneAdditive(GameScenes.MissionAchievement); }).AddTo(missionView); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs index 76f94673..45f65507 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs @@ -25,6 +25,12 @@ public class MissionView : MonoBehaviour progressText.text = string.Format(progressFormat, curentValue, missionData.count); } + public void ChangeProgress(int goalValue, int curentValue) + { + progressBar.value = Mathf.InverseLerp(0, goalValue, curentValue); + progressText.text = string.Format(progressFormat, curentValue, goalValue); + } + public void SetButtonActive(bool active) { rewardButton.gameObject.SetActive(active); diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index 5167a387..fba45f20 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -207,14 +207,14 @@ public sealed class GameData { public void AddSalesCount(int id, int stock, ProductRarity rarity) { OrderConditionCount += stock; - if (!(TotalSalesList.FirstOrDefault(x => x.Rarity == rarity) is ProductStockData stockData)) + if (!(TotalSalesList.FirstOrDefault(x => x.FlavorId == id && x.Rarity == rarity) is ProductStockData stockData)) { stockData = new ProductStockData {FlavorId = id, Rarity = rarity, Stock = 0}; TotalSalesList.Add(stockData); } stockData.Stock += stock; - - if (!(DailyTotalSalesList.FirstOrDefault(x => x.Rarity == rarity) is ProductStockData dailyStockData)) + + if (!(DailyTotalSalesList.FirstOrDefault(x => x.FlavorId == id && x.Rarity == rarity) is ProductStockData dailyStockData)) { dailyStockData = new ProductStockData {FlavorId = id, Rarity = rarity, Stock = 0}; DailyTotalSalesList.Add(dailyStockData); diff --git a/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs b/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs index aad2f5fe..8bf44e7a 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using UniRx; using UnityEngine; @@ -92,6 +93,9 @@ public class GameDataObserver : SingletonMonoBehaviour var targetList = missionList.Where(data => data.Category == MissionCategory.Daily && data.shopLevel <= gameData.ViewedShopLevel); gameData.dailyMissionIdArray = targetList.ToList().RandomChoose(3).Select(data => data.id).ToArray(); +#if UNITY_EDITOR + gameData.dailyMissionIdArray = new List(gameData.dailyMissionIdArray){291}.ToArray(); +#endif gameData.lastDailyMissionSetTime = DateTime.UtcNow.ToBinary(); gameData.dailyLoginCount++; GameDataManager.SaveGameData(); diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index ffe16dcc..0cb833a9 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -53,8 +53,8 @@ public enum MissionCondition CustomerCount = 2, SalesCount = 3, RareSalesCount = 4, - RecipeCount = 5, - CoinConsumeCount = 6, + CoinConsumeCount = 5, + RecipeCount = 6, BulkOrderDeliveredCount = 7, SaltSalesCount = 8, RareSaltSalesCount = 9,