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;