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

This commit is contained in:
koya_15 2021-11-25 14:11:52 +09:00
commit 5ef9012f89
19 changed files with 160 additions and 646 deletions

View File

@ -98,51 +98,6 @@ AnimationClip:
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 6.8333335
value: {x: 0, y: 0, z: 9.665001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 7.5833335
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 8.333333
value: {x: 0, y: 0, z: 9.665001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 9.083333
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 9.866667
value: {x: 0, y: 0, z: 9.665001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 10.616667
value: {x: 0, y: 0, z: 0}
@ -242,69 +197,6 @@ AnimationClip:
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 18.766666
value: {x: 0, y: 0, z: 9.665001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 19.516666
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 20.266666
value: {x: 0, y: 0, z: 9.665001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 21.016666
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 21.816668
value: {x: 0, y: 0, z: 9.665001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 22.566668
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 23.316668
value: {x: 0, y: 0, z: 9.665001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 24.066668
value: {x: 0, y: 0, z: 0}
@ -828,132 +720,132 @@ AnimationClip:
time: 10.483334
value: {x: -1.63, y: -1.3857709, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0.46578944, y: 0, z: 0}
outSlope: {x: 0.48698813, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 10.533334
value: {x: -1.6067104, y: -1.3857709, z: 0}
inSlope: {x: 0.46578944, y: -0, z: 0}
outSlope: {x: 0.46578944, y: 0.40207607, z: 0}
value: {x: -1.6056504, y: -1.3857709, z: 0}
inSlope: {x: 0.48698813, y: -0, z: 0}
outSlope: {x: 0.48698813, y: 0.40207607, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 1, z: 0.33333334}
- serializedVersion: 3
time: 11.116667
value: {x: -1.335, y: -1.2895095, z: 0}
inSlope: {x: 0.46578944, y: 0, z: 0}
outSlope: {x: 0.46578944, y: 0, z: 0}
value: {x: -1.3215742, y: -1.2895095, z: 0}
inSlope: {x: 0.48698813, y: 0, z: 0}
outSlope: {x: 0.48698813, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 11.666667
value: {x: -1.0788158, y: -1.3857709, z: 0}
inSlope: {x: 0.46578944, y: -0.45704922, z: 0}
outSlope: {x: 0.46578944, y: 0.48019025, z: 0}
value: {x: -1.0537306, y: -1.3857709, z: 0}
inSlope: {x: 0.4869881, y: -0.45704922, z: 0}
outSlope: {x: 0.4869881, y: 0.48019025, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 1, z: 0.33333334}
outWeight: {x: 0.33333334, y: 1, z: 0.33333334}
- serializedVersion: 3
time: 12.266666
value: {x: -0.79934233, y: -1.2895095, z: 0}
inSlope: {x: 0.4657895, y: 0, z: 0}
outSlope: {x: 0.4657895, y: 0, z: 0}
value: {x: -0.761538, y: -1.2895095, z: 0}
inSlope: {x: 0.48698816, y: 0, z: 0}
outSlope: {x: 0.48698816, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 12.883333
value: {x: -0.51210535, y: -1.3857709, z: 0}
inSlope: {x: 0.46578947, y: -0.42741594, z: 0}
outSlope: {x: 0.46578947, y: 0.46260262, z: 0}
value: {x: -0.46122858, y: -1.3857709, z: 0}
inSlope: {x: 0.4869881, y: -0.42741594, z: 0}
outSlope: {x: 0.4869881, y: 0.46260262, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 1, z: 0.33333334}
outWeight: {x: 0.33333334, y: 1, z: 0.33333334}
- serializedVersion: 3
time: 13.45
value: {x: -0.24815804, y: -1.2895095, z: 0}
inSlope: {x: 0.4657894, y: 0, z: 0}
outSlope: {x: 0.4657894, y: 0, z: 0}
value: {x: -0.18526873, y: -1.2895095, z: 0}
inSlope: {x: 0.48698813, y: 0, z: 0}
outSlope: {x: 0.48698813, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 14.083333
value: {x: 0.0468419, y: -1.3857709, z: 0}
inSlope: {x: 0.46578938, y: -0.42727038, z: 0}
outSlope: {x: 0.46578938, y: 0.13431811, z: 0}
value: {x: 0.12315704, y: -1.3857709, z: 0}
inSlope: {x: 0.4869881, y: -0.42727038, z: 0}
outSlope: {x: 0.4869881, y: 0.13431811, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 1, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 14.8
value: {x: 0.38065785, y: -1.2895095, z: 0}
inSlope: {x: 0.4657894, y: 0, z: 0}
outSlope: {x: 0.4657894, y: 0, z: 0}
value: {x: 0.47216547, y: -1.2895095, z: 0}
inSlope: {x: 0.48698813, y: 0, z: 0}
outSlope: {x: 0.48698813, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 15.433333
value: {x: 0.67565775, y: -1.3857709, z: 0}
inSlope: {x: 0.46578944, y: -0.42727038, z: 0}
outSlope: {x: 0.46578944, y: 0.1375163, z: 0}
value: {x: 0.7805912, y: -1.3857709, z: 0}
inSlope: {x: 0.48698813, y: -0.42727038, z: 0}
outSlope: {x: 0.48698813, y: 0.1375163, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 1, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 16.133333
value: {x: 1.0017103, y: -1.2895095, z: 0}
inSlope: {x: 0.46578938, y: 0, z: 0}
outSlope: {x: 0.46578938, y: 0, z: 0}
value: {x: 1.1214827, y: -1.2895095, z: 0}
inSlope: {x: 0.48698816, y: 0, z: 0}
outSlope: {x: 0.48698816, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 16.766666
value: {x: 1.2967101, y: -1.3857709, z: 0}
inSlope: {x: 0.46578947, y: -0.42727038, z: 0}
outSlope: {x: 0.46578947, y: 0.14809452, z: 0}
value: {x: 1.4299085, y: -1.3857709, z: 0}
inSlope: {x: 0.48698828, y: -0.42727038, z: 0}
outSlope: {x: 0.48698828, y: 0.14809452, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 1, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 17.416666
value: {x: 1.599473, y: -1.2895095, z: 0}
inSlope: {x: 0.46578944, y: 0, z: 0}
outSlope: {x: 0.46578944, y: 0, z: 0}
value: {x: 1.7464507, y: -1.2895095, z: 0}
inSlope: {x: 0.48698834, y: 0, z: 0}
outSlope: {x: 0.48698834, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 18.05
value: {x: 1.894473, y: -1.3857709, z: 0}
inSlope: {x: 0.46578956, y: -0.42663288, z: 0}
outSlope: {x: 0.46578956, y: 0, z: 0}
value: {x: 2.0548763, y: -1.3857709, z: 0}
inSlope: {x: 0.4869882, y: -0.42663288, z: 0}
outSlope: {x: 0.4869882, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.58812106, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 18.083334
value: {x: 1.91, y: -1.3857709, z: 0}
inSlope: {x: 0.46578944, y: 0, z: 0}
value: {x: 2.07111, y: -1.3857709, z: 0}
inSlope: {x: 0.48698813, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -961,90 +853,90 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 24.116667
value: {x: 1.91, y: -1.3857709, z: 0}
value: {x: 2.0703318, y: -1.3857709, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: -0.3220339, y: 0, z: 0}
outSlope: {x: -0.3492088, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 24.166666
value: {x: 1.8938986, y: -1.3857709, z: 0}
inSlope: {x: -0.3220339, y: -0, z: 0}
outSlope: {x: -0.3220339, y: 0.35574216, z: 0}
value: {x: 2.0528717, y: -1.3857709, z: 0}
inSlope: {x: -0.34920877, y: -0, z: 0}
outSlope: {x: -0.34920877, y: 0.35574216, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 1, z: 0.33333334}
- serializedVersion: 3
time: 24.85
value: {x: 1.6738416, y: -1.2895095, z: 0}
inSlope: {x: -0.32203388, y: 0, z: 0}
outSlope: {x: -0.32203388, y: 0, z: 0}
value: {x: 1.8142453, y: -1.2895095, z: 0}
inSlope: {x: -0.34920877, y: 0, z: 0}
outSlope: {x: -0.34920877, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 25.5
value: {x: 1.4645197, y: -1.3857709, z: 0}
inSlope: {x: -0.32203388, y: -0.38096142, z: 0}
outSlope: {x: -0.32203388, y: 0.32628214, z: 0}
value: {x: 1.5872599, y: -1.3857709, z: 0}
inSlope: {x: -0.34920883, y: -0.38096142, z: 0}
outSlope: {x: -0.34920883, y: 0.32628214, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 1, z: 0.33333334}
outWeight: {x: 0.33333334, y: 1, z: 0.33333334}
- serializedVersion: 3
time: 26.183332
value: {x: 1.2444634, y: -1.2895095, z: 0}
inSlope: {x: -0.3220339, y: 0, z: 0}
outSlope: {x: -0.3220339, y: 0, z: 0}
value: {x: 1.3486341, y: -1.2895095, z: 0}
inSlope: {x: -0.34920886, y: 0, z: 0}
outSlope: {x: -0.34920886, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 26.85
value: {x: 1.0297738, y: -1.3842603, z: 0}
inSlope: {x: -0.32203385, y: -0.36938092, z: 0}
outSlope: {x: -0.32203385, y: 0.14212628, z: 0}
value: {x: 1.1158277, y: -1.3842603, z: 0}
inSlope: {x: -0.34920883, y: -0.36938092, z: 0}
outSlope: {x: -0.34920883, y: 0.14212628, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 1, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 27.516666
value: {x: 0.8150849, y: -1.2895095, z: 0}
inSlope: {x: -0.32203388, y: 0, z: 0}
outSlope: {x: -0.32203388, y: 0, z: 0}
value: {x: 0.883022, y: -1.2895095, z: 0}
inSlope: {x: -0.34920877, y: 0, z: 0}
outSlope: {x: -0.34920877, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 28.433332
value: {x: 0.51988727, y: -1.3842603, z: 0}
inSlope: {x: -0.32203394, y: -0.22067851, z: 0}
outSlope: {x: -0.32203394, y: 0.109327786, z: 0}
value: {x: 0.56291413, y: -1.3842603, z: 0}
inSlope: {x: -0.34920883, y: -0.22067851, z: 0}
outSlope: {x: -0.34920883, y: 0.109327786, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.31127536, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 29.3
value: {x: 0.24079114, y: -1.2895095, z: 0}
inSlope: {x: -0.32203394, y: 0, z: 0}
outSlope: {x: -0.32203394, y: 0, z: 0}
value: {x: 0.26026645, y: -1.2895095, z: 0}
inSlope: {x: -0.34920874, y: 0, z: 0}
outSlope: {x: -0.34920874, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 29.983334
value: {x: 0.020734297, y: -1.3842603, z: 0}
inSlope: {x: -0.32203397, y: -0.36938092, z: 0}
outSlope: {x: -0.32203397, y: 0, z: 0}
value: {x: 0.021640114, y: -1.3842603, z: 0}
inSlope: {x: -0.3492088, y: -0.36938092, z: 0}
outSlope: {x: -0.3492088, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 1, z: 0.33333334}
@ -1052,7 +944,7 @@ AnimationClip:
- serializedVersion: 3
time: 30.016666
value: {x: 0.01, y: -1.3842603, z: 0}
inSlope: {x: -0.3220339, y: 0, z: 0}
inSlope: {x: -0.3492088, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -1075,6 +967,15 @@ AnimationClip:
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.45
value: {x: 1, y: 1, z: 1}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 6
value: {x: -1, y: 1, z: 1}
@ -1280,15 +1181,15 @@ AnimationClip:
time: 10.483334
value: -1.63
inSlope: 0
outSlope: 0.46578944
outSlope: 0.48698813
tangentMode: 65
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 18.083334
value: 1.91
inSlope: 0.46578944
value: 2.07111
inSlope: 0.48698813
outSlope: 0
tangentMode: 5
weightedMode: 0
@ -1296,9 +1197,9 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 24.116667
value: 1.91
value: 2.0703318
inSlope: 0
outSlope: -0.3220339
outSlope: -0.3492088
tangentMode: 65
weightedMode: 0
inWeight: 0.33333334
@ -1306,7 +1207,7 @@ AnimationClip:
- serializedVersion: 3
time: 30.016666
value: 0.01
inSlope: -0.3220339
inSlope: -0.3492088
outSlope: 0
tangentMode: 5
weightedMode: 0
@ -1648,6 +1549,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.45
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 6
value: -1
@ -1679,30 +1589,12 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
inSlope: 0.16284035
outSlope: 0.16284035
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 10.483334
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 18.133333
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
outWeight: 0.34163564
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -1722,6 +1614,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.45
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 10.483334
value: 1
@ -1831,51 +1732,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 6.8333335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 7.5833335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 8.333333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9.083333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9.866667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 10.616667
value: 0
@ -1975,69 +1831,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 18.766666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 19.516666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20.266666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 21.016666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 21.816668
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 22.566668
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 23.316668
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 24.066668
value: 0
@ -2210,51 +2003,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 6.8333335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 7.5833335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 8.333333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9.083333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9.866667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 10.616667
value: 0
@ -2354,69 +2102,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 18.766666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 19.516666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20.266666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 21.016666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 21.816668
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 22.566668
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 23.316668
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 24.066668
value: 0
@ -2589,51 +2274,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 6.8333335
value: 9.665001
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 7.5833335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 8.333333
value: 9.665001
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9.083333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9.866667
value: 9.665001
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 10.616667
value: 0
@ -2733,69 +2373,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 18.766666
value: 9.665001
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 19.516666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20.266666
value: 9.665001
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 21.016666
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 21.816668
value: 9.665001
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 22.566668
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 23.316668
value: 9.665001
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 24.066668
value: 0
@ -3383,6 +2960,36 @@ AnimationClip:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: AnimationPivot_Blue
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: AnimationPivot_Blue
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_Blue
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
@ -3413,36 +3020,6 @@ AnimationClip:
path: AnimationPivot_Blue/Blue_side/body/wing
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_Blue
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: AnimationPivot_Blue
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: AnimationPivot_Blue
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -237,34 +237,6 @@ AnimationClip:
path: AnimationPivot_Blue/Blue/wing/right
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: AnimationPivot_Blue/Blue/pt_sweat
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -322,13 +294,6 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 808224845
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -861,34 +826,6 @@ AnimationClip:
path: AnimationPivot_Blue/Blue/wing/armPivot/left_mat_p/left_c_p
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: AnimationPivot_Blue/Blue/pt_sweat
classID: 1
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@ -43,8 +43,8 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
alignment: 9
spritePivot: {x: 0.5284252, y: 0.123329334}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 306 B

After

Width:  |  Height:  |  Size: 326 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 20f234410596cf94abfb8b9bd374cc55
guid: e320f3bdbab594f20b08ed09eb3878dc
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -43,8 +43,8 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
spritePivot: {x: 0.30221057, y: 0.64204866}
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 662 B

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d4f112c5cfbac4c1188430ee3d4b16a7
guid: 3bbc1abea1c7a40799d7c82a60db2117
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -44,7 +44,7 @@ TextureImporter:
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
spritePivot: {x: 0.61779994, y: 0.1449304}
spritePivot: {x: 0.558379, y: 0.91987306}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 850 B

After

Width:  |  Height:  |  Size: 760 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 905 B

After

Width:  |  Height:  |  Size: 791 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -2497,7 +2497,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 587050839}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.05, y: 0.19, z: 0}
m_LocalPosition: {x: 0.118, y: 0.248, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1235629313}
@ -3283,7 +3283,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -1
m_Sprite: {fileID: 21300000, guid: f41501d5d7bea134b8892fd70d5513e5, type: 3}
m_Sprite: {fileID: 21300000, guid: 3bbc1abea1c7a40799d7c82a60db2117, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -5171,7 +5171,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -1
m_Sprite: {fileID: 21300000, guid: f41501d5d7bea134b8892fd70d5513e5, type: 3}
m_Sprite: {fileID: 21300000, guid: 3bbc1abea1c7a40799d7c82a60db2117, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -6919,7 +6919,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1458272044}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.3189999, y: 0.6500001, z: 0}
m_LocalPosition: {x: -0.274, y: 0.712, z: 0}
m_LocalScale: {x: 0.96, y: 0.96, z: 0.96}
m_Children: []
m_Father: {fileID: 2060497885}
@ -7081,7 +7081,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1482578686}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.61699986, y: 0.45300007, z: 0}
m_LocalPosition: {x: -0.5910001, y: 0.54400057, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2060497885}
@ -7709,7 +7709,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1572682802}
m_LocalRotation: {x: -0, y: -0, z: -0.039303184, w: 0.99922734}
m_LocalPosition: {x: -0.68, y: 0.68, z: 0}
m_LocalPosition: {x: -0.60600007, y: 0.7380006, z: 0}
m_LocalScale: {x: 0.94586, y: 0.94586, z: 0.94586}
m_Children: []
m_Father: {fileID: 2060497885}
@ -7754,7 +7754,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_Sprite: {fileID: 21300000, guid: 0d6139da7edf2437fa5f973e98845a04, type: 3}
m_Sprite: {fileID: 21300000, guid: e320f3bdbab594f20b08ed09eb3878dc, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -13755,7 +13755,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1853804041}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.587, y: 0.23499982, z: 0}
m_LocalPosition: {x: -0.5660001, y: 0.29300058, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2060497885}
@ -19170,8 +19170,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2060497884}
m_LocalRotation: {x: -0, y: -0, z: 0.046319325, w: 0.9989267}
m_LocalPosition: {x: -0.27, y: 0.47535, z: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.459, y: 0.504, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1458272045}
@ -19180,7 +19180,7 @@ Transform:
- {fileID: 1853804042}
m_Father: {fileID: 1235629313}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5.3100004}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2060497886
SpriteRenderer:
m_ObjectHideFlags: 0
@ -19220,12 +19220,12 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: d4f112c5cfbac4c1188430ee3d4b16a7, type: 3}
m_Sprite: {fileID: 21300000, guid: 1469e19643eca475fb86f031fe9ae33b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.69, y: 2.02}
m_Size: {x: 1.65, y: 1.93}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1

View File

@ -68,7 +68,7 @@ public class CoinManager : SingletonMonoBehaviour<CoinManager>
animator.SetTrigger("Effect");
Destroy(coinEffect.gameObject, 1f);
VibrationManager.Instance.PlayVibrationOnceWeak();
// coinAnimator.SetTrigger(Add);
coinAnimator.SetTrigger(Add);
SoundManager.Instance.PlaySE("se_coin_get");
callback.Invoke();
});