diff --git a/Assets/Cutscene/Opening.playable b/Assets/Cutscene/Opening.playable
index e576648fb08e3d3b1e5c52d4d4180eda218bdef4..a2e8a5e92b3dba1fba668c8bf4368440a4e456a2 100644
--- a/Assets/Cutscene/Opening.playable
+++ b/Assets/Cutscene/Opening.playable
@@ -12,7 +12,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
- m_Time: 0.08333333333333333
+ m_Time: 0.16666666666666666
+ m_Retroactive: 0
+ m_EmitOnce: 0
+ m_Asset: {fileID: 11400000, guid: 126f381e1b501de47bb4cd76a4e8b2e7, type: 2}
+--- !u!114 &-8151705215404603389
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
+ m_Name: Signal Emitter
+ m_EditorClassIdentifier:
+ m_Time: 0.3333333333333333
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 126f381e1b501de47bb4cd76a4e8b2e7, type: 2}
@@ -38,10 +54,10 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
- m_Start: 0.06666666666666667
+ m_Start: 0.16666666666666666
m_ClipIn: 0
m_Asset: {fileID: -4441808277196338271}
- m_Duration: 0.13333333333333336
+ m_Duration: 0.16666666666666666
m_TimeScale: 1
m_ParentTrack: {fileID: -6941300038497648434}
m_EaseInDuration: 0
@@ -134,7 +150,7 @@ MonoBehaviour:
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -4837109179921342877}
- m_Duration: 0.03333333333333333
+ m_Duration: 0.08333333333333333
m_TimeScale: 1
m_ParentTrack: {fileID: -6814154506026015997}
m_EaseInDuration: 0
@@ -202,6 +218,22 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
+--- !u!114 &-5985043657016949744
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
+ m_Name: Signal Emitter
+ m_EditorClassIdentifier:
+ m_Time: 0
+ m_Retroactive: 0
+ m_EmitOnce: 0
+ m_Asset: {fileID: 11400000, guid: 126f381e1b501de47bb4cd76a4e8b2e7, type: 2}
--- !u!114 &-5348691404711108609
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -273,7 +305,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
- m_Time: 0.016666666666666666
+ m_Time: 0
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 126f381e1b501de47bb4cd76a4e8b2e7, type: 2}
@@ -303,23 +335,9 @@ MonoBehaviour:
- {fileID: -3102697803181520068}
- {fileID: 3145412101112829710}
- {fileID: -8483306574093739095}
- - {fileID: -665015101948389301}
---- !u!114 &-665015101948389301
-MonoBehaviour:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
- m_Name: Signal Emitter
- m_EditorClassIdentifier:
- m_Time: 0.1
- m_Retroactive: 0
- m_EmitOnce: 0
- m_Asset: {fileID: 11400000, guid: 126f381e1b501de47bb4cd76a4e8b2e7, type: 2}
+ - {fileID: -5985043657016949744}
+ - {fileID: 8339832891988122756}
+ - {fileID: -8151705215404603389}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -366,10 +384,10 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
- m_Start: 0.033333333333333395
+ m_Start: 0.08333333333333333
m_ClipIn: 0
m_Asset: {fileID: -5348691404711108609}
- m_Duration: 0.03333333333333327
+ m_Duration: 0.08333333333333333
m_TimeScale: 1
m_ParentTrack: {fileID: 462712388309880457}
m_EaseInDuration: 0
@@ -449,7 +467,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
- m_Time: 0.05
+ m_Time: 0.08333333333333333
+ m_Retroactive: 0
+ m_EmitOnce: 0
+ m_Asset: {fileID: 11400000, guid: 126f381e1b501de47bb4cd76a4e8b2e7, type: 2}
+--- !u!114 &8339832891988122756
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
+ m_Name: Signal Emitter
+ m_EditorClassIdentifier:
+ m_Time: 0.25
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 126f381e1b501de47bb4cd76a4e8b2e7, type: 2}
diff --git a/Assets/Scenes/Main-Menu.unity b/Assets/Scenes/Main-Menu.unity
index fbbc186301c58620bdf531faee41b05020b583f4..a67a83036db9c5413e6dd1bcc8135d77fea72cc5 100644
--- a/Assets/Scenes/Main-Menu.unity
+++ b/Assets/Scenes/Main-Menu.unity
@@ -1123,25 +1123,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 127084526}
m_CullTransparentMesh: 1
---- !u!1 &137860516 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 25588323808451137, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- m_PrefabInstance: {fileID: 768756454}
- m_PrefabAsset: {fileID: 0}
--- !u!114 &137860522
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 137860516}
+ m_GameObject: {fileID: 25588323335688359}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dd5dc86d7cb5f459299661c0e36d66bf, type: 3}
m_Name:
m_EditorClassIdentifier:
mouseSensitivity: 100
- playerBody: {fileID: 2029789236}
+ playerBody: {fileID: 2714109453136215921}
--- !u!1 &170343971
GameObject:
m_ObjectHideFlags: 0
@@ -2511,7 +2506,7 @@ MonoBehaviour:
settingsPanel: {fileID: 1547019266}
statisticsPanel: {fileID: 269094584}
loadGamePanel: {fileID: 127084526}
- mainScene: Main 1
+ mainScene: Opening
--- !u!4 &436382074
Transform:
m_ObjectHideFlags: 0
@@ -3545,141 +3540,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 766629428}
m_CullTransparentMesh: 1
---- !u!1001 &768756454
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 105293154566656040, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1435885784280951007, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_Enabled
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1435885784280951007, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: 104d3543e46f8f54785caab7ad950e67, type: 2}
- - target: {fileID: 1691810945746032555, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: orthographic
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1821008214804589919, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: attackRadius
- value:
- objectReference: {fileID: 0}
- - target: {fileID: 2341733579835803174, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_Name
- value: GroundChecker
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452509997481, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_Name
- value: Player
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452509997481, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_TagString
- value: Player
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098825, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_ConstrainProportionsScale
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalScale.x
- value: 0.57
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalScale.y
- value: 0.57
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalScale.z
- value: 0.57
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalPosition.x
- value: 75.289
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalPosition.y
- value: 23.334
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalPosition.z
- value: 53.315
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.8917896
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0.45245028
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 53.802
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_ConstrainProportionsScale
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2714109452515271909, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_Enabled
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4683032125115529830, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: ui.fillSlider
- value:
- objectReference: {fileID: 0}
- - target: {fileID: 4683032125115529830, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: ui.easeFillSlider
- value:
- objectReference: {fileID: 0}
- - target: {fileID: 7686958831580430926, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: groundCheck.origin
- value:
- objectReference: {fileID: 0}
- - target: {fileID: 8132293519141734770, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 4683032125115529830, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- - {fileID: 7686958831580430926, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- - {fileID: 4518626090624133274, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- m_RemovedGameObjects:
- - {fileID: 1191204965333302317, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- - {fileID: 7604422020504338232, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- - {fileID: 2714109452509997495, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- - {fileID: 4172830108039650460, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- m_AddedGameObjects: []
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 25588323808451137, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- insertIndex: -1
- addedObject: {fileID: 137860522}
- m_SourcePrefab: {fileID: 100100000, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
--- !u!1 &771651658
GameObject:
m_ObjectHideFlags: 0
@@ -8906,11 +8766,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
---- !u!4 &2029789236 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 2714109452510098839, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- m_PrefabInstance: {fileID: 768756454}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &2096646618
GameObject:
m_ObjectHideFlags: 0
@@ -9131,12 +8986,195 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_IsOn: 1
+--- !u!1 &25588323335688359
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1296238103339904742}
+ - component: {fileID: 1691810945432362317}
+ - component: {fileID: 578633785682563934}
+ - component: {fileID: 3199010924229790130}
+ - component: {fileID: 137860522}
+ m_Layer: 0
+ m_Name: Main Camera
+ m_TagString: MainCamera
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!124 &578633785682563934
+Behaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 25588323335688359}
+ m_Enabled: 1
+--- !u!4 &1296238103339904742
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 25588323335688359}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.18, y: 0.486, z: 0.178}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2714109453136215921}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &1691810945432362317
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 25588323335688359}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 1
+ m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+ m_projectionMatrixMode: 1
+ m_GateFitMode: 2
+ m_FOVAxisMode: 0
+ m_Iso: 200
+ m_ShutterSpeed: 0.005
+ m_Aperture: 16
+ m_FocusDistance: 10
+ m_FocalLength: 50
+ m_BladeCount: 5
+ m_Curvature: {x: 2, y: 11}
+ m_BarrelClipping: 0.25
+ m_Anamorphism: 0
+ m_SensorSize: {x: 36, y: 24}
+ m_LensShift: {x: 0, y: 0}
+ m_NormalizedViewPortRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+ near clip plane: 0.15
+ far clip plane: 1000
+ field of view: 66
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: -1
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 0}
+ m_TargetDisplay: 0
+ m_TargetEye: 3
+ m_HDR: 1
+ m_AllowMSAA: 1
+ m_AllowDynamicResolution: 0
+ m_ForceIntoRT: 1
+ m_OcclusionCulling: 1
+ m_StereoConvergence: 10
+ m_StereoSeparation: 0.022
+--- !u!95 &2714109453126357185
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2714109453135848271}
+ m_Enabled: 1
+ m_Avatar: {fileID: 9000000, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ m_Controller: {fileID: 0}
+ m_CullingMode: 1
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 0
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &2714109453135848271
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2714109453136215921}
+ - component: {fileID: 2714109453126357185}
+ - component: {fileID: 5513279237336750716}
+ m_Layer: 3
+ m_Name: Player
+ m_TagString: Player
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2714109453136215921
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2714109453135848271}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0.45245028, z: 0, w: 0.8917896}
+ m_LocalPosition: {x: 75.289, y: 23.334, z: 53.315}
+ m_LocalScale: {x: 0.57, y: 0.57, z: 0.57}
+ m_ConstrainProportionsScale: 1
+ m_Children:
+ - {fileID: 1296238103339904742}
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 53.802, z: 0}
+--- !u!81 &3199010924229790130
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 25588323335688359}
+ m_Enabled: 1
+--- !u!143 &5513279237336750716
+CharacterController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2714109453135848271}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Height: 2.85
+ m_Radius: 0.53
+ m_SlopeLimit: 45
+ m_StepOffset: 0.3
+ m_SkinWidth: 0.08
+ m_MinMoveDistance: 0.001
+ m_Center: {x: 0, y: -0.68, z: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1908619494}
- - {fileID: 768756454}
+ - {fileID: 2714109453136215921}
- {fileID: 771651660}
- {fileID: 2009449181}
- {fileID: 462515434}
diff --git a/Assets/Scenes/Opening.unity b/Assets/Scenes/Opening.unity
index fc9bbeade41caf82b20f78b87d2064ef5fd6323e..9b310d5a2bdae79ae234b0f552eb33bdcbd5ca5b 100644
--- a/Assets/Scenes/Opening.unity
+++ b/Assets/Scenes/Opening.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+ m_IndirectSpecularColor: {r: 0.2725736, g: 0.38230276, b: 0.44980258, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3964,7 +3964,6 @@ MonoBehaviour:
m_CallState: 2
dialogues:
- '>> Name: Jakarta, 2024'
- -
- Kota Jakarta. Kota yang penuh kesibukan, dan dihuni oleh gegap gempita aktivitas
dinamis dari warganya yang tak pernah mengenal lelah
- Jalanan bagaikan detak jantung yang tak henti berdenyut mengiri laju kehidupan
@@ -3996,6 +3995,7 @@ MonoBehaviour:
typeIntervalPerChar: 0.05
waitBetweenComas: 0.3
waitBetweenPeriods: 0.5
+ marks:
--- !u!1 &1062877420
GameObject:
m_ObjectHideFlags: 0
@@ -4167,6 +4167,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
playableDirector: {fileID: 645502210}
+ markCount: 4
+ framePerMark: 5
+ allowContinue: 1
+ isPlaying: 0
unityChanAnimator: {fileID: 174347191}
backRoomCamera: {fileID: 380315006}
cameraPos1: {fileID: 940386427}
@@ -4359,160 +4363,63 @@ Transform:
- {fileID: 2714109451875425204}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1969579339
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1969579340}
- - component: {fileID: 1969579341}
- - component: {fileID: 1969579342}
- m_Layer: 0
- m_Name: AudioManager
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1969579340
-Transform:
+--- !u!1001 &2099804006
+PrefabInstance:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1969579339}
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!114 &1969579341
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1969579339}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 87d71f2da2f86f34b834de91b9ce445f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- sounds:
- - Name: Jakarta
- Clip: {fileID: 8300000, guid: 5eab51816c5dba242b337d2d35ff7132, type: 3}
- Volume: 0.2
- Pitch: 1
- Loop: 1
- FadeDuration: 2
- - Name: Night
- Clip: {fileID: 8300000, guid: cd824cba38f4bb847884440ffc6d9614, type: 3}
- Volume: 0.08
- Pitch: 1
- Loop: 1
- FadeDuration: 2
---- !u!82 &1969579342
-AudioSource:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1969579339}
- m_Enabled: 1
- serializedVersion: 4
- OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 0}
- m_PlayOnAwake: 1
- m_Volume: 1
- m_Pitch: 1
- Loop: 0
- Mute: 0
- Spatialize: 0
- SpatializePostEffects: 0
- Priority: 128
- DopplerLevel: 1
- MinDistance: 1
- MaxDistance: 500
- Pan2D: 0
- rolloffMode: 0
- BypassEffects: 0
- BypassListenerEffects: 0
- BypassReverbZones: 0
- rolloffCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalPosition.x
value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- panLevelCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalPosition.y
value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- spreadCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalPosition.z
value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- reverbZoneMixCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalRotation.w
value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3062700307037801332, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4363208891872727782, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
+ propertyPath: m_Name
+ value: AudioManager
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: be566b30514c0604ebd12b0a009ca021, type: 3}
--- !u!1 &2645227305211407525
GameObject:
m_ObjectHideFlags: 0
@@ -4663,5 +4570,5 @@ SceneRoots:
- {fileID: 572642383}
- {fileID: 284953675}
- {fileID: 1942567678}
- - {fileID: 1969579340}
- {fileID: 12023341}
+ - {fileID: 2099804006}
diff --git a/Assets/Scripts/Cutscene/DialogueManager.cs b/Assets/Scripts/Cutscene/DialogueManager.cs
index 3f7f8242d4e0ae26a13fa3042675dce09eb96289..3eb1995782162d73695afdacc099336498d7e24c 100644
--- a/Assets/Scripts/Cutscene/DialogueManager.cs
+++ b/Assets/Scripts/Cutscene/DialogueManager.cs
@@ -30,10 +30,10 @@ public class DialogueManager : MonoBehaviour
dialogueIndex = marks[markIndex];
}
- private void Start()
- {
- NextDialogue();
- }
+ // private void Start()
+ // {
+ // NextDialogue();
+ // }
private void OnEnable() {
NextDialogue();
diff --git a/Assets/Scripts/Cutscene/OpeningTimelineManager.cs b/Assets/Scripts/Cutscene/OpeningTimelineManager.cs
index 36dc287cb63cc3eebf03a5279bf19e7b5557c872..a45e84aa5de3f6777d9322b396ef35678879a026 100644
--- a/Assets/Scripts/Cutscene/OpeningTimelineManager.cs
+++ b/Assets/Scripts/Cutscene/OpeningTimelineManager.cs
@@ -11,20 +11,28 @@ public class OpeningTimelineManager : TimelineManager
protected override void Awake() {
base.Awake();
- }
- protected override void Start() {
+ AudioManager.Instance.SetBGMVolume(0.0f);
AudioManager.Instance.PlayBGMOverwrite("Jakarta");
}
protected override void OnStartTimelineMark() {
- if (currentMarkIndex == 2) {
- unityChanAnimator.SetTrigger("WAIT02");
- } if (currentMarkIndex == 3) {
- SmoothMoveCamera(cameraPos1, 1.1f);
- } if (currentMarkIndex == 4) {
- SmoothMoveCamera(cameraPos2, 1.1f);
+ Instance.allowContinue = false;
+ switch (currentMarkIndex) {
+ case 1:
+ unityChanAnimator.SetTrigger("WAIT02");
+ break;
+ case 2:
+ unityChanAnimator.SetTrigger("WAIT00");
+ break;
+ case 3:
+ SmoothMoveCamera(cameraPos1, 1.1f);
+ break;
+ case 4:
+ SmoothMoveCamera(cameraPos2, 1.1f);
+ break;
}
+ Instance.allowContinue = true;
}
private void SmoothMoveCamera(Transform targetPos, float duration) {
@@ -47,6 +55,6 @@ public class OpeningTimelineManager : TimelineManager
}
public void LoadMainScene() {
- SceneManager.LoadScene("Main");
+ SceneManager.LoadScene("Main 1");
}
}
diff --git a/Assets/Scripts/GameOver/GameOver.cs b/Assets/Scripts/GameOver/GameOver.cs
index 96d51318c2c8eecbbc0f1d3c01889982038383f2..5b985d5272855fcf0a47b36b4b4fd8dd5811e112 100644
--- a/Assets/Scripts/GameOver/GameOver.cs
+++ b/Assets/Scripts/GameOver/GameOver.cs
@@ -20,8 +20,8 @@ public class GameOver : MonoBehaviour
[SerializeField] public QuestManager questManager;
public bool isPaused = false;
- public string mainMenuScene = "Main Menu";
- public string mainScene = "Main";
+ public string mainMenuScene = "Main-Menu";
+ public string mainScene = "Main 1";
void Start()
{
diff --git a/Assets/Scripts/Quest/QuestManager.cs b/Assets/Scripts/Quest/QuestManager.cs
index fdc2923b733092f57774f9b1a43a8fe08f835abe..83a95bd26ae9847b19b7bb351004ac10cc074b78 100644
--- a/Assets/Scripts/Quest/QuestManager.cs
+++ b/Assets/Scripts/Quest/QuestManager.cs
@@ -46,10 +46,6 @@ public class QuestManager : MonoBehaviour
Destroy(gameObject);
}
InitializeQuests();
-
- // Initialize Game Win
- GameObject gameWinObj = GameObject.Find("Gameplay UI/GameWin UI");
- gameWin = gameWinObj.GetComponent<GameWin>();
}
public void SetQuestIndex(int index)
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 0286aab37820f3cb16feda399d0cb464b5f9a65c..d704b840a4b846fdc4cee1acbbf160f37c5d4b03 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,27 +5,12 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- - enabled: 1
- path: Assets/Scenes/Abil's/Main Menu -Abil.unity
- guid: 25c5647bf4fd94dc5ae2e048929b9597
- - enabled: 0
- path: Assets/Scenes/Abil's/Main-Abil1.unity
- guid: 68d3debecc99c4c1780d9e32c2a2129c
- - enabled: 1
- path: Assets/Scenes/Husnia's/Main Menu.unity
- guid: 6692c75259106ab4b8c0474c6a827347
- - enabled: 1
- path: Assets/Scenes/Husnia's/Main.unity
- guid: 4fc643df9558efc40936ddae793a9fb3
- enabled: 1
path: Assets/Scenes/Main-Menu.unity
guid: 91ac8fb4348e74019a6a7ff643dbb3d0
- enabled: 1
- path: Assets/Scenes/Main.unity
- guid: c8e2480ef1a73194ca28bc6340c7919b
- - enabled: 1
- path: Assets/Scenes/Main 2.unity
- guid: d0fa6654fb9724091b17a2b0184cca51
+ path: Assets/Scenes/Opening.unity
+ guid: 38acfb44b60e39c49b6c72dc6cc2a07a
- enabled: 1
path: Assets/Scenes/Main 1.unity
guid: c4233b289df4c3d4aa246ce9a14f8b28