From c32eb0bf7c1b5be12483e1ef24d915f5cce12c7d Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 14 Oct 2021 12:48:38 +0900 Subject: [PATCH] =?UTF-8?q?=E5=85=84=E5=BC=9F=E4=BC=9A=E8=A9=B1=E3=82=92Sc?= =?UTF-8?q?riptData=E3=83=AD=E3=83=BC=E3=83=89=E4=BB=95=E6=A7=98=E3=81=AB?= =?UTF-8?q?=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 | 6 ++---- .../Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs | 7 ++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs index fc52524e..e3062b93 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs @@ -8,6 +8,7 @@ using UnityEngine.UI; public class BrotherConversation : MonoBehaviour { + public static readonly string ScriptDataTag = "BrotherConversationScriptData"; private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); @@ -25,10 +26,7 @@ public class BrotherConversation : MonoBehaviour private void Start() { - // レベルからスクリプト読み込み - var level = 2; - var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScriptDataSheet); - var targetScriptList = scriptList.Where(data => data.id == level).ToList(); + var targetScriptList = LocalCacheManager.Load>(ScriptDataTag); var clickCountStream = this.UpdateAsObservable() .Select(_ => Input.GetMouseButton(0)) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs index af836170..bf3ecb23 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs @@ -19,6 +19,12 @@ public class ShopLevelUp : MonoBehaviour private void Start() { + // レベルからスクリプト読み込み + var shopLevel = 5; + var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScriptDataSheet); + var targetScriptList = scriptList.Where(data => data.id == shopLevel).ToList(); + LocalCacheManager.Save(BrotherConversation.ScriptDataTag, targetScriptList); + closeButton.OnClickAsObservable().Subscribe(_ => { transform.SetLocalScale(0); @@ -32,7 +38,6 @@ public class ShopLevelUp : MonoBehaviour var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); - var shopLevel = 5; shopLevelText.text = shopLevel.ToString(); achievementText.text = shopLevelList.First(data => data.shopLevel == shopLevel).achievement; recipeNameText.text = productList.First(data => data.shopLevel == shopLevel).name;