diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index f37d4420..d19c1e5f 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.1451428, g: 0.16105962, b: 0.16197124, a: 1} + m_IndirectSpecularColor: {r: 0.14514297, g: 0.16106007, b: 0.16197146, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -31184,12 +31184,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} serializedVersion: 2 - m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} - m_LocalPosition: {x: 27.69, y: 7.0699997, z: -9.3} + m_LocalRotation: {x: 0.38268343, y: -0, z: -0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 3.5355341, z: -3.5355334} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1309782458} m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} --- !u!1001 &963261780 PrefabInstance: @@ -34768,6 +34768,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1066618220} m_Mesh: {fileID: 5691666353457927829, guid: d0a2dbd0fe7556b4b822ec7a20748cc1, type: 3} +--- !u!1001 &1067027570 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalPosition.x + value: 44.270943 + objectReference: {fileID: 0} + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2958336 + objectReference: {fileID: 0} + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4442944900773098291, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_Name + value: Pizza_Vending_Machine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} --- !u!1001 &1069280573 PrefabInstance: m_ObjectHideFlags: 0 @@ -41524,6 +41581,54 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.0274248, y: 1, z: 1.0274248} m_Center: {x: 0, y: 0.5, z: 0} +--- !u!1 &1309782456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1309782458} + - component: {fileID: 1309782457} + m_Layer: 0 + m_Name: Camera Pivot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1309782457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309782456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69662b2e17f93e54d8e52fca91af8c51, type: 3} + m_Name: + m_EditorClassIdentifier: + _character: {fileID: 1573807344} + _camera: {fileID: 963194227} + Distance: 5 +--- !u!4 &1309782458 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309782456} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 34.09025, y: 0.55999947, z: -2.452814} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 963194228} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1310365488 GameObject: m_ObjectHideFlags: 0 @@ -50992,6 +51097,24 @@ MonoBehaviour: m_DefaultActionMap: Player m_SplitScreenIndex: -1 m_Camera: {fileID: 0} +--- !u!114 &1573807357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573807341} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3} + m_Name: + m_EditorClassIdentifier: + outlineMode: 2 + outlineColor: {r: 1, g: 1, b: 1, a: 1} + outlineWidth: 2 + precomputeOutline: 0 + bakeKeys: [] + bakeValues: [] --- !u!1 &1577864189 GameObject: m_ObjectHideFlags: 0 @@ -69345,6 +69468,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} insertIndex: -1 addedObject: {fileID: 1573807356} + - targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} + insertIndex: -1 + addedObject: {fileID: 1573807357} m_SourcePrefab: {fileID: 100100000, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} --- !u!23 &87716553343573121 MeshRenderer: @@ -90164,7 +90290,7 @@ MeshFilter: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 963194228} + - {fileID: 1309782458} - {fileID: 1887129442} - {fileID: 1891423499} - {fileID: 83611174122365960} @@ -90177,3 +90303,4 @@ SceneRoots: - {fileID: 1086008406} - {fileID: 1405922518} - {fileID: 1756968848} + - {fileID: 1067027570}