From f78ac78893be3478d5c82faa1b742bdc0342d06e Mon Sep 17 00:00:00 2001 From: Daniel Tyomin Date: Tue, 20 Aug 2024 11:39:32 +0200 Subject: [PATCH] fixing and tweaking stuff --- Assets/Data/Objectives/Level 1.asset | 2 +- Assets/Data/Objectives/Level 2.asset | 2 +- Assets/Data/Objectives/Level 3.asset | 2 +- .../Prefabs/ExampleCharacter.prefab | 4 +- .../Conveyor/Product Converter 1.prefab | 2 +- .../Prefabs/Conveyor/Product Receiver.prefab | 218 ++++++++++++++++-- .../Prefabs/Conveyor/Product Spawner.prefab | 110 ++++++++- Assets/Scenes/Main.unity | 36 +-- Assets/Scripts/Game Schedule/Scoreboard.cs | 20 +- Assets/Scripts/UI/UIManager.cs | 10 +- 10 files changed, 353 insertions(+), 53 deletions(-) diff --git a/Assets/Data/Objectives/Level 1.asset b/Assets/Data/Objectives/Level 1.asset index cae3f7c..be862c2 100644 --- a/Assets/Data/Objectives/Level 1.asset +++ b/Assets/Data/Objectives/Level 1.asset @@ -17,7 +17,7 @@ MonoBehaviour: - Type: {fileID: 11400000, guid: 6f11438f5cec6a24cb2a32fccc6244d1, type: 2} Quantity: 20 MaxDefectivePercentage: 30 - TimeLimit: 120 + TimeLimit: 170 LevelMessage: 'Welcome, employee! Please ensure the quality of our Torus product. diff --git a/Assets/Data/Objectives/Level 2.asset b/Assets/Data/Objectives/Level 2.asset index 81e9be4..b5f7807 100644 --- a/Assets/Data/Objectives/Level 2.asset +++ b/Assets/Data/Objectives/Level 2.asset @@ -20,7 +20,7 @@ MonoBehaviour: - Type: {fileID: 11400000, guid: 1e626f6e0e642b44aaeb77b6628c8be7, type: 2} Quantity: 15 MaxDefectivePercentage: 25 - TimeLimit: 180 + TimeLimit: 230 LevelMessage: 'We have scaled up Torus production. The newest Torus assembly diff --git a/Assets/Data/Objectives/Level 3.asset b/Assets/Data/Objectives/Level 3.asset index 16250c2..29e9ec8 100644 --- a/Assets/Data/Objectives/Level 3.asset +++ b/Assets/Data/Objectives/Level 3.asset @@ -20,7 +20,7 @@ MonoBehaviour: - Type: {fileID: 11400000, guid: 1e626f6e0e642b44aaeb77b6628c8be7, type: 2} Quantity: 40 MaxDefectivePercentage: 25 - TimeLimit: 240 + TimeLimit: 270 LevelMessage: We are pleased to announce that we have secured the capital for the expansion of E(tm) production. SuccessMessage: Great job! diff --git a/Assets/Plugins/KinematicCharacterController/ExampleCharacter/Prefabs/ExampleCharacter.prefab b/Assets/Plugins/KinematicCharacterController/ExampleCharacter/Prefabs/ExampleCharacter.prefab index f5e7af5..02a455c 100644 --- a/Assets/Plugins/KinematicCharacterController/ExampleCharacter/Prefabs/ExampleCharacter.prefab +++ b/Assets/Plugins/KinematicCharacterController/ExampleCharacter/Prefabs/ExampleCharacter.prefab @@ -230,8 +230,8 @@ MonoBehaviour: AirAccelerationSpeed: 18 Drag: 0.1 AllowJumpingWhenSliding: 0 - JumpUpSpeed: 10 - JumpScalableForwardSpeed: 10 + JumpUpSpeed: 9 + JumpScalableForwardSpeed: 3 JumpPreGroundingGraceTime: 0 JumpPostGroundingGraceTime: 0 IgnoredColliders: diff --git a/Assets/Prefabs/Conveyor/Product Converter 1.prefab b/Assets/Prefabs/Conveyor/Product Converter 1.prefab index 27067a6..4c8e0a7 100644 --- a/Assets/Prefabs/Conveyor/Product Converter 1.prefab +++ b/Assets/Prefabs/Conveyor/Product Converter 1.prefab @@ -25,7 +25,7 @@ Transform: m_GameObject: {fileID: 569319472537186278} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.70710707, z: -0, w: 0.70710653} - m_LocalPosition: {x: -1, y: 0, z: 0} + m_LocalPosition: {x: -1.121, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Prefabs/Conveyor/Product Receiver.prefab b/Assets/Prefabs/Conveyor/Product Receiver.prefab index 65947c5..f6f28cf 100644 --- a/Assets/Prefabs/Conveyor/Product Receiver.prefab +++ b/Assets/Prefabs/Conveyor/Product Receiver.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2691121107702918304 +--- !u!1 &1886793827999227452 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6124643934757847502} - - component: {fileID: 1803345453588852622} - - component: {fileID: 2049186239399771702} + - component: {fileID: 4861863071503444183} + - component: {fileID: 2929166663371598937} + - component: {fileID: 2280612267845043253} + - component: {fileID: 2637997046568300664} m_Layer: 0 - m_Name: Cube (1) + m_Name: Cube (4) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &6124643934757847502 + m_IsActive: 1 +--- !u!4 &4861863071503444183 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2691121107702918304} + m_GameObject: {fileID: 1886793827999227452} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.75, y: 0.1875, z: -1.125} - m_LocalScale: {x: 2.75, y: 1.625, z: 0.25} + m_LocalPosition: {x: -0.8125, y: 0.334, z: 0} + m_LocalScale: {x: 0.37501296, y: 2.1617553, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6238139087991197689} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1803345453588852622 +--- !u!33 &2929166663371598937 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2691121107702918304} + m_GameObject: {fileID: 1886793827999227452} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2049186239399771702 +--- !u!23 &2280612267845043253 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2691121107702918304} - m_Enabled: 1 + m_GameObject: {fileID: 1886793827999227452} + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -83,6 +84,132 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2637997046568300664 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1886793827999227452} + 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_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0.00000011920929, y: 0, z: 0} +--- !u!1 &2691121107702918304 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6124643934757847502} + - component: {fileID: 1803345453588852622} + - component: {fileID: 2049186239399771702} + - component: {fileID: 2933590479231035920} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6124643934757847502 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2691121107702918304} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.75, y: 0.4729, z: -1.125} + m_LocalScale: {x: 2.75, y: 2.1958625, z: 0.25} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6238139087991197689} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1803345453588852622 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2691121107702918304} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2049186239399771702 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2691121107702918304} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2933590479231035920 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2691121107702918304} + 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_Size: {x: 0.99999994, y: 0.99999994, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3300142079730169062 GameObject: m_ObjectHideFlags: 0 @@ -195,7 +322,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4748086957800454890 Transform: m_ObjectHideFlags: 0 @@ -295,6 +422,7 @@ Transform: - {fileID: 6124643934757847502} - {fileID: 4748086957800454890} - {fileID: 7524344916720894899} + - {fileID: 4861863071503444183} - {fileID: 1037217556386504287} - {fileID: 8893193092501905694} - {fileID: 2032957818114081249} @@ -339,13 +467,14 @@ GameObject: - component: {fileID: 7524344916720894899} - component: {fileID: 1582601958366311740} - component: {fileID: 3143886536820141369} + - component: {fileID: 6975482379341168212} m_Layer: 0 m_Name: Cube (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &7524344916720894899 Transform: m_ObjectHideFlags: 0 @@ -355,7 +484,7 @@ Transform: m_GameObject: {fileID: 8709015778225462089} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.5625, y: 1.1110001, z: 0} + m_LocalPosition: {x: 0.5625, y: 1.737, z: 0} m_LocalScale: {x: 3.125108, y: 0.25, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -376,7 +505,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8709015778225462089} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -411,6 +540,27 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &6975482379341168212 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8709015778225462089} + 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_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0.00000011920929, y: 0, z: 0} --- !u!1 &9029570661290360059 GameObject: m_ObjectHideFlags: 0 @@ -422,13 +572,14 @@ GameObject: - component: {fileID: 29782541997105855} - component: {fileID: 7683826572460614085} - component: {fileID: 6478337344638785508} + - component: {fileID: 2292799751322759190} m_Layer: 0 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &29782541997105855 Transform: m_ObjectHideFlags: 0 @@ -438,8 +589,8 @@ Transform: m_GameObject: {fileID: 9029570661290360059} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.75, y: 0.1875, z: 1.125} - m_LocalScale: {x: 2.75, y: 1.625, z: 0.25} + m_LocalPosition: {x: 0.75, y: 0.4729, z: 1.125} + m_LocalScale: {x: 2.75, y: 2.1958625, z: 0.25} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6238139087991197689} @@ -459,7 +610,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9029570661290360059} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -494,6 +645,27 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2292799751322759190 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9029570661290360059} + 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_Size: {x: 0.99999994, y: 0.99999994, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &1998539543077611018 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Conveyor/Product Spawner.prefab b/Assets/Prefabs/Conveyor/Product Spawner.prefab index a9fac03..628c28b 100644 --- a/Assets/Prefabs/Conveyor/Product Spawner.prefab +++ b/Assets/Prefabs/Conveyor/Product Spawner.prefab @@ -64,6 +64,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4012788816120753954} + - {fileID: 3786609045812521396} - {fileID: 7621548840300707857} - {fileID: 3822625298225933305} - {fileID: 2943134841320330816} @@ -136,6 +137,111 @@ MonoBehaviour: - {fileID: 2447222251883083429} yRotation: {x: -10, y: 10} spawnClip: {fileID: 8300000, guid: 41f813f9ff2f32d40822f67b80c0fbab, type: 3} +--- !u!1 &2551483492890393334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3786609045812521396} + - component: {fileID: 64247584265800886} + - component: {fileID: 3813491726221677477} + - component: {fileID: 942805284860632001} + m_Layer: 0 + m_Name: Cube (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3786609045812521396 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2551483492890393334} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.4874, y: 0.375, z: 0} + m_LocalScale: {x: 0.2751133, y: 1.9148816, z: 1.75} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9072778288000056937} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &64247584265800886 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2551483492890393334} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3813491726221677477 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2551483492890393334} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &942805284860632001 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2551483492890393334} + 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_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4554871642566179801 GameObject: m_ObjectHideFlags: 0 @@ -164,8 +270,8 @@ Transform: m_GameObject: {fileID: 4554871642566179801} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.0126, y: 1.875, z: 0} - m_LocalScale: {x: 1.275125, y: 0.41488063, z: 1.75} + m_LocalPosition: {x: 0.9874, y: 1.875, z: 0} + m_LocalScale: {x: 3.2751586, y: 0.41488063, z: 1.75} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9072778288000056937} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 0f8aeb4..1323b18 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -767,7 +767,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4626647624635935874, guid: 52253a366fba6644b8983c5cf7fbfc9f, type: 3} propertyPath: m_LocalPosition.y - value: -0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4626647624635935874, guid: 52253a366fba6644b8983c5cf7fbfc9f, type: 3} propertyPath: m_LocalPosition.z @@ -1217,6 +1217,10 @@ PrefabInstance: propertyPath: m_Name value: Defect Detector objectReference: {fileID: 0} + - target: {fileID: 8140899253408661228, guid: 164bcef21fc47d947ac09a8922e04c53, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8499163723211625772, guid: 164bcef21fc47d947ac09a8922e04c53, type: 3} propertyPath: Size.y value: 8 @@ -2991,7 +2995,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6695070873418123376, guid: a3cb7267f99421c4b9912896d1eb7a41, type: 3} propertyPath: ProductionPhases.Array.data[2].Duration - value: 30 + value: 20 objectReference: {fileID: 0} - target: {fileID: 6695070873418123376, guid: a3cb7267f99421c4b9912896d1eb7a41, type: 3} propertyPath: ProductionPhases.Array.data[0].ProductType @@ -3011,7 +3015,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6695070873418123376, guid: a3cb7267f99421c4b9912896d1eb7a41, type: 3} propertyPath: ProductionPhases.Array.data[1].TotalSpawnCount - value: 30 + value: 23 objectReference: {fileID: 0} - target: {fileID: 6695070873418123376, guid: a3cb7267f99421c4b9912896d1eb7a41, type: 3} propertyPath: ProductionPhases.Array.data[2].TotalSpawnCount @@ -4338,7 +4342,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1323040730376936444, guid: 57ad505827c2820409787877f8d9d36d, type: 3} propertyPath: m_LocalPosition.y - value: -0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1323040730376936444, guid: 57ad505827c2820409787877f8d9d36d, type: 3} propertyPath: m_LocalPosition.z @@ -8467,7 +8471,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6695070873418123376, guid: a3cb7267f99421c4b9912896d1eb7a41, type: 3} propertyPath: ProductionPhases.Array.data[2].Duration - value: 120 + value: 60 objectReference: {fileID: 0} - target: {fileID: 6695070873418123376, guid: a3cb7267f99421c4b9912896d1eb7a41, type: 3} propertyPath: ProductionPhases.Array.data[0].ProductType @@ -8491,7 +8495,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6695070873418123376, guid: a3cb7267f99421c4b9912896d1eb7a41, type: 3} propertyPath: ProductionPhases.Array.data[2].TotalSpawnCount - value: 30 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7172902202437184265, guid: a3cb7267f99421c4b9912896d1eb7a41, type: 3} propertyPath: m_ConnectedAnchor.x @@ -9934,7 +9938,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8340031753597466798, guid: 9d41acef597ef464eb0057ad687c021d, type: 3} propertyPath: m_LocalPosition.y - value: -0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8340031753597466798, guid: 9d41acef597ef464eb0057ad687c021d, type: 3} propertyPath: m_LocalPosition.z @@ -11227,7 +11231,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4626647624635935874, guid: 52253a366fba6644b8983c5cf7fbfc9f, type: 3} propertyPath: m_LocalPosition.y - value: -0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4626647624635935874, guid: 52253a366fba6644b8983c5cf7fbfc9f, type: 3} propertyPath: m_LocalPosition.z @@ -11729,7 +11733,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &638405052 Transform: m_ObjectHideFlags: 0 @@ -18913,7 +18917,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4626647624635935874, guid: 52253a366fba6644b8983c5cf7fbfc9f, type: 3} propertyPath: m_LocalPosition.y - value: -0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4626647624635935874, guid: 52253a366fba6644b8983c5cf7fbfc9f, type: 3} propertyPath: m_LocalPosition.z @@ -19539,7 +19543,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4626647624635935874, guid: 52253a366fba6644b8983c5cf7fbfc9f, type: 3} propertyPath: m_LocalPosition.y - value: -0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4626647624635935874, guid: 52253a366fba6644b8983c5cf7fbfc9f, type: 3} propertyPath: m_LocalPosition.z @@ -23322,7 +23326,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1323040730376936444, guid: 57ad505827c2820409787877f8d9d36d, type: 3} propertyPath: m_LocalPosition.y - value: -0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1323040730376936444, guid: 57ad505827c2820409787877f8d9d36d, type: 3} propertyPath: m_LocalPosition.z @@ -25098,7 +25102,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8340031753597466798, guid: 9d41acef597ef464eb0057ad687c021d, type: 3} propertyPath: m_LocalPosition.y - value: -0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8340031753597466798, guid: 9d41acef597ef464eb0057ad687c021d, type: 3} propertyPath: m_LocalPosition.z @@ -25886,10 +25890,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114565867274256808, guid: d295472d4ce25404e9aed2627c34801f, type: 3} - propertyPath: JumpUpSpeed - value: 10 - objectReference: {fileID: 0} - target: {fileID: 114565867274256808, guid: d295472d4ce25404e9aed2627c34801f, type: 3} propertyPath: MaxAirMoveSpeed value: 5 @@ -30751,7 +30751,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1635000037 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game Schedule/Scoreboard.cs b/Assets/Scripts/Game Schedule/Scoreboard.cs index f70c2b6..14166c3 100644 --- a/Assets/Scripts/Game Schedule/Scoreboard.cs +++ b/Assets/Scripts/Game Schedule/Scoreboard.cs @@ -198,11 +198,24 @@ public class Scoreboard: MonoBehaviour { if (ProductCounts.ContainsKey(quota.Type)) { + if (quota.Quantity <= TotalCount(quota.Type)) + { + sb.Append(""); + } + else + { + sb.Append(""); + } + sb.Append($"{quota.Type.name}: {TotalCount(quota.Type)}/{quota.Quantity}\n"); + + sb.Append(""); } else { + sb.Append(""); sb.Append($"{quota.Type.name}: 0/{quota.Quantity}\n"); + sb.Append(""); } } @@ -233,14 +246,17 @@ public class Scoreboard: MonoBehaviour sb.Append($"{quota.Type.name}: {TotalCount(quota.Type)}/{quota.Quantity}\n"); + sb.Append("\n"); + + sb.Append($"Overall {quota.Type.name} defect percentage: {DefectPercentage(quota.Type)}%\n"); + if (quota.MaxDefectivePercentage < DefectPercentage(quota.Type)) { success = false; sb.Append($"Too many of {quota.Type.name} were defective!\n"); - break; } - sb.Append($"Overall {quota.Type.name} defect percentage: {DefectPercentage(quota.Type)}%\n"); + sb.Append("\n"); } sb.Append(success ? CurrentObjective.SuccessMessage : CurrentObjective.FailureMessage); diff --git a/Assets/Scripts/UI/UIManager.cs b/Assets/Scripts/UI/UIManager.cs index 3458f15..4d0a29c 100644 --- a/Assets/Scripts/UI/UIManager.cs +++ b/Assets/Scripts/UI/UIManager.cs @@ -171,7 +171,13 @@ public class UIManager: MonoBehaviour break; case UIState.Game: AudioListener.pause = false; + +#if UNITY_EDITOR Time.timeScale = 1f; +#else + Time.timeScale = 1f; +#endif + Cursor.lockState = CursorLockMode.Locked; Reticle.SetActive(true); break; @@ -289,10 +295,10 @@ public class UIManager: MonoBehaviour switch (Scoreboard.Instance.CurrentStage) { case StagingManager.StageEnum.Level1: - StartStage(1); + StartStage(2); break; case StagingManager.StageEnum.Level2: - StartStage(2); + StartStage(4); break; case StagingManager.StageEnum.Level3: break;