From a61628f4c458b8fe9990b717a2101d71366d9e4c Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 14 Oct 2021 11:40:28 +0900 Subject: [PATCH] =?UTF-8?q?=E5=85=84=E5=BC=9F=E4=BC=9A=E8=A9=B1=E3=82=AF?= =?UTF-8?q?=E3=83=A9=E3=82=B9=E5=90=8D=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/marketing/Scripts/BrotherConversation.cs | 5 ++--- popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs index b576e9e1..76b11467 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs @@ -22,7 +22,7 @@ public class BrotherConversation : MonoBehaviour { // レベルからスクリプト読み込み var level = 5; - var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScriptDataSheet); + var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScriptDataSheet); var targetScriptList = scriptList.Where(data => data.id == level).ToList(); var clickCountStream = this.UpdateAsObservable() @@ -53,8 +53,7 @@ public class BrotherConversation : MonoBehaviour SetData(targetScriptList[0]); } - // ここチュートリアルでも使えるようにDataClass切りたい - private void SetData(ShopLevelScriptData scriptData) + private void SetData(BrotherScriptData scriptData) { Debug.Log($"{scriptData.BlueFace.ToString()}, {scriptData.PinkFace.ToString()}"); brotherBlueAnimator.SetTrigger(scriptData.BlueFace.ToString()); diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 408d2f5a..ca387dcd 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -293,7 +293,7 @@ public sealed class ShopLevelData } [Serializable] -public sealed class ShopLevelScriptData +public sealed class BrotherScriptData { public int id; public string text;