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 15:13:20 +09:00
parent 773b632536 4875f94892
commit c1e255c6df
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity
View File

@ -1018,10 +1018,15 @@ PrefabInstance:
propertyPath: hitJumpTime propertyPath: hitJumpTime
value: 0.3 value: 0.3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: flyingFallSpeed
value: 0.925
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: fallAcceleration propertyPath: fallAcceleration
value: 30 value: 40
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
@ -1068,6 +1073,11 @@ PrefabInstance:
propertyPath: hitAnimationCurve.m_Curve.Array.data[1].value propertyPath: hitAnimationCurve.m_Curve.Array.data[1].value
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: jumpAnimationCurve.m_Curve.Array.data[1].time
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: jumpAnimationCurve.m_Curve.Array.data[1].value propertyPath: jumpAnimationCurve.m_Curve.Array.data[1].value
@ -1098,11 +1108,26 @@ PrefabInstance:
propertyPath: hitAnimationCurve.m_Curve.Array.data[1].outSlope propertyPath: hitAnimationCurve.m_Curve.Array.data[1].outSlope
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: jumpAnimationCurve.m_Curve.Array.data[0].inSlope
value: 26.07366
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].outWeight propertyPath: hitAnimationCurve.m_Curve.Array.data[0].outWeight
value: 0.04351728 value: 0.04351728
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: jumpAnimationCurve.m_Curve.Array.data[0].outSlope
value: 26.07366
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: jumpAnimationCurve.m_Curve.Array.data[0].outWeight
value: 0.05398513
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].tangentMode propertyPath: hitAnimationCurve.m_Curve.Array.data[0].tangentMode