Skip to content

Commit

Permalink
Merge pull request #103 from NicolasLaure/credits-first-roll
Browse files Browse the repository at this point in the history
Credits first roll
  • Loading branch information
Maxi-F authored Nov 6, 2024
2 parents a8b9503 + 7adabc7 commit 6afb74e
Show file tree
Hide file tree
Showing 7 changed files with 219 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Assets/Scenes/Boot.unity
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1413251191}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31742d9add994ea4e8f8a89b928d4cb2, type: 3}
m_Name:
Expand Down
99 changes: 99 additions & 0 deletions Assets/Scenes/Credits.unity
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,107 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 65e5f6d121e9e014c998b48c5e16648e, type: 3}
--- !u!1 &332603554
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 332603556}
- component: {fileID: 332603555}
m_Layer: 0
m_Name: GlobalPostProcessing
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &332603555
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 332603554}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IsGlobal: 1
priority: 0
blendDistance: 0
weight: 1
sharedProfile: {fileID: 11400000, guid: 686a5cb059ed12a4990fa07470f7e108, type: 2}
--- !u!4 &332603556
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 332603554}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1149808841
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1149808843}
- component: {fileID: 1149808842}
m_Layer: 0
m_Name: CreditsHandler
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1149808842
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1149808841}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6e4367c572ab08c47ac9590e7766ad25, type: 3}
m_Name:
m_EditorClassIdentifier:
cameraData: {fileID: 11400000, guid: c52b19016cf766c4990fae22f19b1cbb, type: 2}
firstLevelConfig: {fileID: 11400000, guid: e4e70fa8cf8c3be4cb4196d776da27c6, type: 2}
onCameraMovement: {fileID: 11400000, guid: 90b6045fa5889cc42af5977d80c68a89, type: 2}
onRoadManagerVelocity: {fileID: 11400000, guid: 21efa5342df3fb84ab0e65389176d7cf, type: 2}
--- !u!4 &1149808843
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1149808841}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 160628809}
- {fileID: 1149808843}
- {fileID: 332603556}
28 changes: 28 additions & 0 deletions Assets/Scenes/OverlayCanvas.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1874,6 +1874,34 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3703103357211389860, guid: 4d702725c5beb9141b61bc96d7cdda0e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3703103357211389860, guid: 4d702725c5beb9141b61bc96d7cdda0e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3703103357211389860, guid: 4d702725c5beb9141b61bc96d7cdda0e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 1699853479}
- target: {fileID: 3703103357211389860, guid: 4d702725c5beb9141b61bc96d7cdda0e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3703103357211389860, guid: 4d702725c5beb9141b61bc96d7cdda0e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: SetIsFirstMenu
objectReference: {fileID: 0}
- target: {fileID: 3703103357211389860, guid: 4d702725c5beb9141b61bc96d7cdda0e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: UI.MenuTitleHandler, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 3703103357211389860, guid: 4d702725c5beb9141b61bc96d7cdda0e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 4188325061852820035, guid: 4d702725c5beb9141b61bc96d7cdda0e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down
50 changes: 50 additions & 0 deletions Assets/Scenes/Roads.unity
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,55 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 65e5f6d121e9e014c998b48c5e16648e, type: 3}
--- !u!1 &2126483391
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2126483393}
- component: {fileID: 2126483392}
m_Layer: 0
m_Name: GlobalPostProcessing
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2126483392
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2126483391}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IsGlobal: 1
priority: 0
blendDistance: 0
weight: 1
sharedProfile: {fileID: 11400000, guid: 686a5cb059ed12a4990fa07470f7e108, type: 2}
--- !u!4 &2126483393
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2126483391}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &4005572945810339548
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -891,3 +940,4 @@ SceneRoots:
- {fileID: 93791667}
- {fileID: 1779743480}
- {fileID: 1460950870}
- {fileID: 2126483393}
25 changes: 25 additions & 0 deletions Assets/Scripts/Credits/CreditsHandler.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using System;
using Camera;
using Events;
using Events.ScriptableObjects;
using LevelManagement;
using UnityEngine;

namespace Credits
{
public class CreditsHandler : MonoBehaviour
{
[SerializeField] private CameraSO cameraData;
[SerializeField] private LevelLoopSO firstLevelConfig;

[Header("Events")]
[SerializeField] private CameraDataChannelSO onCameraMovement;
[SerializeField] private Vector3EventChannelSO onRoadManagerVelocity;

private void OnEnable()
{
onCameraMovement?.RaiseEvent(cameraData);
onRoadManagerVelocity?.RaiseEvent(firstLevelConfig.roadData.roadVelocity);
}
}
}
11 changes: 11 additions & 0 deletions Assets/Scripts/Credits/CreditsHandler.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Assets/Scripts/Scenes/ScenesHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ private void Start()
{
StartCoroutine(SetSceneAsActiveScene());
}

if(!string.IsNullOrEmpty(initMusic))

if (!string.IsNullOrEmpty(initMusic))
{
AkSoundEngine.StopAll();
AkSoundEngine.PostEvent(initMusic, gameObject);
}

SubscribeToActions();
HandleCanvasEvents(true);
Expand Down

0 comments on commit 6afb74e

Please sign in to comment.