From 980af5b664352679fd1c5fc1f50de388f5db1d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Schl=C3=B6sser?= Date: Sat, 21 Sep 2019 19:19:15 +0200 Subject: [PATCH] Finished Game --- Assets/_Game/MainMenu/Bluescreen.unity | 138 ++++++++++++++++++ Assets/_Game/MainMenu/Credits.unity | 69 +++++++++ .../Data/Actual Games/Scribble Fall.asset | 2 +- .../{MainMenu => }/Prefabs/Hide Cursor.prefab | 0 .../Prefabs/Hide Cursor.prefab.meta | 0 Assets/_Game/Scribble Fall/Scribblefall.unity | 2 +- Assets/_Game/SuperPlumber/SuperPlumber0.unity | 77 +++++++++- Assets/_Game/Tertis/Scenes/Tertis.unity | 71 ++++++++- ProjectSettings/ProjectSettings.asset | 2 +- 9 files changed, 353 insertions(+), 8 deletions(-) rename Assets/_Game/{MainMenu => }/Prefabs/Hide Cursor.prefab (100%) rename Assets/_Game/{MainMenu => }/Prefabs/Hide Cursor.prefab.meta (100%) diff --git a/Assets/_Game/MainMenu/Bluescreen.unity b/Assets/_Game/MainMenu/Bluescreen.unity index a7f139d..11126cf 100644 --- a/Assets/_Game/MainMenu/Bluescreen.unity +++ b/Assets/_Game/MainMenu/Bluescreen.unity @@ -120,6 +120,75 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &141808363 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3585312758139465632, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_Name + value: Hide Cursor + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 02dd07d20a0de364683e7ef406b40c10, type: 3} --- !u!1 &251314226 GameObject: m_ObjectHideFlags: 0 @@ -451,6 +520,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cf14fdd0034610d4389779e64b8989d1, type: 3} +--- !u!1001 &1909819825 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7974195246117068452, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_Name + value: Return to Main Menu + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, type: 3} --- !u!1 &2133193050 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Game/MainMenu/Credits.unity b/Assets/_Game/MainMenu/Credits.unity index 11b2a0e..2fe38b2 100644 --- a/Assets/_Game/MainMenu/Credits.unity +++ b/Assets/_Game/MainMenu/Credits.unity @@ -426,6 +426,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cf14fdd0034610d4389779e64b8989d1, type: 3} +--- !u!1001 &614521259 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7974195246117068452, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_Name + value: Return to Main Menu + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, type: 3} --- !u!1 &811235601 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Game/MainMenu/Data/Actual Games/Scribble Fall.asset b/Assets/_Game/MainMenu/Data/Actual Games/Scribble Fall.asset index df322e5..8fb1710 100644 --- a/Assets/_Game/MainMenu/Data/Actual Games/Scribble Fall.asset +++ b/Assets/_Game/MainMenu/Data/Actual Games/Scribble Fall.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 84c523596ac9b3048a65aa0732219edd, type: 3} m_Name: Scribble Fall m_EditorClassIdentifier: - scenePath: Assets/_Game/Scribble Fall/Scenes/Gameplay.unity + scenePath: Assets/_Game/Scribble Fall/Scribblefall.unity displayName: Scribble Fall sprite: {fileID: 21300000, guid: e069a82c3d897f64e89d74f10d9bd0ba, type: 3} diff --git a/Assets/_Game/MainMenu/Prefabs/Hide Cursor.prefab b/Assets/_Game/Prefabs/Hide Cursor.prefab similarity index 100% rename from Assets/_Game/MainMenu/Prefabs/Hide Cursor.prefab rename to Assets/_Game/Prefabs/Hide Cursor.prefab diff --git a/Assets/_Game/MainMenu/Prefabs/Hide Cursor.prefab.meta b/Assets/_Game/Prefabs/Hide Cursor.prefab.meta similarity index 100% rename from Assets/_Game/MainMenu/Prefabs/Hide Cursor.prefab.meta rename to Assets/_Game/Prefabs/Hide Cursor.prefab.meta diff --git a/Assets/_Game/Scribble Fall/Scribblefall.unity b/Assets/_Game/Scribble Fall/Scribblefall.unity index b35298e..00ae499 100644 --- a/Assets/_Game/Scribble Fall/Scribblefall.unity +++ b/Assets/_Game/Scribble Fall/Scribblefall.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_UseShadowmask: 0 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 diff --git a/Assets/_Game/SuperPlumber/SuperPlumber0.unity b/Assets/_Game/SuperPlumber/SuperPlumber0.unity index 9ce6ef2..ece5fff 100644 --- a/Assets/_Game/SuperPlumber/SuperPlumber0.unity +++ b/Assets/_Game/SuperPlumber/SuperPlumber0.unity @@ -258,7 +258,7 @@ PrefabInstance: - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1069565521599366162, guid: 02dd07d20a0de364683e7ef406b40c10, type: 3} @@ -320,7 +320,7 @@ Transform: m_Children: - {fileID: 1095744093} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1839735485 &390885199 Tilemap: @@ -509,8 +509,77 @@ Transform: m_LocalScale: {x: 14.9401245, y: 34.93, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &872959519 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7974195246117068452, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_Name + value: Return to Main Menu + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, type: 3} --- !u!1 &889367516 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4108308250176257726, guid: b48ec0f6e1fdebf48859b2bddd70b7ab, @@ -3146,7 +3215,7 @@ PrefabInstance: - target: {fileID: 6780345425153873238, guid: b48ec0f6e1fdebf48859b2bddd70b7ab, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 6780345425153873238, guid: b48ec0f6e1fdebf48859b2bddd70b7ab, type: 3} diff --git a/Assets/_Game/Tertis/Scenes/Tertis.unity b/Assets/_Game/Tertis/Scenes/Tertis.unity index a410a16..fec16e6 100644 --- a/Assets/_Game/Tertis/Scenes/Tertis.unity +++ b/Assets/_Game/Tertis/Scenes/Tertis.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_UseShadowmask: 0 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -2000,6 +2000,75 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 869949095} m_CullTransparentMesh: 0 +--- !u!1001 &947416283 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7974195246117068452, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_Name + value: Return to Main Menu + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2801783352397115576, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51d7f77f62fe8f3418a499f55d5d5b6a, type: 3} --- !u!1 &1000356847 GameObject: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0abad77..4c3812d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: HochschuleTrier - productName: GameDevWeek + productName: Supergame Box defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} -- GitLab