yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1

This commit is contained in:
koya_15 2022-07-25 16:09:35 +09:00
parent 00ec056825 27b65ad2f7
commit b7dd1a50c6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab
View File

@ -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

3
popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs
View File

@ -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;