PopcornDebugのGameReset時にデバッグ値を保持

popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity

@@ -506,18 +506,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!114 &390540611 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 2152797965052096507, guid: b0a57f0d9e5524e579cad0309e9d44d1,
-    type: 3}
-  m_PrefabInstance: {fileID: 657773245}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &404298883
 GameObject:
   m_ObjectHideFlags: 0
@@ -1729,6 +1717,16 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5780529271574476149, guid: b0a57f0d9e5524e579cad0309e9d44d1,
+        type: 3}
+      propertyPath: gameManager
+      value: 
+      objectReference: {fileID: 1870432533}
+    - target: {fileID: 5780529271574476149, guid: b0a57f0d9e5524e579cad0309e9d44d1,
+        type: 3}
+      propertyPath: thermalControl
+      value: 
+      objectReference: {fileID: 1870432535}
     - target: {fileID: 5969116567130955788, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -1874,66 +1872,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &657773250 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4493661992505599346, guid: b0a57f0d9e5524e579cad0309e9d44d1,
-    type: 3}
-  m_PrefabInstance: {fileID: 657773245}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &657773251 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4035365465071032020, guid: b0a57f0d9e5524e579cad0309e9d44d1,
-    type: 3}
-  m_PrefabInstance: {fileID: 657773245}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &657773252 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6405201674218417112, guid: b0a57f0d9e5524e579cad0309e9d44d1,
-    type: 3}
-  m_PrefabInstance: {fileID: 657773245}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &657773253 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1930711677042961620, guid: b0a57f0d9e5524e579cad0309e9d44d1,
-    type: 3}
-  m_PrefabInstance: {fileID: 657773245}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &657773254 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 2446509828538118658, guid: b0a57f0d9e5524e579cad0309e9d44d1,
-    type: 3}
-  m_PrefabInstance: {fileID: 657773245}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &657773255 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 390509818088476977, guid: b0a57f0d9e5524e579cad0309e9d44d1,
@@ -2796,18 +2734,6 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &1028629823 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8798175650031291884, guid: b0a57f0d9e5524e579cad0309e9d44d1,
-    type: 3}
-  m_PrefabInstance: {fileID: 657773245}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1095273984
 GameObject:
   m_ObjectHideFlags: 0
@@ -3951,18 +3877,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &1665053976 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 462546169576730945, guid: b0a57f0d9e5524e579cad0309e9d44d1,
-    type: 3}
-  m_PrefabInstance: {fileID: 657773245}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1673325601
 GameObject:
   m_ObjectHideFlags: 0
@@ -4395,7 +4309,6 @@ MonoBehaviour:
   thermalControl: {fileID: 1870432535}
   thermoMeter: {fileID: 1928679192}
   cornManager: {fileID: 1870432536}
-  resetButton: {fileID: 390540611}
 --- !u!4 &1870432534
 Transform:
   m_ObjectHideFlags: 0
@@ -4435,14 +4348,6 @@ MonoBehaviour:
   maxDecreaseSpeed: 0.1
   yellowSize: 0.3
   randomRange: 0.2
-  factorSlider: {fileID: 657773254}
-  deadZoneSlider: {fileID: 657773253}
-  baseSpeedSlider: {fileID: 657773252}
-  coldSpeedSlider: {fileID: 1995319247}
-  hotSpeedSlider: {fileID: 657773251}
-  decreaseSpeedSlider: {fileID: 657773250}
-  yellowSizeSlider: {fileID: 1028629823}
-  randomRangeSlider: {fileID: 1665053976}
 --- !u!114 &1870432536
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4704,18 +4609,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1933828729}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1995319247 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 543610246068091086, guid: b0a57f0d9e5524e579cad0309e9d44d1,
-    type: 3}
-  m_PrefabInstance: {fileID: 657773245}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &2055584752
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;
@@ -16,6 +18,12 @@ public class MainGameDebugView : MonoBehaviour
     [SerializeField] private Button pattern1;
     [SerializeField] private Button pattern2;
 
