デバッグパラメータ追加

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

@@ -3732,6 +3732,18 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -40, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1589787821 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6186816452360890787, 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 &1596972969
 GameObject:
   m_ObjectHideFlags: 0
@@ -8871,7 +8883,9 @@ MonoBehaviour:
   coldGrowSpeed: 0.1
   hotGrowSpeed: 2
   baseCornPopTime: 12.5
+  cornPopRandom: 5
   cornBurntDuration: 1.5
+  cornBurntRandom: 1
   cornSpillSpeed: 70
   cornPopSpeed: 20
   cornCountSlider: {fileID: 657773260}
@@ -8880,6 +8894,7 @@ MonoBehaviour:
   hotGrowSpeedSlider: {fileID: 657773258}
   popTimeSlider: {fileID: 657773257}
   burntDurationSlider: {fileID: 657773256}
+  burntRandomSlider: {fileID: 1589787821}
   spilledSpeedSlider: {fileID: 657773255}
   popSpeedSlider: {fileID: 657773247}
 --- !u!224 &1871878299 stripped

popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab

@@ -433,7 +433,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -15, y: 0}
+  m_AnchoredPosition: {x: -20, y: 0}
   m_SizeDelta: {x: 368.73462, y: 63.7}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &3475518114244289108

popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab

@@ -550,21 +550,22 @@ RectTransform:
   - {fileID: 1112382072943771151}
   - {fileID: 5416192627147036305}
   - {fileID: 3987940865115793980}
+  - {fileID: 91222054387263441}
   - {fileID: 4333201332210061145}
   - {fileID: 5028291535338148132}
   - {fileID: 4771112501857001908}
   - {fileID: 7234701249961237988}
   - {fileID: 2438367493108694558}
+  - {fileID: 7271260149865018078}
   - {fileID: 3771789703286377036}
   - {fileID: 2271744707010736330}
-  - {fileID: 91222054387263441}
   m_Father: {fileID: 4303795378509814408}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -100}
+  m_AnchoredPosition: {x: 0, y: -75}
-  m_SizeDelta: {x: 0, y: -200}
+  m_SizeDelta: {x: 0, y: -150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7883455930803081654
 MonoBehaviour:
@@ -586,7 +587,7 @@ MonoBehaviour:
   m_ChildAlignment: 1
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 900, y: 100}
+  m_CellSize: {x: 900, y: 90}
   m_Spacing: {x: 20, y: 20}
   m_Constraint: 1
   m_ConstraintCount: 1
@@ -1018,7 +1019,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4336101879092561992
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1330,7 +1331,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8286853419815727351
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1451,7 +1452,7 @@ PrefabInstance:
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_RootOrder
-      value: 15
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -1563,6 +1564,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -1573,6 +1579,16 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3}
 --- !u!224 &91222054387263441 stripped
@@ -2036,7 +2052,7 @@ PrefabInstance:
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_RootOrder
-      value: 14
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -2181,7 +2197,7 @@ PrefabInstance:
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_RootOrder
-      value: 12
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -2276,17 +2292,17 @@ PrefabInstance:
     - target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: maxValue
-      value: 100
+      value: 50
       objectReference: {fileID: 0}
     - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_Text
-      value: "\u30B3\u30FC\u30F3\u7126\u3052\u6642\u9593\n0~1\u79D2\u30E9\u30F3\u30C0\u30E0\u3067\u8FFD\u52A0"
+      value: "\u30B3\u30FC\u30F3\u7126\u3052\u6642\u9593"
       objectReference: {fileID: 0}
     - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_Name
-      value: DebugParameter (11)
+      value: CornBurntTime
       objectReference: {fileID: 0}
     - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -2471,7 +2487,7 @@ PrefabInstance:
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_RootOrder
-      value: 13
+      value: 15
       objectReference: {fileID: 0}
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -2911,7 +2927,7 @@ PrefabInstance:
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -3056,7 +3072,7 @@ PrefabInstance:
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_RootOrder
-      value: 10
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -3201,7 +3217,7 @@ PrefabInstance:
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -3491,7 +3507,7 @@ PrefabInstance:
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_RootOrder
-      value: 11
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -3586,7 +3602,7 @@ PrefabInstance:
     - target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: maxValue
