Skip to content

Commit

Permalink
Added Transition between Cut Scene #1&2
Browse files Browse the repository at this point in the history
  • Loading branch information
be9904 committed May 3, 2022
1 parent 052ea7b commit 05a1fba
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 56 deletions.
100 changes: 59 additions & 41 deletions Assets/Junghoon/Timeline/CutScenes.playable
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ MonoBehaviour:
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 741537879595679796}
m_Duration: 30
m_Duration: 7.000000000000001
m_TimeScale: 1
m_ParentTrack: {fileID: -8889954943142629662}
m_EaseInDuration: 0
Expand Down Expand Up @@ -299,7 +299,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 33
m_Start: 10.01666666666667
m_ClipIn: 0
m_Asset: {fileID: 2549893461110792793}
m_Duration: 2
Expand Down Expand Up @@ -365,7 +365,7 @@ MonoBehaviour:
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 33
m_PreExtrapolationTime: 10.01666666666667
m_DisplayName: Recorded (4)
m_Markers:
m_Objects: []
Expand Down Expand Up @@ -463,7 +463,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 40.666666666666664
m_Start: 17.683333333333355
m_ClipIn: 0
m_Asset: {fileID: -1292293591670102198}
m_Duration: 4.833333333333336
Expand Down Expand Up @@ -997,7 +997,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 34.666666666666664
m_Start: 11.683333333333326
m_ClipIn: 0
m_Asset: {fileID: 1226547308141489374}
m_Duration: 1.6000000000000014
Expand Down Expand Up @@ -1044,11 +1044,11 @@ MonoBehaviour:
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0.18333333333324475
m_PreExtrapolationTime: 34.666666666666664
m_PostExtrapolationTime: 0.1833333333332483
m_PreExtrapolationTime: 11.683333333333326
m_DisplayName: Jump
- m_Version: 1
m_Start: 36.44999999999991
m_Start: 13.466666666666576
m_ClipIn: 0
m_Asset: {fileID: 7951722261234221656}
m_Duration: 1.6000000000000014
Expand Down Expand Up @@ -1122,7 +1122,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 34.666666666666664
m_Start: 11.683333333333326
m_ClipIn: 0
m_Asset: {fileID: 248062358905361220}
m_Duration: 1.6000000000000014
Expand Down Expand Up @@ -1169,11 +1169,11 @@ MonoBehaviour:
m_Recordable: 1
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0.18333333333324475
m_PreExtrapolationTime: 34.666666666666664
m_PostExtrapolationTime: 0.1833333333332483
m_PreExtrapolationTime: 11.683333333333326
m_DisplayName: Jump_1
- m_Version: 1
m_Start: 36.44999999999991
m_Start: 13.466666666666576
m_ClipIn: 0
m_Asset: {fileID: -5235300011759070988}
m_Duration: 1.6
Expand Down Expand Up @@ -1247,7 +1247,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 45.5
m_Start: 22.516666666666698
m_ClipIn: 0
m_Asset: {fileID: 4473825051447909261}
m_Duration: 1.5
Expand Down Expand Up @@ -1313,7 +1313,7 @@ MonoBehaviour:
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 45.5
m_PreExtrapolationTime: 22.516666666666698
m_DisplayName: Jump
m_Markers:
m_Objects: []
Expand Down Expand Up @@ -1391,7 +1391,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 45.5
m_Start: 22.516666666666698
m_ClipIn: 0
m_Asset: {fileID: -1388083322130553270}
m_Duration: 2.5
Expand Down Expand Up @@ -1457,7 +1457,7 @@ MonoBehaviour:
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 45.5
m_PreExtrapolationTime: 22.516666666666698
m_DisplayName: Dolly Cart 7
m_Markers:
m_Objects: []
Expand Down Expand Up @@ -1520,7 +1520,7 @@ MonoBehaviour:
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 3163626505568565836}
m_Duration: 30
m_Duration: 7
m_TimeScale: 1
m_ParentTrack: {fileID: -3171054699579202123}
m_EaseInDuration: 0
Expand Down Expand Up @@ -1613,13 +1613,13 @@ MonoBehaviour:
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 6545112394356025077}
m_Duration: 30
m_Duration: 7
m_TimeScale: 1
m_ParentTrack: {fileID: -2948360435840705640}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: 0.01666666666666572
m_BlendOutDuration: 2
m_MixInCurve:
serializedVersion: 2
m_Curve:
Expand Down Expand Up @@ -1661,15 +1661,15 @@ MonoBehaviour:
m_PreExtrapolationTime: 0
m_DisplayName: CM vcam1
- m_Version: 1
m_Start: 34.666666666666664
m_Start: 11.683333333333326
m_ClipIn: 0
m_Asset: {fileID: -3331218930398077038}
m_Duration: 4
m_TimeScale: 1
m_ParentTrack: {fileID: -2948360435840705640}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendInDuration: 0
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
Expand All @@ -1694,19 +1694,37 @@ MonoBehaviour:
m_PreExtrapolationTime: 0
m_DisplayName: CM vcam4
- m_Version: 1
m_Start: 29.983333333333334
m_Start: 5
m_ClipIn: 0
m_Asset: {fileID: 3740746112772053127}
m_Duration: 3.0166666666666657
m_Duration: 5.016666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2948360435840705640}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0.01666666666666572
m_BlendInDuration: 2
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
Expand All @@ -1727,7 +1745,7 @@ MonoBehaviour:
m_PreExtrapolationTime: 0
m_DisplayName: CM vcam2
- m_Version: 1
m_Start: 38.666666666666664
m_Start: 15.68333333333334
m_ClipIn: 0
m_Asset: {fileID: -7894206277694731101}
m_Duration: 2
Expand Down Expand Up @@ -1796,7 +1814,7 @@ MonoBehaviour:
m_PreExtrapolationTime: 0
m_DisplayName: CM vcam5
- m_Version: 1
m_Start: 33
m_Start: 10.01666666666667
m_ClipIn: 0
m_Asset: {fileID: 5671742497361459627}
m_Duration: 1.6666666666666643
Expand All @@ -1805,7 +1823,7 @@ MonoBehaviour:
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve: []
Expand All @@ -1829,7 +1847,7 @@ MonoBehaviour:
m_PreExtrapolationTime: 0
m_DisplayName: CM vcam3
- m_Version: 1
m_Start: 40.666666666666664
m_Start: 17.683333333333355
m_ClipIn: 0
m_Asset: {fileID: 7010952136795444331}
m_Duration: 4.833333333333336
Expand Down Expand Up @@ -1898,7 +1916,7 @@ MonoBehaviour:
m_PreExtrapolationTime: 0
m_DisplayName: CM vcam6
- m_Version: 1
m_Start: 45.5
m_Start: 22.516666666666698
m_ClipIn: 0
m_Asset: {fileID: -8367387177730755245}
m_Duration: 4.5
Expand Down Expand Up @@ -2024,7 +2042,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 34.666666666666664
m_Start: 11.683333333333326
m_ClipIn: 0
m_Asset: {fileID: 8941553730320455294}
m_Duration: 4
Expand Down Expand Up @@ -2464,7 +2482,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 33
m_Start: 10.01666666666667
m_ClipIn: 0
m_Asset: {fileID: 151871572142576053}
m_Duration: 2
Expand Down Expand Up @@ -2530,7 +2548,7 @@ MonoBehaviour:
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 33
m_PreExtrapolationTime: 10.01666666666667
m_DisplayName: Run
m_Markers:
m_Objects: []
Expand Down Expand Up @@ -2618,7 +2636,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 30
m_Start: 7.016666666666667
m_ClipIn: 0
m_Asset: {fileID: -7885517324199251451}
m_Duration: 3
Expand Down Expand Up @@ -2684,7 +2702,7 @@ MonoBehaviour:
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 30
m_PreExtrapolationTime: 7.016666666666667
m_DisplayName: Recorded (3)
m_Markers:
m_Objects: []
Expand Down Expand Up @@ -2864,7 +2882,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 34.666666666666664
m_Start: 11.683333333333326
m_ClipIn: 0
m_Asset: {fileID: 1488312028745348035}
m_Duration: 3.38333333333334
Expand Down Expand Up @@ -2930,7 +2948,7 @@ MonoBehaviour:
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 34.666666666666664
m_PreExtrapolationTime: 11.683333333333326
m_DisplayName: DollyCart2_Path
m_Markers:
m_Objects: []
Expand Down Expand Up @@ -2996,7 +3014,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 45.5
m_Start: 22.516666666666698
m_ClipIn: 0
m_Asset: {fileID: -5143661460875127349}
m_Duration: 2.5
Expand Down Expand Up @@ -3111,7 +3129,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 33
m_Start: 10.01666666666667
m_ClipIn: 0
m_Asset: {fileID: -7683715385398008350}
m_Duration: 1.6666666666666643
Expand Down Expand Up @@ -3368,7 +3386,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 45.5
m_Start: 22.516666666666698
m_ClipIn: 0
m_Asset: {fileID: -7323408987613241063}
m_Duration: 1.5
Expand Down Expand Up @@ -3434,7 +3452,7 @@ MonoBehaviour:
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 45.5
m_PreExtrapolationTime: 22.516666666666698
m_DisplayName: Recorded (6)
m_Markers:
m_Objects: []
Expand Down
Loading

0 comments on commit 05a1fba

Please sign in to comment.