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

This commit is contained in:
hirokei 2022-07-25 17:44:26 +09:00
commit 35b49bfc79
1 changed files with 11 additions and 0 deletions

View File

@ -1018,6 +1018,16 @@ PrefabInstance:
propertyPath: hitJumpTime
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitStopTime
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitWaitTime
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: flyingFallSpeed
@ -1878,6 +1888,7 @@ MonoBehaviour:
resultManager: {fileID: 5034752974072861423}
readyObject: {fileID: 978217474}
tutorialPopupObject: {fileID: 7325523898178317160}
resultWaitTime: 1
isDebug: 0
--- !u!4 &1870432534
Transform: