diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index edcc2083..dbca829a 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -8831,6 +8831,7 @@ MonoBehaviour: panFactor: 0.002 deadZone: 0.009 baseIncreaseSpeed: 0.18 + coldIncreaseSpeed: 0.18 hotIncreaseSpeed: 0.18 maxDecreaseSpeed: 0.5 coldValue: 0.35 @@ -8838,6 +8839,7 @@ MonoBehaviour: factorSlider: {fileID: 657773254} deadZoneSlider: {fileID: 657773253} baseSpeedSlider: {fileID: 657773252} + coldSpeedSlider: {fileID: 1995319247} hotSpeedSlider: {fileID: 657773251} decreaseSpeedSlider: {fileID: 657773250} coldSlider: {fileID: 657773249} @@ -8870,7 +8872,7 @@ MonoBehaviour: hotGrowSpeed: 2 baseCornPopTime: 12.5 cornBurntDuration: 1.5 - cornSpillSpeed: 45 + cornSpillSpeed: 70 cornPopSpeed: 20 cornCountSlider: {fileID: 657773260} faildCountSlider: {fileID: 657773259} @@ -9104,6 +9106,18 @@ 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 &2043133481 GameObject: m_ObjectHideFlags: 0 @@ -14078,12 +14092,12 @@ PrefabInstance: - target: {fileID: 1453251556405238011, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: thrust - value: 0.07 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 1453251556405238011, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: deadZone - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1453251556405238011, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/PanEdge.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/PanEdge.physicsMaterial2D index 495a45e5..e44251ab 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/PanEdge.physicsMaterial2D +++ b/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/PanEdge.physicsMaterial2D @@ -8,4 +8,4 @@ PhysicsMaterial2D: m_PrefabAsset: {fileID: 0} m_Name: PanEdge friction: 0.01 - bounciness: 0 + bounciness: 0.5 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/corn.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/corn.physicsMaterial2D index 7a05566b..7246adf0 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/corn.physicsMaterial2D +++ b/popcorn/Assets/MyGame/Scenes/Cooking/PhysicsMaterials/corn.physicsMaterial2D @@ -8,4 +8,4 @@ PhysicsMaterial2D: m_PrefabAsset: {fileID: 0} m_Name: corn friction: 0.01 - bounciness: 0 + bounciness: 0.4 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab index 83250bdf..654e0583 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab @@ -545,11 +545,11 @@ RectTransform: - {fileID: 1207237267587803519} - {fileID: 3168295903013582761} - {fileID: 7624753188443107493} + - {fileID: 3942904769723343795} - {fileID: 662934999055142313} - {fileID: 1112382072943771151} - {fileID: 5416192627147036305} - {fileID: 3987940865115793980} - - {fileID: 91222054387263441} - {fileID: 4333201332210061145} - {fileID: 5028291535338148132} - {fileID: 4771112501857001908} @@ -557,7 +557,7 @@ RectTransform: - {fileID: 2438367493108694558} - {fileID: 3771789703286377036} - {fileID: 2271744707010736330} - - {fileID: 3942904769723343795} + - {fileID: 91222054387263441} m_Father: {fileID: 4303795378509814408} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1451,7 +1451,7 @@ PrefabInstance: - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_RootOrder - value: 7 + value: 15 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -1558,6 +1558,11 @@ PrefabInstance: propertyPath: m_Name value: CornCount objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -1596,7 +1601,7 @@ PrefabInstance: - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -1701,7 +1706,7 @@ PrefabInstance: - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name - value: DebugParameter (3) + value: HotSpeed objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -1741,7 +1746,7 @@ PrefabInstance: - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -2611,7 +2616,7 @@ PrefabInstance: - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -2756,7 +2761,7 @@ PrefabInstance: - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_RootOrder - value: 15 + value: 3 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -2766,7 +2771,7 @@ PrefabInstance: - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -2776,17 +2781,17 @@ PrefabInstance: - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_SizeDelta.x - value: 900 + value: 0 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -2826,12 +2831,12 @@ PrefabInstance: - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 0 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchoredPosition.y - value: -1730 + value: 0 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -2848,25 +2853,35 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: maxValue + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Text + value: "Cold\u6642\u4E0A\u6607\u901F\u5EA6" + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name - value: DebugParameter (14) + value: ColdSpeed objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5952165577170501364, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -3331,7 +3346,7 @@ PrefabInstance: - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -3726,7 +3741,7 @@ PrefabInstance: - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name - value: DebugParameter (2) + value: BaseSpeed objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab index f1589d6b..312fce00 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab @@ -87,8 +87,8 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDrag: 4 - m_AngularDrag: 4 + m_LinearDrag: 3 + m_AngularDrag: 2 m_GravityScale: 0 m_Material: {fileID: 6200000, guid: 1e68e56cd6ac4484ba25eb760e0d3057, type: 2} m_Interpolate: 0 @@ -110,7 +110,7 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.18 + m_Radius: 0.2 --- !u!1 &3431194784518736845 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs index 3e54b725..7579c01c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs @@ -256,9 +256,9 @@ public class CornManager : MonoBehaviour var animation = Instantiate(missCornAnimationPrefab, position, Quaternion.identity, missTextSpawnTransform); animation.GetComponent().ChangeSkin(condition); - this.CallWaitForSeconds(.5f, () => + this.CallWaitForSeconds(.75f, () => { - this.CallLerp(.2f, f => + this.CallLerp(.1f, f => { animation.transform.position = Vector3.Lerp(position, cornMissMeter.transform.position, f.EaseInCubic()); }, () => diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs index beb15320..a31d5312 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs @@ -67,6 +67,7 @@ public class MainGameDebugView : MonoBehaviour 0.009f, 0.18f, 0.18f, + 0.18f, 0.5f, 0.35f, 0.65f, @@ -85,6 +86,7 @@ public class MainGameDebugView : MonoBehaviour 0.003f, 0.009f, 0.5f, + 0.5f, 0.18f, 0.5f, 0.45f, diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index 806b9b1c..f02ba0bf 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -25,6 +25,7 @@ public class ThermalControl : MonoBehaviour [SerializeField] private float deadZone = .1f; [Header("熱くなるスピード/冷えるスピードの最大値/加速")] [SerializeField] private float baseIncreaseSpeed = .03f; + [SerializeField] private float coldIncreaseSpeed = .03f; [SerializeField] private float hotIncreaseSpeed = .07f; [SerializeField] private float maxDecreaseSpeed = .03f; [Space] @@ -43,6 +44,7 @@ public class ThermalControl : MonoBehaviour [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 coldSlider; @@ -63,6 +65,7 @@ public class ThermalControl : MonoBehaviour factorSlider.value = panFactor; deadZoneSlider.value = deadZone; baseSpeedSlider.value = baseIncreaseSpeed; + coldSpeedSlider.value = coldIncreaseSpeed; hotSpeedSlider.value = hotIncreaseSpeed; decreaseSpeedSlider.value = maxDecreaseSpeed; coldSlider.value = coldValue; @@ -70,6 +73,7 @@ public class ThermalControl : MonoBehaviour 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); @@ -90,6 +94,7 @@ public class ThermalControl : MonoBehaviour } else { + temperatureSpeed = Mathf.Lerp(temperatureSpeed, GetIncreaseSpeed(condition.Value), Time.deltaTime / increaseDuration); if (condition.Value == ThermalCondition.Hot) { temperatureSpeed = Mathf.Lerp(temperatureSpeed, hotIncreaseSpeed, Time.deltaTime / increaseDuration); @@ -104,6 +109,24 @@ public class ThermalControl : MonoBehaviour condition.Value = GetCondition(); } + private float GetIncreaseSpeed(ThermalCondition thermalCondition) + { + switch (thermalCondition) + { + case ThermalCondition.Cold: + return coldIncreaseSpeed; + break; + case ThermalCondition.Yellow: + return baseIncreaseSpeed; + break; + case ThermalCondition.Hot: + return hotIncreaseSpeed; + break; + default: + throw new ArgumentOutOfRangeException(nameof(thermalCondition), thermalCondition, null); + } + } + private ThermalCondition GetCondition() { if (temperature <= coldValue)