Skip to content

Commit 117823e

Browse files
committed
Tweaking talking animation transition in cutscene
1 parent f2c9f21 commit 117823e

File tree

2 files changed

+267
-379
lines changed

2 files changed

+267
-379
lines changed

UOP1_Project/Assets/Cutscenes/BeachCandyCutscene.playable

Lines changed: 38 additions & 182 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,25 @@ MonoBehaviour:
490490
m_RotationOrder: 4
491491
m_MixOutCurve:
492492
serializedVersion: 2
493-
m_Curve: []
493+
m_Curve:
494+
- serializedVersion: 3
495+
time: 0
496+
value: 1
497+
inSlope: 0
498+
outSlope: 0
499+
tangentMode: 0
500+
weightedMode: 0
501+
inWeight: 0
502+
outWeight: 0
503+
- serializedVersion: 3
504+
time: 1
505+
value: 0
506+
inSlope: 0
507+
outSlope: 0
508+
tangentMode: 0
509+
weightedMode: 0
510+
inWeight: 0
511+
outWeight: 0
494512
m_PreInfinity: 2
495513
m_PostInfinity: 2
496514
m_RotationOrder: 4
@@ -5673,25 +5691,7 @@ MonoBehaviour:
56735691
m_BlendOutDuration: -1
56745692
m_MixInCurve:
56755693
serializedVersion: 2
5676-
m_Curve:
5677-
- serializedVersion: 3
5678-
time: 0
5679-
value: 0
5680-
inSlope: 0
5681-
outSlope: 0
5682-
tangentMode: 0
5683-
weightedMode: 0
5684-
inWeight: 0
5685-
outWeight: 0
5686-
- serializedVersion: 3
5687-
time: 1
5688-
value: 1
5689-
inSlope: 0
5690-
outSlope: 0
5691-
tangentMode: 0
5692-
weightedMode: 0
5693-
inWeight: 0
5694-
outWeight: 0
5694+
m_Curve: []
56955695
m_PreInfinity: 2
56965696
m_PostInfinity: 2
56975697
m_RotationOrder: 4
@@ -5724,49 +5724,13 @@ MonoBehaviour:
57245724
m_BlendOutDuration: 0.4499999999999993
57255725
m_MixInCurve:
57265726
serializedVersion: 2
5727-
m_Curve:
5728-
- serializedVersion: 3
5729-
time: 0
5730-
value: 0
5731-
inSlope: 0
5732-
outSlope: 0
5733-
tangentMode: 0
5734-
weightedMode: 0
5735-
inWeight: 0
5736-
outWeight: 0
5737-
- serializedVersion: 3
5738-
time: 1
5739-
value: 1
5740-
inSlope: 0
5741-
outSlope: 0
5742-
tangentMode: 0
5743-
weightedMode: 0
5744-
inWeight: 0
5745-
outWeight: 0
5727+
m_Curve: []
57465728
m_PreInfinity: 2
57475729
m_PostInfinity: 2
57485730
m_RotationOrder: 4
57495731
m_MixOutCurve:
57505732
serializedVersion: 2
5751-
m_Curve:
5752-
- serializedVersion: 3
5753-
time: 0
5754-
value: 1
5755-
inSlope: 0
5756-
outSlope: 0
5757-
tangentMode: 0
5758-
weightedMode: 0
5759-
inWeight: 0
5760-
outWeight: 0
5761-
- serializedVersion: 3
5762-
time: 1
5763-
value: 0
5764-
inSlope: 0
5765-
outSlope: 0
5766-
tangentMode: 0
5767-
weightedMode: 0
5768-
inWeight: 0
5769-
outWeight: 0
5733+
m_Curve: []
57705734
m_PreInfinity: 2
57715735
m_PostInfinity: 2
57725736
m_RotationOrder: 4
@@ -5883,13 +5847,13 @@ MonoBehaviour:
58835847
m_Start: 41.38915867681304
58845848
m_ClipIn: 2.460841323186955
58855849
m_Asset: {fileID: -7702104329539321804}
5886-
m_Duration: 5.367964441111937
5850+
m_Duration: 5.1775079898536305
58875851
m_TimeScale: 1
58885852
m_ParentTrack: {fileID: 7559771162917017948}
58895853
m_EaseInDuration: 0
58905854
m_EaseOutDuration: 0
58915855
m_BlendInDuration: 0.7608413231869591
5892-
m_BlendOutDuration: -1
5856+
m_BlendOutDuration: 0.6666666666666714
58935857
m_MixInCurve:
58945858
serializedVersion: 2
58955859
m_Curve: []
@@ -5898,25 +5862,7 @@ MonoBehaviour:
58985862
m_RotationOrder: 4
58995863
m_MixOutCurve:
59005864
serializedVersion: 2
5901-
m_Curve:
5902-
- serializedVersion: 3
5903-
time: 0
5904-
value: 1
5905-
inSlope: 0
5906-
outSlope: 0
5907-
tangentMode: 0
5908-
weightedMode: 0
5909-
inWeight: 0
5910-
outWeight: 0
5911-
- serializedVersion: 3
5912-
time: 1
5913-
value: 0
5914-
inSlope: 0
5915-
outSlope: 0
5916-
tangentMode: 0
5917-
weightedMode: 0
5918-
inWeight: 0
5919-
outWeight: 0
5865+
m_Curve: []
59205866
m_PreInfinity: 2
59215867
m_PostInfinity: 2
59225868
m_RotationOrder: 4
@@ -5931,16 +5877,16 @@ MonoBehaviour:
59315877
m_PreExtrapolationTime: 0
59325878
m_DisplayName: talk2
59335879
- m_Version: 1
5934-
m_Start: 46.757123117924976
5880+
m_Start: 45.9
59355881
m_ClipIn: 0
59365882
m_Asset: {fileID: 2257862232280244473}
5937-
m_Duration: 0.8666666666666671
5883+
m_Duration: 1.9166666666666714
59385884
m_TimeScale: 1
59395885
m_ParentTrack: {fileID: 7559771162917017948}
59405886
m_EaseInDuration: 0
59415887
m_EaseOutDuration: 0
5942-
m_BlendInDuration: -1
5943-
m_BlendOutDuration: 0.033333333333338544
5888+
m_BlendInDuration: 0.6666666666666714
5889+
m_BlendOutDuration: 0.3499999999999943
59445890
m_MixInCurve:
59455891
serializedVersion: 2
59465892
m_Curve: []
@@ -5964,15 +5910,15 @@ MonoBehaviour:
59645910
m_PreExtrapolationTime: 0
59655911
m_DisplayName: idle2
59665912
- m_Version: 1
5967-
m_Start: 47.590456451258305
5968-
m_ClipIn: 2.460841323186955
5913+
m_Start: 47.466666666666676
5914+
m_ClipIn: 2.3370515385953254
59695915
m_Asset: {fileID: 2541559721980894165}
5970-
m_Duration: 6.183333333333358
5916+
m_Duration: 6.307123117924988
59715917
m_TimeScale: 1
59725918
m_ParentTrack: {fileID: 7559771162917017948}
59735919
m_EaseInDuration: 0
59745920
m_EaseOutDuration: 0
5975-
m_BlendInDuration: 0.033333333333338544
5921+
m_BlendInDuration: 0.3499999999999943
59765922
m_BlendOutDuration: -1
59775923
m_MixInCurve:
59785924
serializedVersion: 2
@@ -6213,49 +6159,13 @@ MonoBehaviour:
62136159
m_BlendOutDuration: 0.3333333333333357
62146160
m_MixInCurve:
62156161
serializedVersion: 2
6216-
m_Curve:
6217-
- serializedVersion: 3
6218-
time: 0
6219-
value: 0
6220-
inSlope: 0
6221-
outSlope: 0
6222-
tangentMode: 0
6223-
weightedMode: 0
6224-
inWeight: 0
6225-
outWeight: 0
6226-
- serializedVersion: 3
6227-
time: 1
6228-
value: 1
6229-
inSlope: 0
6230-
outSlope: 0
6231-
tangentMode: 0
6232-
weightedMode: 0
6233-
inWeight: 0
6234-
outWeight: 0
6162+
m_Curve: []
62356163
m_PreInfinity: 2
62366164
m_PostInfinity: 2
62376165
m_RotationOrder: 4
62386166
m_MixOutCurve:
62396167
serializedVersion: 2
6240-
m_Curve:
6241-
- serializedVersion: 3
6242-
time: 0
6243-
value: 1
6244-
inSlope: 0
6245-
outSlope: 0
6246-
tangentMode: 0
6247-
weightedMode: 0
6248-
inWeight: 0
6249-
outWeight: 0
6250-
- serializedVersion: 3
6251-
time: 1
6252-
value: 0
6253-
inSlope: 0
6254-
outSlope: 0
6255-
tangentMode: 0
6256-
weightedMode: 0
6257-
inWeight: 0
6258-
outWeight: 0
6168+
m_Curve: []
62596169
m_PreInfinity: 2
62606170
m_PostInfinity: 2
62616171
m_RotationOrder: 4
@@ -6282,49 +6192,13 @@ MonoBehaviour:
62826192
m_BlendOutDuration: 3.033333333333335
62836193
m_MixInCurve:
62846194
serializedVersion: 2
6285-
m_Curve:
6286-
- serializedVersion: 3
6287-
time: 0
6288-
value: 0
6289-
inSlope: 0
6290-
outSlope: 0
6291-
tangentMode: 0
6292-
weightedMode: 0
6293-
inWeight: 0
6294-
outWeight: 0
6295-
- serializedVersion: 3
6296-
time: 1
6297-
value: 1
6298-
inSlope: 0
6299-
outSlope: 0
6300-
tangentMode: 0
6301-
weightedMode: 0
6302-
inWeight: 0
6303-
outWeight: 0
6195+
m_Curve: []
63046196
m_PreInfinity: 2
63056197
m_PostInfinity: 2
63066198
m_RotationOrder: 4
63076199
m_MixOutCurve:
63086200
serializedVersion: 2
6309-
m_Curve:
6310-
- serializedVersion: 3
6311-
time: 0
6312-
value: 1
6313-
inSlope: 0
6314-
outSlope: 0
6315-
tangentMode: 0
6316-
weightedMode: 0
6317-
inWeight: 0
6318-
outWeight: 0
6319-
- serializedVersion: 3
6320-
time: 1
6321-
value: 0
6322-
inSlope: 0
6323-
outSlope: 0
6324-
tangentMode: 0
6325-
weightedMode: 0
6326-
inWeight: 0
6327-
outWeight: 0
6201+
m_Curve: []
63286202
m_PreInfinity: 2
63296203
m_PostInfinity: 2
63306204
m_RotationOrder: 4
@@ -6375,25 +6249,7 @@ MonoBehaviour:
63756249
m_RotationOrder: 4
63766250
m_MixOutCurve:
63776251
serializedVersion: 2
6378-
m_Curve:
6379-
- serializedVersion: 3
6380-
time: 0
6381-
value: 1
6382-
inSlope: 0
6383-
outSlope: 0
6384-
tangentMode: 0
6385-
weightedMode: 0
6386-
inWeight: 0
6387-
outWeight: 0
6388-
- serializedVersion: 3
6389-
time: 1
6390-
value: 0
6391-
inSlope: 0
6392-
outSlope: 0
6393-
tangentMode: 0
6394-
weightedMode: 0
6395-
inWeight: 0
6396-
outWeight: 0
6252+
m_Curve: []
63976253
m_PreInfinity: 2
63986254
m_PostInfinity: 2
63996255
m_RotationOrder: 4

0 commit comments

Comments
 (0)