From 67e264580c8f4729dc37e4113dd294afe1e44d15 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 4 Aug 2021 14:54:38 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B2=E3=83=BC=E3=82=B8=E3=81=8C=E3=83=A9?= =?UTF-8?q?=E3=83=B3=E3=83=80=E3=83=A0=E3=81=A7=E7=A7=BB=E5=8B=95=E3=81=99?= =?UTF-8?q?=E3=82=8B=E4=BB=95=E6=A7=98=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 56 +++++++++---------- .../Scenes/Cooking/Prefabs/DebugView.prefab | 12 ++-- .../Scenes/Cooking/Scripts/ThermalControl.cs | 31 +++++++--- 3 files changed, 57 insertions(+), 42 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 6e3fcf18..798b49b4 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -1876,30 +1876,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &657773248 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!114 &657773249 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!114 &657773250 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4493661992505599346, guid: b0a57f0d9e5524e579cad0309e9d44d1, @@ -7582,6 +7558,18 @@ 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 @@ -13399,6 +13387,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2137549891} m_PrefabAsset: {fileID: 0} +--- !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 @@ -13665,16 +13665,16 @@ MonoBehaviour: coldIncreaseSpeed: 0.5 hotIncreaseSpeed: 0.08 maxDecreaseSpeed: 0.5 - coldValue: 0.35 - hotValue: 0.65 + yellowSize: 0.3 + randomRange: 0.2 factorSlider: {fileID: 657773254} deadZoneSlider: {fileID: 657773253} baseSpeedSlider: {fileID: 657773252} coldSpeedSlider: {fileID: 1995319247} hotSpeedSlider: {fileID: 657773251} decreaseSpeedSlider: {fileID: 657773250} - coldSlider: {fileID: 657773249} - hotSlider: {fileID: 657773248} + yellowSizeSlider: {fileID: 1028629823} + randomRangeSlider: {fileID: 1665053976} --- !u!114 &1870432536 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab index 8598883b..86b4f8d9 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab @@ -2727,17 +2727,17 @@ PrefabInstance: - target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: maxValue - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Text - value: "\u30B2\u30FC\u30B8\nYelow/Hot\u5883\u754C" + value: "\u30B2\u30FC\u30B8\n\u9EC4\u8272\u306E\u30E9\u30F3\u30C0\u30E0\u4F4D\u7F6E" objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name - value: DebugParameter (6) + value: RandomValue objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -3457,17 +3457,17 @@ PrefabInstance: - target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: maxValue - value: 1 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Text - value: "\u30B2\u30FC\u30B8\nCold/Yellow\u5883\u754C" + value: "\u30B2\u30FC\u30B8\n\u9EC4\u8272\u306E\u30B5\u30A4\u30BA" objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name - value: DebugParameter (5) + value: YellowSize objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index a915f1ce..de58c728 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -3,6 +3,7 @@ using UniRx; using Unity.Mathematics; using UnityEngine; using UnityEngine.UI; +using Random = UnityEngine.Random; public enum ThermalCondition { @@ -30,8 +31,12 @@ public class ThermalControl : MonoBehaviour [SerializeField] private float maxDecreaseSpeed = .03f; [Space] [Header("ゲージ調整")] - [SerializeField] private float coldValue = 0.32f; - [SerializeField] private float hotValue = 0.67f; + [Range(0f, .8f)] + [SerializeField] private float yellowSize; + [Range(0f, .5f)] + [SerializeField] private float randomRange; + private float coldValue; + private float hotValue; private float increaseDuration = 0.3f; private float decreaseDuration = 0.1f; @@ -47,8 +52,8 @@ public class ThermalControl : MonoBehaviour [SerializeField] private Slider coldSpeedSlider; [SerializeField] private Slider hotSpeedSlider; [SerializeField] private Slider decreaseSpeedSlider; - [SerializeField] private Slider coldSlider; - [SerializeField] private Slider hotSlider; + [SerializeField] private Slider yellowSizeSlider; + [SerializeField] private Slider randomRangeSlider; #endif private void Start() @@ -68,16 +73,16 @@ public class ThermalControl : MonoBehaviour coldSpeedSlider.value = coldIncreaseSpeed; hotSpeedSlider.value = hotIncreaseSpeed; decreaseSpeedSlider.value = maxDecreaseSpeed; - coldSlider.value = coldValue; - hotSlider.value = hotValue; + yellowSizeSlider.value = yellowSize; + randomRangeSlider.value = randomRange; factorSlider.OnValueChangedAsObservable().Subscribe(x => panFactor = x).AddTo(this); deadZoneSlider.OnValueChangedAsObservable().Subscribe(x => deadZone = x).AddTo(this); baseSpeedSlider.OnValueChangedAsObservable().Subscribe(x => baseIncreaseSpeed = x).AddTo(this); coldSpeedSlider.OnValueChangedAsObservable().Subscribe(x => coldIncreaseSpeed = x).AddTo(this); hotSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotIncreaseSpeed = x).AddTo(this); decreaseSpeedSlider.OnValueChangedAsObservable().Subscribe(x => maxDecreaseSpeed = x).AddTo(this); - coldSlider.OnValueChangedAsObservable().Subscribe(x => coldValue = x).AddTo(this); - hotSlider.OnValueChangedAsObservable().Subscribe(x => hotValue = x).AddTo(this); + yellowSizeSlider.OnValueChangedAsObservable().Subscribe(x => yellowSize = x).AddTo(this); + randomRangeSlider.OnValueChangedAsObservable().Subscribe(x => randomRange = x).AddTo(this); #endif } @@ -140,11 +145,21 @@ public class ThermalControl : MonoBehaviour return ThermalCondition.Yellow; } + private void SetMeterValue() + { + // Todo 初回プレイ時は中央 + var yellowPos = Random.Range(-randomRange, randomRange) + .5f; + var halfYellowSize = yellowSize / 2; + coldValue = Mathf.Max(0f, yellowPos - halfYellowSize); + hotValue = Mathf.Min(1f, yellowPos + halfYellowSize); + } + public void ResetMeter() { temperature = 0f; thermoMeter.SetValue(temperature); temperatureSpeed = 0f; + SetMeterValue(); thermoMeter.SetScale(coldValue, hotValue); panController.ResetTargetPosition(); panController.enabled = true;