-      value: 100
+      value: 50
       objectReference: {fileID: 0}
     - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -3596,7 +3612,7 @@ PrefabInstance:
     - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
       propertyPath: m_Name
-      value: DebugParameter (10)
+      value: CornPopTime
       objectReference: {fileID: 0}
     - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
         type: 3}
@@ -3616,6 +3632,151 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 7308813773154804941}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7341001014758345719
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4971887160877779298}
+    m_Modifications:
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: maxValue
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_Text
+      value: "\u30B3\u30FC\u30F3\u7126\u3052\u6642\u9593\u306E\u3070\u3089\u3064\u304D"
+      objectReference: {fileID: 0}
+    - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_Name
+      value: CornBurntRandom
+      objectReference: {fileID: 0}
+    - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5952165577170501364, guid: 4b152553cae694e4fb6cd75d23ba5087,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3}
+--- !u!224 &7271260149865018078 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
+    type: 3}
+  m_PrefabInstance: {fileID: 7341001014758345719}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7554891398754978188
 PrefabInstance:
   m_ObjectHideFlags: 0

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

@@ -57,6 +57,7 @@ public class CornManager : MonoBehaviour
     [SerializeField] private Slider hotGrowSpeedSlider;
     [SerializeField] private Slider popTimeSlider;
     [SerializeField] private Slider burntDurationSlider;
+    [SerializeField] private Slider burntRandomSlider;
     [SerializeField] private Slider spilledSpeedSlider;
     [SerializeField] private Slider popSpeedSlider;
 #endif
@@ -104,6 +105,7 @@ public class CornManager : MonoBehaviour
         hotGrowSpeedSlider.value = hotGrowSpeed;
         popTimeSlider.value = baseCornPopTime;
         burntDurationSlider.value = cornBurntDuration;
+        burntRandomSlider.value = cornBurntRandom;
         spilledSpeedSlider.value = cornSpillSpeed;
         popSpeedSlider.value = cornPopSpeed;
         
@@ -113,6 +115,7 @@ public class CornManager : MonoBehaviour
         hotGrowSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotGrowSpeed = x).AddTo(this);
         popTimeSlider.OnValueChangedAsObservable().Subscribe(x => baseCornPopTime = x).AddTo(this);
         burntDurationSlider.OnValueChangedAsObservable().Subscribe(x => cornBurntDuration = x).AddTo(this);
+        burntRandomSlider.OnValueChangedAsObservable().Subscribe(x => cornBurntRandom = x).AddTo(this);
         spilledSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornSpillSpeed = x).AddTo(this);
         popSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornPopSpeed = x).AddTo(this);
 #endif

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

@@ -51,14 +51,14 @@ public class MainGameDebugView : MonoBehaviour
         {
             TransitionManager.Instance.LoadScene(GameScenes.Main);
         }).AddTo(this);
-        pattern1.OnClickAsObservable().Subscribe(_ =>
+        // pattern1.OnClickAsObservable().Subscribe(_ =>
-        {
+        // {
-            SetPreset(preset1);
+        //     SetPreset(preset1);
-        }).AddTo(this);
+        // }).AddTo(this);
-        pattern2.OnClickAsObservable().Subscribe(_ =>
+        // pattern2.OnClickAsObservable().Subscribe(_ =>
-        {
+        // {
-            SetPreset(preset2);
+        //     SetPreset(preset2);
-        }).AddTo(this);
+        // }).AddTo(this);
     }
 
     private float[] preset1 = 
@@ -77,6 +77,7 @@ public class MainGameDebugView : MonoBehaviour
         2f,
         12.5f,
         1.5f,
+        1f,
         45f,
         20f,
     };
@@ -97,6 +98,7 @@ public class MainGameDebugView : MonoBehaviour
         2f,
         12.5f,
         1.5f,
+        1f,
         45f,
         20f,
     };