From bb1e9bc78e79d413e70a312dd85701d81077ecb2 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 27 Jul 2022 15:47:03 +0900 Subject: [PATCH] =?UTF-8?q?StageData=E3=83=87=E3=83=BC=E3=82=BF=E6=A7=8B?= =?UTF-8?q?=E9=80=A0=E5=A4=89=E6=9B=B4=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/MiniGame/Scripts/DebugGame.cs | 16 ---------------- .../MiniGame/Scripts/StageSelectItemView.cs | 4 ++-- popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs | 4 ++-- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs index ca90de92..9fea323f 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs @@ -46,22 +46,6 @@ namespace MyGame.Scenes.MiniGame.Scripts GameDataManager.GameData.ScrollGameTodayPlayCount = 0; }).AddTo(this); - allHiScoreButton.OnClickAsObservable().Subscribe(_ => - { - foreach (var stageData in SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScrollGameStageDataSheet)) - { - if (!(GameDataManager.GameData.ScrollGameStageScoreList.FirstOrDefault(data => data.Id == stageData.id) is ScrollGameScoreData scoreData)) - { - scoreData = new ScrollGameScoreData - { - Id = stageData.id - }; - GameDataManager.GameData.ScrollGameStageScoreList.Add(scoreData); - } - scoreData.Score = Mathf.Max(scoreData.Score, stageData.needScore); - } - }).AddTo(this); - var debugObject = new GameObject(){name = "debugObject"}; var orgScale = debugObject.transform.localScale; isDebug.Subscribe(x => diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs index 7f64cd79..462f4751 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs @@ -33,10 +33,10 @@ namespace MyGame.Scenes.MiniGame.Scripts switch (stageData.Difficulty) { case ScrollGameDifficulty.Easy: - lockText.text = string.Format(LocalizationManager.GetTranslation("UI/ScrollGameStageLockNormal"), stageData.needScore); + // lockText.text = string.Format(LocalizationManager.GetTranslation("UI/ScrollGameStageLockNormal"), stageData.needScore); break; case ScrollGameDifficulty.Normal: - lockText.text = string.Format(LocalizationManager.GetTranslation("UI/ScrollGameStageLockHard"), stageData.needScore); + // lockText.text = string.Format(LocalizationManager.GetTranslation("UI/ScrollGameStageLockHard"), stageData.needScore); break; case ScrollGameDifficulty.Hard: lockText.text = string.Empty; diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 382e522b..6eff2b29 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -557,9 +557,9 @@ public sealed class ScrollGameStageData public int id; public int placeId; public int difficulty; - public int needScore; public string beginPrefabName; public string randomPrefabName; + public int length; public ScrollGameDifficulty Difficulty => (ScrollGameDifficulty)difficulty; private string[] BeginPrefabName => beginPrefabName.Split(','); @@ -571,6 +571,6 @@ public sealed class ScrollGameStageData public Transform[] GetRandomStagePrefabs() { - return BeginPrefabName.Select(x => Resources.Load($"ScrollGame/Stages/Stage{x}")).ToArray(); + return RandomPrefabName.Select(x => Resources.Load($"ScrollGame/Stages/Stage{x}")).ToArray(); } } \ No newline at end of file