From 9e4145bf641f4d8a27709b11ce2a9abbe5ace936 Mon Sep 17 00:00:00 2001 From: hirokei Date: Mon, 25 Jul 2022 15:47:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E7=B7=9A=E9=9D=9E?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab index 57f6ea30..2a390fc5 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab @@ -4850,7 +4850,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6768129783814160542 Transform: m_ObjectHideFlags: 0 @@ -9775,7 +9775,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.15 + scalar: 0.3 minScalar: 1 maxCurve: serializedVersion: 2 @@ -9828,7 +9828,7 @@ ParticleSystem: startSpeed: serializedVersion: 2 minMaxState: 0 - scalar: 53 + scalar: 13 minScalar: 30 maxCurve: serializedVersion: 2 From 27b65ad2f76f5fb8f3616ca65e12ccbaea84400b Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 25 Jul 2022 16:04:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E5=80=8D=E9=80=9F=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=82=81=E3=82=8A=E8=BE=BC=E3=81=BF=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs index 5ab9b27b..3e9a0bac 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs @@ -168,7 +168,8 @@ namespace MyGame.Scenes.MiniGame.Scripts currentFallSpeed -= fallAcceleration * Time.deltaTime * currentSpeedMultiply; } - transform.AddLocalPositionY(currentFallSpeed * Time.deltaTime * currentSpeedMultiply); + var newYPos = transform.localPosition.y + currentFallSpeed * Time.deltaTime * currentSpeedMultiply; + transform.SetLocalPositionY(Mathf.Max(basePos.y, newYPos)); }, () => { currentFallSpeed = 0f;