Skip to content

Commit 98d926a

Browse files
committed
removed line pause in slime cutscene
1 parent c8733ea commit 98d926a

File tree

1 file changed

+112
-3
lines changed

1 file changed

+112
-3
lines changed

UOP1_Project/Assets/Cutscenes/SlimeCutscene.playable

Lines changed: 112 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,6 +1468,7 @@ MonoBehaviour:
14681468
- {fileID: -4781373265151696709}
14691469
- {fileID: 8623983768566080694}
14701470
- {fileID: -8252454850177622074}
1471+
- {fileID: 8605054197981787267}
14711472
m_FixedDuration: 0
14721473
m_EditorSettings:
14731474
m_Framerate: 60
@@ -3373,13 +3374,26 @@ MonoBehaviour:
33733374
m_FallbackState: 0
33743375
m_WaitForCompletion: 1
33753376
_actor: {fileID: 11400000, guid: 5e7bd0eed8324794fad1bc460c565ecb, type: 2}
3376-
_pauseWhenClipEnds: 1
3377+
_pauseWhenClipEnds: 0
33773378
PlayDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890,
33783379
type: 2}
33793380
PauseTimelineEvent: {fileID: 11400000, guid: 9b0fb5f181adc6b4ca020743fed6c020,
33803381
type: 2}
3382+
LineEndedEvent: {fileID: 11400000, guid: 8c589a71a937d334db35937f7b5bb25e, type: 2}
33813383
PlayDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890, type: 2}
33823384
PauseTimelineEvent: {fileID: 11400000, guid: 9b0fb5f181adc6b4ca020743fed6c020, type: 2}
3385+
--- !u!114 &4748985203498078323
3386+
MonoBehaviour:
3387+
m_ObjectHideFlags: 1
3388+
m_CorrespondingSourceObject: {fileID: 0}
3389+
m_PrefabInstance: {fileID: 0}
3390+
m_PrefabAsset: {fileID: 0}
3391+
m_GameObject: {fileID: 0}
3392+
m_Enabled: 1
3393+
m_EditorHideFlags: 0
3394+
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
3395+
m_Name: ActivationPlayableAsset
3396+
m_EditorClassIdentifier:
33833397
--- !u!114 &4975237270803982258
33843398
MonoBehaviour:
33853399
m_ObjectHideFlags: 1
@@ -3469,11 +3483,12 @@ MonoBehaviour:
34693483
m_FallbackState: 0
34703484
m_WaitForCompletion: 1
34713485
_actor: {fileID: 11400000, guid: c7902af5c8e25244f94914ce51e7ea8a, type: 2}
3472-
_pauseWhenClipEnds: 1
3486+
_pauseWhenClipEnds: 0
34733487
PlayDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890,
34743488
type: 2}
34753489
PauseTimelineEvent: {fileID: 11400000, guid: 9b0fb5f181adc6b4ca020743fed6c020,
34763490
type: 2}
3491+
LineEndedEvent: {fileID: 11400000, guid: 8c589a71a937d334db35937f7b5bb25e, type: 2}
34773492
PlayDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890, type: 2}
34783493
PauseTimelineEvent: {fileID: 11400000, guid: 9b0fb5f181adc6b4ca020743fed6c020, type: 2}
34793494
--- !u!114 &6430277986421153465
@@ -3722,11 +3737,12 @@ MonoBehaviour:
37223737
m_FallbackState: 0
37233738
m_WaitForCompletion: 1
37243739
_actor: {fileID: 11400000, guid: 5e7bd0eed8324794fad1bc460c565ecb, type: 2}
3725-
_pauseWhenClipEnds: 1
3740+
_pauseWhenClipEnds: 0
37263741
PlayDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890,
37273742
type: 2}
37283743
PauseTimelineEvent: {fileID: 11400000, guid: 9b0fb5f181adc6b4ca020743fed6c020,
37293744
type: 2}
3745+
LineEndedEvent: {fileID: 11400000, guid: 8c589a71a937d334db35937f7b5bb25e, type: 2}
37303746
PlayDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890, type: 2}
37313747
PauseTimelineEvent: {fileID: 11400000, guid: 9b0fb5f181adc6b4ca020743fed6c020, type: 2}
37323748
--- !u!114 &7429157680253568946
@@ -4334,6 +4350,99 @@ MonoBehaviour:
43344350
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
43354351
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
43364352
m_ApplyOffsets: 0
4353+
--- !u!114 &8605054197981787267
4354+
MonoBehaviour:
4355+
m_ObjectHideFlags: 1
4356+
m_CorrespondingSourceObject: {fileID: 0}
4357+
m_PrefabInstance: {fileID: 0}
4358+
m_PrefabAsset: {fileID: 0}
4359+
m_GameObject: {fileID: 0}
4360+
m_Enabled: 1
4361+
m_EditorHideFlags: 0
4362+
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
4363+
m_Name: Activation Track (6)
4364+
m_EditorClassIdentifier:
4365+
m_Version: 3
4366+
m_AnimClip: {fileID: 0}
4367+
m_Locked: 0
4368+
m_Muted: 0
4369+
m_CustomPlayableFullTypename:
4370+
m_Curves: {fileID: 0}
4371+
m_Parent: {fileID: 11400000}
4372+
m_Children: []
4373+
m_Clips:
4374+
- m_Version: 1
4375+
m_Start: 25.683333333333334
4376+
m_ClipIn: 0
4377+
m_Asset: {fileID: 4748985203498078323}
4378+
m_Duration: 0.4333333333333407
4379+
m_TimeScale: 1
4380+
m_ParentTrack: {fileID: 8605054197981787267}
4381+
m_EaseInDuration: 0
4382+
m_EaseOutDuration: 0
4383+
m_BlendInDuration: 0
4384+
m_BlendOutDuration: 0
4385+
m_MixInCurve:
4386+
serializedVersion: 2
4387+
m_Curve:
4388+
- serializedVersion: 3
4389+
time: 0
4390+
value: 0
4391+
inSlope: 0
4392+
outSlope: 0
4393+
tangentMode: 0
4394+
weightedMode: 0
4395+
inWeight: 0
4396+
outWeight: 0
4397+
- serializedVersion: 3
4398+
time: 1
4399+
value: 1
4400+
inSlope: 0
4401+
outSlope: 0
4402+
tangentMode: 0
4403+
weightedMode: 0
4404+
inWeight: 0
4405+
outWeight: 0
4406+
m_PreInfinity: 2
4407+
m_PostInfinity: 2
4408+
m_RotationOrder: 4
4409+
m_MixOutCurve:
4410+
serializedVersion: 2
4411+
m_Curve:
4412+
- serializedVersion: 3
4413+
time: 0
4414+
value: 1
4415+
inSlope: 0
4416+
outSlope: 0
4417+
tangentMode: 0
4418+
weightedMode: 0
4419+
inWeight: 0
4420+
outWeight: 0
4421+
- serializedVersion: 3
4422+
time: 1
4423+
value: 0
4424+
inSlope: 0
4425+
outSlope: 0
4426+
tangentMode: 0
4427+
weightedMode: 0
4428+
inWeight: 0
4429+
outWeight: 0
4430+
m_PreInfinity: 2
4431+
m_PostInfinity: 2
4432+
m_RotationOrder: 4
4433+
m_BlendInCurveMode: 0
4434+
m_BlendOutCurveMode: 0
4435+
m_ExposedParameterNames: []
4436+
m_AnimationCurves: {fileID: 0}
4437+
m_Recordable: 0
4438+
m_PostExtrapolationMode: 0
4439+
m_PreExtrapolationMode: 0
4440+
m_PostExtrapolationTime: 0
4441+
m_PreExtrapolationTime: 0
4442+
m_DisplayName: Active
4443+
m_Markers:
4444+
m_Objects: []
4445+
m_PostPlaybackState: 3
43374446
--- !u!114 &8623983768566080694
43384447
MonoBehaviour:
43394448
m_ObjectHideFlags: 1

0 commit comments

Comments
 (0)