From 88d87eb6955036f426802a5a297b46cb9951b99b Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 17:54:09 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 5ae7c855..d2edada5 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -8013,10 +8013,10 @@ MonoBehaviour: temperature: 0 temperatureSpeed: 0 panSpeed: 0 - panFactor: 0.21 - deadZone: 0.05 + panFactor: 0.34 + deadZone: 0.03 baseIncreaseSpeed: 0.12 - hotIncreaseSpeed: 0.16 + hotIncreaseSpeed: 0.15 maxDecreaseSpeed: 0.07 coldValue: 0.26 hotValue: 0.67 From cb9fd5a8705ca466f2b56830814652b7294f5013 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 17:54:41 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E3=81=AE?= =?UTF-8?q?=E3=82=86=E3=82=89=E3=81=8E=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E3=83=A9=E3=83=B3=E3=83=80=E3=83=A0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resource/Animation/corn.controller | 14 ++++++++++---- .../Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/corn.controller b/popcorn/Assets/MyGame/Resource/Animation/corn.controller index 67f8c558..e1a7e8db 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/corn.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/corn.controller @@ -45,13 +45,13 @@ AnimatorState: m_Mirror: 0 m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 + m_CycleOffsetParameterActive: 1 m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 8c4b5f3aaed7b46c3819cf3123e9b292, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: - m_CycleOffsetParameter: + m_CycleOffsetParameter: WaitOffset m_TimeParameter: --- !u!91 &9100000 AnimatorController: @@ -67,13 +67,19 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: CornBurn m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: WaitOffset + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs index b6799818..3d0d7946 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs @@ -19,6 +19,7 @@ public class Corn : MonoBehaviour { private static readonly int HashCornGrow = Animator.StringToHash("CornGrow"); private static readonly int HashCornBurn = Animator.StringToHash("CornBurn"); + private static readonly int HashWaitOffset = Animator.StringToHash("WaitOffset"); [SerializeField] private SpriteRenderer spriteRenderer; [SerializeField] private Sprite cornSeedSprite; @@ -57,6 +58,7 @@ public class Corn : MonoBehaviour var rightTop = Camera.main.ScreenToWorldPoint(new Vector3(Screen.width, Screen.height, 0)); worldWidth = rightTop.x; + animator.SetFloat(HashWaitOffset, Random.value/2); } private void Start() From 1033e6eec6483dbc9745d6e866e90cabc927b902 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 17:57:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E3=81=AE=E4=B8=8B?= =?UTF-8?q?=E3=81=8C=E3=82=8A=E3=82=84=E3=81=99=E3=81=95=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Scripts/ThermalControl.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index c2967ac3..78c7ab14 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -31,7 +31,8 @@ public class ThermalControl : MonoBehaviour [SerializeField] private float coldValue = 0.32f; [SerializeField] private float hotValue = 0.67f; - private float duration = 0.3f; + private float increaseDuration = 0.3f; + private float decreaseDuration = 0.1f; private bool isMove; public IReadOnlyReactiveProperty Condition => condition; @@ -57,17 +58,17 @@ public class ThermalControl : MonoBehaviour panSpeed = panController.Delta.magnitude * panFactor; if (panSpeed > deadZone) { - temperatureSpeed = Mathf.Lerp(temperatureSpeed, -Mathf.Min(panSpeed, maxDecreaseSpeed), Time.deltaTime / duration); + temperatureSpeed = Mathf.Lerp(temperatureSpeed, -Mathf.Min(panSpeed, maxDecreaseSpeed), Time.deltaTime / decreaseDuration); } else { if (condition.Value == ThermalCondition.Hot) { - temperatureSpeed = Mathf.Lerp(temperatureSpeed, hotIncreaseSpeed, Time.deltaTime / duration); + temperatureSpeed = Mathf.Lerp(temperatureSpeed, hotIncreaseSpeed, Time.deltaTime / increaseDuration); } else { - temperatureSpeed = Mathf.Lerp(temperatureSpeed, baseIncreaseSpeed, Time.deltaTime / duration); + temperatureSpeed = Mathf.Lerp(temperatureSpeed, baseIncreaseSpeed, Time.deltaTime / increaseDuration); } } temperature = Mathf.Clamp01(temperature + temperatureSpeed * Time.deltaTime);