diff --git a/Assets/Materials/BollMaterial.mat b/Assets/Materials/BallMaterial.mat similarity index 99% rename from Assets/Materials/BollMaterial.mat rename to Assets/Materials/BallMaterial.mat index d6ddc51..ce90757 100644 --- a/Assets/Materials/BollMaterial.mat +++ b/Assets/Materials/BallMaterial.mat @@ -20,7 +20,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: BollMaterial + m_Name: BallMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/BollMaterial.mat.meta b/Assets/Materials/BallMaterial.mat.meta similarity index 100% rename from Assets/Materials/BollMaterial.mat.meta rename to Assets/Materials/BallMaterial.mat.meta diff --git a/Assets/Materials/beton_floor.mat b/Assets/Materials/FloorMAterial.mat similarity index 99% rename from Assets/Materials/beton_floor.mat rename to Assets/Materials/FloorMAterial.mat index 01d795d..eb6787d 100644 --- a/Assets/Materials/beton_floor.mat +++ b/Assets/Materials/FloorMAterial.mat @@ -20,7 +20,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: beton_floor + m_Name: FloorMAterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/beton_floor.mat.meta b/Assets/Materials/FloorMAterial.mat.meta similarity index 100% rename from Assets/Materials/beton_floor.mat.meta rename to Assets/Materials/FloorMAterial.mat.meta diff --git a/Assets/Materials/GolvMaterial.mat b/Assets/Materials/GolvMaterial.mat deleted file mode 100644 index ccbd047..0000000 --- a/Assets/Materials/GolvMaterial.mat +++ /dev/null @@ -1,137 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-9084567961205071613 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion - version: 10 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: GolvMaterial - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _XRMotionVectorsPass: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/Materials/GolvMaterial.mat.meta b/Assets/Materials/GolvMaterial.mat.meta deleted file mode 100644 index 0b4ec44..0000000 --- a/Assets/Materials/GolvMaterial.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aa7bfebc785514c88b857722eeb3bc73 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Walls.mat b/Assets/Materials/WallsMaterial.mat similarity index 99% rename from Assets/Materials/Walls.mat rename to Assets/Materials/WallsMaterial.mat index f5f7371..d85e1c3 100644 --- a/Assets/Materials/Walls.mat +++ b/Assets/Materials/WallsMaterial.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Walls + m_Name: WallsMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/Walls.mat.meta b/Assets/Materials/WallsMaterial.mat.meta similarity index 100% rename from Assets/Materials/Walls.mat.meta rename to Assets/Materials/WallsMaterial.mat.meta diff --git a/Assets/Scenes/Spelscenen.unity b/Assets/Scenes/PlayScene.unity similarity index 98% rename from Assets/Scenes/Spelscenen.unity rename to Assets/Scenes/PlayScene.unity index adb19ad..a2b8cc5 100644 --- a/Assets/Scenes/Spelscenen.unity +++ b/Assets/Scenes/PlayScene.unity @@ -505,7 +505,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 289752838} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -520,7 +520,7 @@ Transform: - {fileID: 1127888701} - {fileID: 1160345382} - {fileID: 1630670139} - m_Father: {fileID: 0} + m_Father: {fileID: 1267247728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &330585543 GameObject: @@ -1171,7 +1171,7 @@ RectTransform: - {fileID: 2068688504} - {fileID: 415042089} - {fileID: 1504091395} - m_Father: {fileID: 0} + m_Father: {fileID: 753255022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1318,7 +1318,7 @@ GameObject: - component: {fileID: 712895111} - component: {fileID: 712895112} m_Layer: 0 - m_Name: Boll + m_Name: Player m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1461,6 +1461,40 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &753255021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 753255022} + m_Layer: 0 + m_Name: UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &753255022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 753255021} + 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: + - {fileID: 458923165} + - {fileID: 1743262532} + - {fileID: 1816127644} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &760127634 GameObject: m_ObjectHideFlags: 0 @@ -2227,12 +2261,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1155557693} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 1, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1267247728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1160345381 GameObject: @@ -2359,6 +2393,41 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1160345381} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1267247727 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1267247728} + m_Layer: 0 + m_Name: LevelComponents + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1267247728 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267247727} + 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: + - {fileID: 1155557697} + - {fileID: 1713218190} + - {fileID: 289752839} + - {fileID: 1649635040} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1389653249 GameObject: m_ObjectHideFlags: 0 @@ -2950,12 +3019,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1649635038} serializedVersion: 2 - m_LocalRotation: {x: 0.36650118, y: 0, z: 0, w: 0.9304176} + m_LocalRotation: {x: 0.36650118, y: -0, z: -0, w: 0.9304176} m_LocalPosition: {x: 0, y: -15.9, z: 11.7} m_LocalScale: {x: 15, y: 15, z: 15} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1267247728} m_LocalEulerAnglesHint: {x: 43, y: 0, z: 0} --- !u!1 &1713218189 GameObject: @@ -2981,7 +3050,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1713218189} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -2990,7 +3059,7 @@ Transform: - {fileID: 1389653253} - {fileID: 36801911} - {fileID: 760127638} - m_Father: {fileID: 0} + m_Father: {fileID: 1267247728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1743262529 GameObject: @@ -3064,12 +3133,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1743262529} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Father: {fileID: 753255022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1809473639 GameObject: @@ -3237,7 +3306,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b30979357526f74697e6c11ac9dae81, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::SceneLoader - SceneName: Spelscenen + SceneName: PlayScene --- !u!4 &1816127644 Transform: m_ObjectHideFlags: 0 @@ -3246,12 +3315,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1816127642} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Father: {fileID: 753255022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1852203214 GameObject: @@ -3787,10 +3856,5 @@ SceneRoots: - {fileID: 410087041} - {fileID: 832575519} - {fileID: 712895110} - - {fileID: 1155557697} - - {fileID: 1713218190} - - {fileID: 289752839} - - {fileID: 1649635040} - - {fileID: 458923165} - - {fileID: 1743262532} - - {fileID: 1816127644} + - {fileID: 753255022} + - {fileID: 1267247728} diff --git a/Assets/Scenes/Spelscenen.unity.meta b/Assets/Scenes/PlayScene.unity.meta similarity index 100% rename from Assets/Scenes/Spelscenen.unity.meta rename to Assets/Scenes/PlayScene.unity.meta diff --git a/Assets/Scenes/Startscen.unity b/Assets/Scenes/Startscen.unity index 1b2634b..34b4460 100644 --- a/Assets/Scenes/Startscen.unity +++ b/Assets/Scenes/Startscen.unity @@ -1071,7 +1071,7 @@ GameObject: - component: {fileID: 2125563086} - component: {fileID: 2125563085} m_Layer: 0 - m_Name: ScenHanterare + m_Name: SceneHandler m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1089,7 +1089,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b30979357526f74697e6c11ac9dae81, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::SceneLoader - SceneName: Spelscenen + SceneName: PlayScene --- !u!4 &2125563086 Transform: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index a14d2aa..e4273c3 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -9,10 +9,10 @@ EditorBuildSettings: path: Assets/Scenes/SampleScene.unity guid: 99c9720ab356a0642a771bea13969a05 - enabled: 1 - path: Assets/Scenes/Startscen.unity + path: Assets/Scenes/StartScen.unity guid: 8bd4a446a09bf184d9943b3a668c15da - enabled: 1 - path: Assets/Scenes/Spelscenen.unity + path: Assets/Scenes/PlayScene.unity guid: 2ee9861d6c487064ba78e72cd689a0bc m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}