+    [SerializeField] private MainGameDebugParameter[] panDataParameters;
+    [SerializeField] private PopcornGameManager gameManager;
+    [SerializeField] private ThermalControl thermalControl;
+
+    private readonly PanData debugPanData = new PanData();
+
     private void Awake()
     {
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
@@ -34,21 +42,33 @@ public class MainGameDebugView : MonoBehaviour
     // Start is called before the first frame update
 
     void Start()
+    {
+        Initialize();
+    }
+
+    [Conditional("DEVELOPMENT_BUILD"), Conditional("UNITY_EDITOR")]
+    private void Initialize()
     {
         showDebugButton.OnClickAsObservable().Subscribe(_ =>
         {
+            Time.timeScale = 0f;
             view.SetActive(true);
         }).AddTo(this);
         closeDebugButton.OnClickAsObservable().Subscribe(_ =>
         {
+            Time.timeScale = 1f;
             view.SetActive(false);
         }).AddTo(this);
         gameResetButton.OnClickAsObservable().Subscribe(_ =>
         {
+            Time.timeScale = 1f;
             view.SetActive(false);
+            TransitionManager.Instance.UnloadScene(GameScenes.CookingResults);
+            gameManager.ResetGame(debugPanData);
         }).AddTo(this);
         backMainButton.OnClickAsObservable().Subscribe(_ =>
         {
+            Time.timeScale = 1f;
             TransitionManager.Instance.LoadScene(GameScenes.Main);
         }).AddTo(this);
         // pattern1.OnClickAsObservable().Subscribe(_ =>
@@ -59,6 +79,45 @@ public class MainGameDebugView : MonoBehaviour
         // {
         //     SetPreset(preset2);
         // }).AddTo(this);
+        
+        // panData取得
+        var originalPanData = LocalCacheManager.Load<PanData>(PopcornGameManager.PanDataTag);
+        debugPanData.id = originalPanData.id;
+        debugPanData.rarity = originalPanData.rarity;
+        debugPanData.prefabName = originalPanData.prefabName;
+        SetPanDataToParam(originalPanData);
+        panDataParameters.Select(param => param.OnValueChange).CombineLatest()
+            .ThrottleFrame(1)
+            // .Debug("debugParameter")
+            .Subscribe(x =>
+            {
+                SetParamToPanData(x);
+                thermalControl.SetPanData(debugPanData);
+            }).AddTo(this);
+    }
+
+    private void SetParamToPanData(IList<float> parameters)
+    {
+        debugPanData.panFactor = parameters[0];
+        debugPanData.deadZone = parameters[1];
+        debugPanData.baseIncreaseSpeed = parameters[2];
+        debugPanData.coldIncreaseSpeed = parameters[3];
+        debugPanData.hotIncreaseSpeed = parameters[4];
+        debugPanData.maxDecreaseSpeed = parameters[5];
+        debugPanData.yellowSize = parameters[6];
+        debugPanData.randomRange = parameters[7];
+    }
+
+    private void SetPanDataToParam(PanData panData)
+    {
+        panDataParameters[0].SetValue(panData.panFactor);
+        panDataParameters[1].SetValue(panData.deadZone);
+        panDataParameters[2].SetValue(panData.baseIncreaseSpeed);
+        panDataParameters[3].SetValue(panData.coldIncreaseSpeed);
+        panDataParameters[4].SetValue(panData.hotIncreaseSpeed);
+        panDataParameters[5].SetValue(panData.maxDecreaseSpeed);
+        panDataParameters[6].SetValue(panData.yellowSize);
+        panDataParameters[7].SetValue(panData.randomRange);
     }
 
     private float[] preset1 = 
@@ -112,10 +171,4 @@ public class MainGameDebugView : MonoBehaviour
         }
         
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs

@@ -121,6 +121,11 @@ public class PopcornGameManager : MonoBehaviour
     private void ResetGame()
     {
         var panData = LocalCacheManager.Load<PanData>(PanDataTag);
+        ResetGame(panData);
+    }
+    
+    public void ResetGame(PanData panData)
+    {
         var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
         var rarityData = rarityList.First(data => data.Rarity == panData.Rarity);
         // フライパン設定

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs

@@ -43,18 +43,7 @@ public class ThermalControl : MonoBehaviour
     private bool isMove;
 
     public IReadOnlyReactiveProperty<ThermalCondition> Condition => condition;
-    private readonly ReactiveProperty<ThermalCondition> condition = new ReactiveProperty<ThermalCondition>(ThermalCondition.Cold); 
+    private readonly ReactiveProperty<ThermalCondition> condition = new ReactiveProperty<ThermalCondition>(ThermalCondition.Cold);
-
-#if DEVELOPMENT_BUILD || UNITY_EDITOR
-    [SerializeField] private Slider factorSlider;
-    [SerializeField] private Slider deadZoneSlider;
-    [SerializeField] private Slider baseSpeedSlider;
-    [SerializeField] private Slider coldSpeedSlider;
-    [SerializeField] private Slider hotSpeedSlider;
-    [SerializeField] private Slider decreaseSpeedSlider;
-    [SerializeField] private Slider yellowSizeSlider;
-    [SerializeField] private Slider randomRangeSlider;
-#endif
 
     private void Start()
     {
@@ -65,25 +54,7 @@ public class ThermalControl : MonoBehaviour
             Debug.Log($"cond :{x} temp: {temperature}");
         }).AddTo(this);
 #endif
-
+        
-#if DEVELOPMENT_BUILD || UNITY_EDITOR
-        factorSlider.value = panFactor;
-        deadZoneSlider.value = deadZone;
-        baseSpeedSlider.value = baseIncreaseSpeed;
-        coldSpeedSlider.value = coldIncreaseSpeed;
-        hotSpeedSlider.value = hotIncreaseSpeed;
-        decreaseSpeedSlider.value = maxDecreaseSpeed;
-        yellowSizeSlider.value = yellowSize;
-        randomRangeSlider.value = randomRange;
-        factorSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => panFactor = x).AddTo(this);
-        deadZoneSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => deadZone = x).AddTo(this);
-        baseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => baseIncreaseSpeed = x).AddTo(this);
-        coldSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => coldIncreaseSpeed = x).AddTo(this);
-        hotSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => hotIncreaseSpeed = x).AddTo(this);
-        decreaseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => maxDecreaseSpeed = x).AddTo(this);
-        yellowSizeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => yellowSize = x).AddTo(this);
-        randomRangeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => randomRange = x).AddTo(this);
-#endif
     }
 
     private void Update()
@@ -198,15 +169,5 @@ public class ThermalControl : MonoBehaviour
         maxDecreaseSpeed = panData.maxDecreaseSpeed;
         yellowSize = panData.yellowSize;
         randomRange = panData.randomRange;
-#if UNITY_EDITOR || DEVELOPMENT_BUILD
-        factorSlider.value = panFactor;
-        deadZoneSlider.value = deadZone;
-        baseSpeedSlider.value = baseIncreaseSpeed;
-        coldSpeedSlider.value = coldIncreaseSpeed;
-        hotSpeedSlider.value = hotIncreaseSpeed;
-        decreaseSpeedSlider.value = maxDecreaseSpeed;
-        yellowSizeSlider.value = yellowSize;
-        randomRangeSlider.value = randomRange;
-#endif
     }
 }