Skip to content

Commit 8d164eb

Browse files
committed
Merge branch 'main' into worldbuilding
# Conflicts: # UOP1_Project/Assets/Scenes/Locations/Beach.unity
2 parents 4a15355 + b0f48ca commit 8d164eb

File tree

16 files changed

+2626
-2836
lines changed

16 files changed

+2626
-2836
lines changed

UOP1_Project/Assets/Cutscenes/BeachCandyCutscene.playable

Lines changed: 266 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,25 @@ MonoBehaviour:
592592
m_RotationOrder: 4
593593
m_MixOutCurve:
594594
serializedVersion: 2
595-
m_Curve: []
595+
m_Curve:
596+
- serializedVersion: 3
597+
time: 0
598+
value: 1
599+
inSlope: 0
600+
outSlope: 0
601+
tangentMode: 0
602+
weightedMode: 0
603+
inWeight: 0
604+
outWeight: 0
605+
- serializedVersion: 3
606+
time: 1
607+
value: 0
608+
inSlope: 0
609+
outSlope: 0
610+
tangentMode: 0
611+
weightedMode: 0
612+
inWeight: 0
613+
outWeight: 0
596614
m_PreInfinity: 2
597615
m_PostInfinity: 2
598616
m_RotationOrder: 4
@@ -619,7 +637,25 @@ MonoBehaviour:
619637
m_BlendOutDuration: -1
620638
m_MixInCurve:
621639
serializedVersion: 2
622-
m_Curve: []
640+
m_Curve:
641+
- serializedVersion: 3
642+
time: 0
643+
value: 0
644+
inSlope: 0
645+
outSlope: 0
646+
tangentMode: 0
647+
weightedMode: 0
648+
inWeight: 0
649+
outWeight: 0
650+
- serializedVersion: 3
651+
time: 1
652+
value: 1
653+
inSlope: 0
654+
outSlope: 0
655+
tangentMode: 0
656+
weightedMode: 0
657+
inWeight: 0
658+
outWeight: 0
623659
m_PreInfinity: 2
624660
m_PostInfinity: 2
625661
m_RotationOrder: 4
@@ -2215,13 +2251,49 @@ MonoBehaviour:
22152251
m_BlendOutDuration: 0.13333333333333286
22162252
m_MixInCurve:
22172253
serializedVersion: 2
2218-
m_Curve: []
2254+
m_Curve:
2255+
- serializedVersion: 3
2256+
time: 0
2257+
value: 0
2258+
inSlope: 0
2259+
outSlope: 0
2260+
tangentMode: 0
2261+
weightedMode: 0
2262+
inWeight: 0
2263+
outWeight: 0
2264+
- serializedVersion: 3
2265+
time: 1
2266+
value: 1
2267+
inSlope: 0
2268+
outSlope: 0
2269+
tangentMode: 0
2270+
weightedMode: 0
2271+
inWeight: 0
2272+
outWeight: 0
22192273
m_PreInfinity: 2
22202274
m_PostInfinity: 2
22212275
m_RotationOrder: 4
22222276
m_MixOutCurve:
22232277
serializedVersion: 2
2224-
m_Curve: []
2278+
m_Curve:
2279+
- serializedVersion: 3
2280+
time: 0
2281+
value: 1
2282+
inSlope: 0
2283+
outSlope: 0
2284+
tangentMode: 0
2285+
weightedMode: 0
2286+
inWeight: 0
2287+
outWeight: 0
2288+
- serializedVersion: 3
2289+
time: 1
2290+
value: 0
2291+
inSlope: 0
2292+
outSlope: 0
2293+
tangentMode: 0
2294+
weightedMode: 0
2295+
inWeight: 0
2296+
outWeight: 0
22252297
m_PreInfinity: 2
22262298
m_PostInfinity: 2
22272299
m_RotationOrder: 4
@@ -2248,13 +2320,49 @@ MonoBehaviour:
22482320
m_BlendOutDuration: 0.0724920101463793
22492321
m_MixInCurve:
22502322
serializedVersion: 2
2251-
m_Curve: []
2323+
m_Curve:
2324+
- serializedVersion: 3
2325+
time: 0
2326+
value: 0
2327+
inSlope: 0
2328+
outSlope: 0
2329+
tangentMode: 0
2330+
weightedMode: 0
2331+
inWeight: 0
2332+
outWeight: 0
2333+
- serializedVersion: 3
2334+
time: 1
2335+
value: 1
2336+
inSlope: 0
2337+
outSlope: 0
2338+
tangentMode: 0
2339+
weightedMode: 0
2340+
inWeight: 0
2341+
outWeight: 0
22522342
m_PreInfinity: 2
22532343
m_PostInfinity: 2
22542344
m_RotationOrder: 4
22552345
m_MixOutCurve:
22562346
serializedVersion: 2
2257-
m_Curve: []
2347+
m_Curve:
2348+
- serializedVersion: 3
2349+
time: 0
2350+
value: 1
2351+
inSlope: 0
2352+
outSlope: 0
2353+
tangentMode: 0
2354+
weightedMode: 0
2355+
inWeight: 0
2356+
outWeight: 0
2357+
- serializedVersion: 3
2358+
time: 1
2359+
value: 0
2360+
inSlope: 0
2361+
outSlope: 0
2362+
tangentMode: 0
2363+
weightedMode: 0
2364+
inWeight: 0
2365+
outWeight: 0
22582366
m_PreInfinity: 2
22592367
m_PostInfinity: 2
22602368
m_RotationOrder: 4
@@ -2281,7 +2389,25 @@ MonoBehaviour:
22812389
m_BlendOutDuration: -1
22822390
m_MixInCurve:
22832391
serializedVersion: 2
2284-
m_Curve: []
2392+
m_Curve:
2393+
- serializedVersion: 3
2394+
time: 0
2395+
value: 0
2396+
inSlope: 0
2397+
outSlope: 0
2398+
tangentMode: 0
2399+
weightedMode: 0
2400+
inWeight: 0
2401+
outWeight: 0
2402+
- serializedVersion: 3
2403+
time: 1
2404+
value: 1
2405+
inSlope: 0
2406+
outSlope: 0
2407+
tangentMode: 0
2408+
weightedMode: 0
2409+
inWeight: 0
2410+
outWeight: 0
22852411
m_PreInfinity: 2
22862412
m_PostInfinity: 2
22872413
m_RotationOrder: 4
@@ -5718,7 +5844,25 @@ MonoBehaviour:
57185844
m_RotationOrder: 4
57195845
m_MixOutCurve:
57205846
serializedVersion: 2
5721-
m_Curve: []
5847+
m_Curve:
5848+
- serializedVersion: 3
5849+
time: 0
5850+
value: 1
5851+
inSlope: 0
5852+
outSlope: 0
5853+
tangentMode: 0
5854+
weightedMode: 0
5855+
inWeight: 0
5856+
outWeight: 0
5857+
- serializedVersion: 3
5858+
time: 1
5859+
value: 0
5860+
inSlope: 0
5861+
outSlope: 0
5862+
tangentMode: 0
5863+
weightedMode: 0
5864+
inWeight: 0
5865+
outWeight: 0
57225866
m_PreInfinity: 2
57235867
m_PostInfinity: 2
57245868
m_RotationOrder: 4
@@ -5745,7 +5889,25 @@ MonoBehaviour:
57455889
m_BlendOutDuration: -1
57465890
m_MixInCurve:
57475891
serializedVersion: 2
5748-
m_Curve: []
5892+
m_Curve:
5893+
- serializedVersion: 3
5894+
time: 0
5895+
value: 0
5896+
inSlope: 0
5897+
outSlope: 0
5898+
tangentMode: 0
5899+
weightedMode: 0
5900+
inWeight: 0
5901+
outWeight: 0
5902+
- serializedVersion: 3
5903+
time: 1
5904+
value: 1
5905+
inSlope: 0
5906+
outSlope: 0
5907+
tangentMode: 0
5908+
weightedMode: 0
5909+
inWeight: 0
5910+
outWeight: 0
57495911
m_PreInfinity: 2
57505912
m_PostInfinity: 2
57515913
m_RotationOrder: 4
@@ -6213,13 +6375,49 @@ MonoBehaviour:
62136375
m_BlendOutDuration: 0.3333333333333357
62146376
m_MixInCurve:
62156377
serializedVersion: 2
6216-
m_Curve: []
6378+
m_Curve:
6379+
- serializedVersion: 3
6380+
time: 0
6381+
value: 0
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: 1
6391+
inSlope: 0
6392+
outSlope: 0
6393+
tangentMode: 0
6394+
weightedMode: 0
6395+
inWeight: 0
6396+
outWeight: 0
62176397
m_PreInfinity: 2
62186398
m_PostInfinity: 2
62196399
m_RotationOrder: 4
62206400
m_MixOutCurve:
62216401
serializedVersion: 2
6222-
m_Curve: []
6402+
m_Curve:
6403+
- serializedVersion: 3
6404+
time: 0
6405+
value: 1
6406+
inSlope: 0
6407+
outSlope: 0
6408+
tangentMode: 0
6409+
weightedMode: 0
6410+
inWeight: 0
6411+
outWeight: 0
6412+
- serializedVersion: 3
6413+
time: 1
6414+
value: 0
6415+
inSlope: 0
6416+
outSlope: 0
6417+
tangentMode: 0
6418+
weightedMode: 0
6419+
inWeight: 0
6420+
outWeight: 0
62236421
m_PreInfinity: 2
62246422
m_PostInfinity: 2
62256423
m_RotationOrder: 4
@@ -6246,13 +6444,49 @@ MonoBehaviour:
62466444
m_BlendOutDuration: 3.033333333333335
62476445
m_MixInCurve:
62486446
serializedVersion: 2
6249-
m_Curve: []
6447+
m_Curve:
6448+
- serializedVersion: 3
6449+
time: 0
6450+
value: 0
6451+
inSlope: 0
6452+
outSlope: 0
6453+
tangentMode: 0
6454+
weightedMode: 0
6455+
inWeight: 0
6456+
outWeight: 0
6457+
- serializedVersion: 3
6458+
time: 1
6459+
value: 1
6460+
inSlope: 0
6461+
outSlope: 0
6462+
tangentMode: 0
6463+
weightedMode: 0
6464+
inWeight: 0
6465+
outWeight: 0
62506466
m_PreInfinity: 2
62516467
m_PostInfinity: 2
62526468
m_RotationOrder: 4
62536469
m_MixOutCurve:
62546470
serializedVersion: 2
6255-
m_Curve: []
6471+
m_Curve:
6472+
- serializedVersion: 3
6473+
time: 0
6474+
value: 1
6475+
inSlope: 0
6476+
outSlope: 0
6477+
tangentMode: 0
6478+
weightedMode: 0
6479+
inWeight: 0
6480+
outWeight: 0
6481+
- serializedVersion: 3
6482+
time: 1
6483+
value: 0
6484+
inSlope: 0
6485+
outSlope: 0
6486+
tangentMode: 0
6487+
weightedMode: 0
6488+
inWeight: 0
6489+
outWeight: 0
62566490
m_PreInfinity: 2
62576491
m_PostInfinity: 2
62586492
m_RotationOrder: 4
@@ -6303,7 +6537,25 @@ MonoBehaviour:
63036537
m_RotationOrder: 4
63046538
m_MixOutCurve:
63056539
serializedVersion: 2
6306-
m_Curve: []
6540+
m_Curve:
6541+
- serializedVersion: 3
6542+
time: 0
6543+
value: 1
6544+
inSlope: 0
6545+
outSlope: 0
6546+
tangentMode: 0
6547+
weightedMode: 0
6548+
inWeight: 0
6549+
outWeight: 0
6550+
- serializedVersion: 3
6551+
time: 1
6552+
value: 0
6553+
inSlope: 0
6554+
outSlope: 0
6555+
tangentMode: 0
6556+
weightedMode: 0
6557+
inWeight: 0
6558+
outWeight: 0
63076559
m_PreInfinity: 2
63086560
m_PostInfinity: 2
63096561
m_RotationOrder: 4

0 commit comments

Comments
 (0)