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 18:31:22 +09:00
parent ac96ad99bb 88e3d2ef20
commit 626f2c8682
4 changed files with 1290 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1506
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim
View File

File diff suppressed because it is too large Load Diff

114
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Gliding.anim
View File

@ -84,6 +84,15 @@ AnimationClip:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0, y: 0, z: -11.899} value: {x: 0, y: 0, z: -11.899}
inSlope: {x: 0, y: 0, z: -37.439884}
outSlope: {x: 0, y: 0, z: -37.439884}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.34997007}
- serializedVersion: 3
time: 0.16666667
value: {x: 0, y: 0, z: -16.33382}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
@ -91,7 +100,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 0.4
value: {x: 0, y: 0, z: -8.675} value: {x: 0, y: 0, z: -8.675}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
@ -102,11 +111,11 @@ AnimationClip:
- serializedVersion: 3 - serializedVersion: 3
time: 0.5 time: 0.5
value: {x: 0, y: 0, z: -11.899} value: {x: 0, y: 0, z: -11.899}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: -52.73346}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: -52.73346}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.60727245}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
@ -323,15 +332,15 @@ AnimationClip:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: -0.1888714, y: -1.5325537, z: 0} value: {x: -0.1888714, y: -1.5325537, z: 0}
inSlope: {x: 0, y: 4.978495, z: 0} inSlope: {x: 0, y: 10.102795, z: 0}
outSlope: {x: 0, y: 4.978495, z: 0} outSlope: {x: 0, y: 10.102795, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.80840975, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.3032491, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.083333336 time: 0.083333336
value: {x: -0.1888714, y: -1.3348621, z: 0} value: {x: -0.1888714, y: -1.1483387, z: 0}
inSlope: {x: 0, y: -0.6286718, z: 0} inSlope: {x: 0, y: -0.6286718, z: 0}
outSlope: {x: 0, y: -0.6286718, z: 0} outSlope: {x: 0, y: -0.6286718, z: 0}
tangentMode: 0 tangentMode: 0
@ -340,7 +349,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.3101302, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.3101302, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 0.33333334
value: {x: -0.1888714, y: -1.8754822, z: 0} value: {x: -0.1888714, y: -1.8855529, z: 0}
inSlope: {x: 0, y: -0.21207862, z: 0} inSlope: {x: 0, y: -0.21207862, z: 0}
outSlope: {x: 0, y: -0.21207862, z: 0} outSlope: {x: 0, y: -0.21207862, z: 0}
tangentMode: 0 tangentMode: 0
@ -350,11 +359,11 @@ AnimationClip:
- serializedVersion: 3 - serializedVersion: 3
time: 0.5 time: 0.5
value: {x: -0.1888714, y: -1.5325537, z: 0} value: {x: -0.1888714, y: -1.5325537, z: 0}
inSlope: {x: 0, y: 3.7691684, z: 0} inSlope: {x: 0, y: 3.7586515, z: 0}
outSlope: {x: 0, y: 3.7691684, z: 0} outSlope: {x: 0, y: 3.7586515, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.38821474, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.42928955, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.52102536, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.52102536, z: 0.33333334}
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
@ -1357,15 +1366,6 @@ AnimationClip:
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.5 time: 0.5
value: 0 value: 0
@ -1394,15 +1394,6 @@ AnimationClip:
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.5 time: 0.5
value: 0 value: 0
@ -1425,6 +1416,15 @@ AnimationClip:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -11.899 value: -11.899
inSlope: -37.439884
outSlope: -37.439884
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.34997007
- serializedVersion: 3
time: 0.16666667
value: -16.33382
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -1432,7 +1432,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 0.4
value: -8.675 value: -8.675
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -1443,11 +1443,11 @@ AnimationClip:
- serializedVersion: 3 - serializedVersion: 3
time: 0.5 time: 0.5
value: -11.899 value: -11.899
inSlope: 0 inSlope: -52.73346
outSlope: 0 outSlope: -52.73346
tangentMode: 136 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.60727245
outWeight: 0.33333334 outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
@ -1989,15 +1989,15 @@ AnimationClip:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -1.5325537 value: -1.5325537
inSlope: 4.978495 inSlope: 10.102795
outSlope: 4.978495 outSlope: 10.102795
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.80840975 outWeight: 0.3032491
- serializedVersion: 3 - serializedVersion: 3
time: 0.083333336 time: 0.083333336
value: -1.3348621 value: -1.1483387
inSlope: -0.6286718 inSlope: -0.6286718
outSlope: -0.6286718 outSlope: -0.6286718
tangentMode: 0 tangentMode: 0
@ -2006,7 +2006,7 @@ AnimationClip:
outWeight: 0.3101302 outWeight: 0.3101302
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 0.33333334
value: -1.8754822 value: -1.8855529
inSlope: -0.21207862 inSlope: -0.21207862
outSlope: -0.21207862 outSlope: -0.21207862
tangentMode: 0 tangentMode: 0
@ -2016,11 +2016,11 @@ AnimationClip:
- serializedVersion: 3 - serializedVersion: 3
time: 0.5 time: 0.5
value: -1.5325537 value: -1.5325537
inSlope: 3.7691684 inSlope: 3.7586515
outSlope: 3.7691684 outSlope: 3.7586515
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.38821474 inWeight: 0.42928955
outWeight: 0.52102536 outWeight: 0.52102536
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
@ -2734,7 +2734,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.z attribute: m_LocalEulerAngles.z
path: AnimationPivot_pink path: AnimationPivot_pink/pink/leg/jump/front
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -2744,17 +2744,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.y attribute: m_LocalEulerAngles.y
path: AnimationPivot_pink path: AnimationPivot_pink/pink/leg/jump/front
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: AnimationPivot_pink
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -2767,6 +2757,16 @@ AnimationClip:
path: AnimationPivot_pink/pink/leg/jump/front path: AnimationPivot_pink/pink/leg/jump/front
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: AnimationPivot_pink
classID: 4
script: {fileID: 0}
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
m_Curve: [] m_Curve: []
@ -2774,7 +2774,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.y attribute: m_LocalEulerAngles.y
path: AnimationPivot_pink/pink/leg/jump/front path: AnimationPivot_pink
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -2784,7 +2784,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.z attribute: m_LocalEulerAngles.z
path: AnimationPivot_pink/pink/leg/jump/front path: AnimationPivot_pink
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
m_HasGenericRootTransform: 0 m_HasGenericRootTransform: 0

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

@ -1001,7 +1001,7 @@ PrefabInstance:
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: hitTime propertyPath: hitTime
value: 1.4 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
@ -1018,6 +1018,16 @@ 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: 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, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: flyingFallSpeed propertyPath: flyingFallSpeed
@ -1061,7 +1071,7 @@ PrefabInstance:
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].time propertyPath: hitAnimationCurve.m_Curve.Array.data[0].time
value: 0 value: -0.0020980835
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
@ -1076,7 +1086,7 @@ PrefabInstance:
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[1].value propertyPath: hitAnimationCurve.m_Curve.Array.data[1].value
value: 1 value: 0.9902308
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
@ -1111,7 +1121,7 @@ PrefabInstance:
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].inSlope propertyPath: hitAnimationCurve.m_Curve.Array.data[0].inSlope
value: 2.4237015 value: 2.6033537
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
@ -1121,7 +1131,7 @@ PrefabInstance:
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].outSlope propertyPath: hitAnimationCurve.m_Curve.Array.data[0].outSlope
value: 2.4237015 value: 2.6033537
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
@ -1156,7 +1166,7 @@ PrefabInstance:
- 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.2652609
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3} type: 3}
@ -1878,6 +1888,7 @@ MonoBehaviour:
resultManager: {fileID: 5034752974072861423} resultManager: {fileID: 5034752974072861423}
readyObject: {fileID: 978217474} readyObject: {fileID: 978217474}
tutorialPopupObject: {fileID: 7325523898178317160} tutorialPopupObject: {fileID: 7325523898178317160}
resultWaitTime: 1
isDebug: 0 isDebug: 0
--- !u!4 &1870432534 --- !u!4 &1870432534
Transform: Transform:

19
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab
View File

@ -545,6 +545,7 @@ MonoBehaviour:
hitJumpTime: 1 hitJumpTime: 1
hitTime: 1.5 hitTime: 1.5
hitWaitTime: 1 hitWaitTime: 1
hitStopTime: 1
jumpAnimationCurve: jumpAnimationCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
@ -575,15 +576,15 @@ MonoBehaviour:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 1
inSlope: 6.026828 inSlope: 12.27234
outSlope: 6.026828 outSlope: 12.27234
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0 inWeight: 0
outWeight: 0.08312589 outWeight: 0.15086818
- serializedVersion: 3 - serializedVersion: 3
time: 0.30518538 time: 0.5001393
value: 1.9853464 value: 4.010124
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -591,13 +592,13 @@ MonoBehaviour:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 1 time: 1.002533
value: 0 value: 0
inSlope: -2.3362193 inSlope: -17.60592
outSlope: -2.3362193 outSlope: -17.60592
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.05080726 inWeight: 0.0641635
outWeight: 0 outWeight: 0
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2