From 42bfb62734067022d39abbc3a0728cbf6c2d51ae Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 11:36:30 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E6=95=B0?= =?UTF-8?q?=E5=A2=97=E5=8A=A0/=E3=81=9D=E3=81=AE=E4=BB=96=E3=83=91?= =?UTF-8?q?=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 6b0b6d84..0ea53fa0 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -136,7 +136,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &70623621 Transform: m_ObjectHideFlags: 0 @@ -8259,12 +8259,12 @@ MonoBehaviour: temperature: 0 temperatureSpeed: 0 panSpeed: 0 - panFactor: 0.5 - deadZone: 0.01 - baseIncreaseSpeed: 0.06 - hotIncreaseSpeed: 0.09 - maxDecreaseSpeed: 0.09 - coldValue: 0.32 + panFactor: 0.18 + deadZone: 0.05 + baseIncreaseSpeed: 0.12 + hotIncreaseSpeed: 0.16 + maxDecreaseSpeed: 0.07 + coldValue: 0.26 hotValue: 0.67 --- !u!114 &1870432536 MonoBehaviour: @@ -8281,11 +8281,14 @@ MonoBehaviour: cornSpawnTarget: {fileID: 1440136003} cornPrefab: {fileID: 5499754490129207122, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} - cornSpawnCount: 20 + cornSpawnCount: 120 + maxFailedCornCount: 70 baseGrowSpeed: 1 - hotGrowSpeed: 1.5 + hotGrowSpeed: 1.4 baseCornPopTime: 10 - cornBurntDuration: 1 + cornBurntDuration: 2 + cornSpillSpeed: 50 + cornPopSpeed: 30 --- !u!1 &1928679189 GameObject: m_ObjectHideFlags: 0 From 627c53d1bf52a438119e8deec731e90437a7cc49 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 11:54:32 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E3=81=AE?= =?UTF-8?q?=E5=90=B9=E3=81=A3=E9=A3=9B=E3=81=B3/=E5=BC=BE=E3=81=91?= =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4=E5=8F=AF=E8=83=BD=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs | 12 +++++++----- .../MyGame/Scenes/Cooking/Scripts/CornManager.cs | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs index 29fb7949..729ad60f 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs @@ -32,8 +32,8 @@ public class Corn : MonoBehaviour private float cornBurntTime; private float cornGrowTime; private float cornGrowSpeed; - private float maxSpeed = 50f; - private float popSpeed = 20f; + private float cornSpillSpeed; + private float cornPopSpeed; public IReadOnlyReactiveProperty Condition => condition; private readonly ReactiveProperty condition = new ReactiveProperty(CornCondition.Seed); @@ -59,7 +59,7 @@ public class Corn : MonoBehaviour // コーンが飛んでいく this.ObserveEveryValueChanged(x => x.rigidbody.velocity.magnitude) - .Where(x => x >= maxSpeed) + .Where(x => x >= cornSpillSpeed) .FirstOrDefault() .Subscribe(_ => { @@ -116,7 +116,7 @@ public class Corn : MonoBehaviour private void CornPop() { spriteRenderer.sprite = cornSimpleSprite; - rigidbody.AddForce(popSpeed * new Vector2(Random.value * 2 - 1, Random.value * 2 - 1), ForceMode2D.Impulse); + rigidbody.AddForce(cornPopSpeed * new Vector2(Random.value * 2 - 1, Random.value * 2 - 1), ForceMode2D.Impulse); animator.SetTrigger(HashCornGrow); } @@ -132,10 +132,12 @@ public class Corn : MonoBehaviour GetComponent().enabled = false; } - public void SetCornProperty(float popTime, float burntDuration) + public void SetCornProperty(float popTime, float burntDuration, float spillSpeed, float popSpeed) { cornPopTime = popTime + Random.Range(0, 2f); cornBurntTime = cornPopTime + burntDuration + Random.Range(0, 1f); + cornSpillSpeed = spillSpeed; + cornPopSpeed = popSpeed; } public void ChangeGrowSpeed(float speed) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs index d7e2ebf2..4f581109 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs @@ -21,6 +21,8 @@ public class CornManager : MonoBehaviour [SerializeField] private float hotGrowSpeed; [SerializeField] private float baseCornPopTime = 5f; [SerializeField] private float cornBurntDuration = 5f; + [SerializeField] private float cornSpillSpeed = 50f; + [SerializeField] private float cornPopSpeed = 20f; public IReadOnlyReactiveProperty Result => result; private readonly ReactiveProperty result = new ReactiveProperty(); @@ -62,7 +64,7 @@ public class CornManager : MonoBehaviour { var corn = Instantiate(cornPrefab, cornSpawnTarget); cornArray[i] = corn; - corn.SetCornProperty(baseCornPopTime, cornBurntDuration); + corn.SetCornProperty(baseCornPopTime, cornBurntDuration, cornSpillSpeed, cornPopSpeed); // 進行速度の変更時、コーン速度変更 cornGrowSpeed.TakeWhile(_ => !isCompleted).Subscribe(x => From 38a14dc8d308c37de350744e672f051151b76057 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 11:54:47 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E6=99=82=E6=8C=99=E5=8B=95?= =?UTF-8?q?=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index d2d779fa..c2967ac3 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -91,6 +91,7 @@ public class ThermalControl : MonoBehaviour public void ResetMeter() { temperature = 0f; + thermoMeter.SetValue(temperature); temperatureSpeed = 0f; thermoMeter.SetScale(coldValue, hotValue); panController.ResetTargetPosition(); From 4efe9af9fefbef95c2c6518ffd8dd55bc171a516 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 12:01:00 +0900 Subject: [PATCH 4/5] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 0ea53fa0..81a8ff38 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -8286,7 +8286,7 @@ MonoBehaviour: baseGrowSpeed: 1 hotGrowSpeed: 1.4 baseCornPopTime: 10 - cornBurntDuration: 2 + cornBurntDuration: 1 cornSpillSpeed: 50 cornPopSpeed: 30 --- !u!1 &1928679189 From f55db0918f8ced05e778be5cb3e612dea4d3d54c Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 12:01:17 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E3=81=AE?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=82=92=E5=B0=8F=E3=81=95=E3=81=8F=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab index 0749758b..b4463198 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab @@ -110,7 +110,7 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.21 + m_Radius: 0.16 --- !u!1 &3431194784518736845 GameObject: m_ObjectHideFlags: 0