diff --git a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide index 0d743fd..585c1a3 100644 Binary files a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide and b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide differ diff --git a/Assets/Models.meta b/Assets/Models.meta index f0d1d7a..790177f 100644 --- a/Assets/Models.meta +++ b/Assets/Models.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 221f59743ddbd6f4499068d6e2346801 +======= +guid: cc5f477244ac66a4394363c5edc7fd57 +>>>>>>> 14b5192e2a8dc351d782d946fcd2d6e2126515d5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Models/Materials.meta b/Assets/Models/Materials.meta new file mode 100644 index 0000000..236028e --- /dev/null +++ b/Assets/Models/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad36b1dbdf8dcb442bd5415e0fd3fcbc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/cabin-Material.001.mat b/Assets/Models/Materials/cabin-Material.001.mat new file mode 100644 index 0000000..a242ad0 --- /dev/null +++ b/Assets/Models/Materials/cabin-Material.001.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: cabin-Material.001 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Models/Materials/cabin-Material.001.mat.meta b/Assets/Models/Materials/cabin-Material.001.mat.meta new file mode 100644 index 0000000..9818f73 --- /dev/null +++ b/Assets/Models/Materials/cabin-Material.001.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e8eb75b78fd9c84ebca4caf9ae23718 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/cabin-Material.003.mat b/Assets/Models/Materials/cabin-Material.003.mat new file mode 100644 index 0000000..5d93f48 --- /dev/null +++ b/Assets/Models/Materials/cabin-Material.003.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: cabin-Material.003 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Models/Materials/cabin-Material.003.mat.meta b/Assets/Models/Materials/cabin-Material.003.mat.meta new file mode 100644 index 0000000..5570f3e --- /dev/null +++ b/Assets/Models/Materials/cabin-Material.003.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d921e97a28ce89448e7bd14e8798f50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/cabin-No Name.mat b/Assets/Models/Materials/cabin-No Name.mat new file mode 100644 index 0000000..843105b --- /dev/null +++ b/Assets/Models/Materials/cabin-No Name.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: cabin-No Name + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Models/Materials/cabin-No Name.mat.meta b/Assets/Models/Materials/cabin-No Name.mat.meta new file mode 100644 index 0000000..ca5b8a2 --- /dev/null +++ b/Assets/Models/Materials/cabin-No Name.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce354a5c0733f504a80258f9249812ae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/cabin.blend.meta b/Assets/Models/cabin.blend.meta index fb034be..458e261 100644 --- a/Assets/Models/cabin.blend.meta +++ b/Assets/Models/cabin.blend.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: babc4ee5f4c7fe24a895b5687e946a8e +======= +guid: 2950efeb5e0d70a46ad3a724c99ee881 +>>>>>>> 14b5192e2a8dc351d782d946fcd2d6e2126515d5 ModelImporter: serializedVersion: 19300 internalIDToNameTable: [] @@ -35,14 +39,23 @@ ModelImporter: meshes: lODScreenPercentages: [] globalScale: 1 +<<<<<<< HEAD meshCompression: 1 +======= + meshCompression: 0 +>>>>>>> 14b5192e2a8dc351d782d946fcd2d6e2126515d5 addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 importVisibility: 1 importBlendShapes: 1 +<<<<<<< HEAD importCameras: 0 importLights: 0 +======= + importCameras: 1 + importLights: 1 +>>>>>>> 14b5192e2a8dc351d782d946fcd2d6e2126515d5 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 diff --git a/Assets/Models/cabin.blend1.meta b/Assets/Models/cabin.blend1.meta index 0dfc694..ef0c07b 100644 --- a/Assets/Models/cabin.blend1.meta +++ b/Assets/Models/cabin.blend1.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: b9c6e76de9f64134bae9a4e67c1d6463 +======= +guid: d7bff1f27416cea47b0d93055ee9e34a +>>>>>>> 14b5192e2a8dc351d782d946fcd2d6e2126515d5 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000..b0fefba --- /dev/null +++ b/Assets/Prefabs/Player.prefab @@ -0,0 +1,165 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7985979212931499537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7985979212931499549} + - component: {fileID: 7985979212931499548} + - component: {fileID: 7985979212931499551} + - component: {fileID: 7985979212931499550} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7985979212931499549 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7985979212931499537} + 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_Children: + - {fileID: 7985979213387740674} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7985979212931499548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7985979212931499537} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 885220d038aa1a6468127c63dd90a926, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 10 + runSpeed: 15 + rotateSpeed: 5 + mouseSensitive: 200 +--- !u!136 &7985979212931499551 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7985979212931499537} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 1, z: 0} +--- !u!54 &7985979212931499550 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7985979212931499537} + serializedVersion: 2 + m_Mass: 70 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 80 + m_CollisionDetection: 0 +--- !u!1 &7985979213387740679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7985979213387740674} + - component: {fileID: 7985979213387740677} + - component: {fileID: 7985979213387740676} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7985979213387740674 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7985979213387740679} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.9, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7985979212931499549} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &7985979213387740677 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7985979213387740679} + 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_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + 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: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &7985979213387740676 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7985979213387740679} + m_Enabled: 1 diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 0000000..e6dbd42 --- /dev/null +++ b/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 204c7411afdd01a478b1a1e25607d50c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test-Haitem.unity b/Assets/Scenes/Test-Haitem.unity index 6906482..c27f3e7 100644 --- a/Assets/Scenes/Test-Haitem.unity +++ b/Assets/Scenes/Test-Haitem.unity @@ -38,13 +38,13 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 11 - m_GIWorkflowMode: 0 + m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -121,86 +121,46 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &380083559 +--- !u!1 &391253621 stripped GameObject: + m_CorrespondingSourceObject: {fileID: 3667633384733631754, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + m_PrefabInstance: {fileID: 1260635599} + m_PrefabAsset: {fileID: 0} +--- !u!64 &391253622 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 380083563} - - component: {fileID: 380083562} - - component: {fileID: 380083561} - - component: {fileID: 380083560} - m_Layer: 0 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!54 &380083560 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 380083559} - serializedVersion: 2 - m_Mass: 70 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 80 - m_CollisionDetection: 0 ---- !u!136 &380083561 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 380083559} + m_GameObject: {fileID: 391253621} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 1, z: 0} ---- !u!114 &380083562 -MonoBehaviour: + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -2228417370725966487, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3} +--- !u!1 &531707007 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7469484624682501897, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + m_PrefabInstance: {fileID: 1260635599} + m_PrefabAsset: {fileID: 0} +--- !u!64 &531707008 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 380083559} + m_GameObject: {fileID: 531707007} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 885220d038aa1a6468127c63dd90a926, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 10 - runSpeed: 15 - rotateSpeed: 5 - mouseSensitive: 200 ---- !u!4 &380083563 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 380083559} - 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_Children: - - {fileID: 963194228} - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -1550514412580984892, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -293,89 +253,26 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &963194225 +--- !u!1 &742958227 stripped GameObject: + m_CorrespondingSourceObject: {fileID: -492420421572216379, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + m_PrefabInstance: {fileID: 1260635599} + m_PrefabAsset: {fileID: 0} +--- !u!64 &742958228 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 963194228} - - component: {fileID: 963194227} - - component: {fileID: 963194226} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &963194226 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} + m_GameObject: {fileID: 742958227} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 ---- !u!20 &963194227 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} - 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_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - 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: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &963194228 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 380083563} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -8678823145569952518, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3} --- !u!1 &1012541192 GameObject: m_ObjectHideFlags: 0 @@ -467,8 +364,172 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1046847972 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -594094835925579944, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + m_PrefabInstance: {fileID: 1260635599} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1046847973 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046847972} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2212009239438826721, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3} +--- !u!1 &1083437162 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6203755416157869376, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + m_PrefabInstance: {fileID: 1260635599} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1083437163 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1083437162} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5611087096184871397, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3} +--- !u!1 &1139821472 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4695666576454475813, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + m_PrefabInstance: {fileID: 1260635599} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1139821473 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139821472} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4493585093827132993, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3} +--- !u!1001 &1260635599 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.68 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + propertyPath: m_Name + value: cabin + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3} +--- !u!1 &1432614924 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -7462036371361415008, guid: babc4ee5f4c7fe24a895b5687e946a8e, + type: 3} + m_PrefabInstance: {fileID: 1260635599} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1432614925 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432614924} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5053925668127403250, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3} --- !u!1 &1655437821 GameObject: m_ObjectHideFlags: 0 @@ -560,5 +621,79 @@ Transform: m_LocalScale: {x: 100, y: 0.1, z: 100} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &7985979212702423926 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7985979212931499537, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: runSpeed + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} diff --git a/Assets/Scripts/BlockManager.cs b/Assets/Scripts/BlockManager.cs new file mode 100644 index 0000000..85b23d6 --- /dev/null +++ b/Assets/Scripts/BlockManager.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BlockManager : MonoBehaviour +{ + public enum BlockType {None, Barricade}; + public BlockType blockType = BlockType.None; + public GameObject block; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/BlockManager.cs.meta b/Assets/Scripts/BlockManager.cs.meta new file mode 100644 index 0000000..f1c7333 --- /dev/null +++ b/Assets/Scripts/BlockManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a26079dbac7f3cd4bacb95972241b8cb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs new file mode 100644 index 0000000..91948cc --- /dev/null +++ b/Assets/Scripts/PlayerManager.cs @@ -0,0 +1,119 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerManager : MonoBehaviour +{ + + public float speed = 10; + public float runSpeed = 25; + public float rotateSpeed = 5; + public float mouseSensitive = 200; + private bool run = false; + private Camera playerCamera; + private Rigidbody rigidBody; + public List weaponList = new List(); + [HideInInspector]public int selectedWeapon = 0; + public List weaponHandList = new List(); + + + // Start is called before the first frame update + void Start() + { + playerCamera = GetComponentInChildren(); + rigidBody = GetComponent(); + Cursor.lockState = CursorLockMode.Locked; + Cursor.visible = false; + } + + // Update is called once per frame + void Update() + { + Move(); + RunSwitch(); + selectWeapon(); + } + + void FixedUpdate() + { + Rotate(); + } + + void Move() + { + rigidBody.MovePosition( + transform.position + + (transform.forward * (run ? runSpeed : speed) * Input.GetAxis("Vertical") * Time.deltaTime) + + (transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime) + ); + } + + void Rotate() + { + transform.Rotate(new Vector3(0, rotateSpeed * Input.GetAxis("Mouse X") * mouseSensitive * Time.deltaTime, 0)); + if ( + ((playerCamera.transform.localEulerAngles.x >= 270 && playerCamera.transform.localEulerAngles.x <= 360) && + playerCamera.transform.localEulerAngles.y == 0 && + playerCamera.transform.localEulerAngles.z == 0) || + ((playerCamera.transform.localEulerAngles.x <= 90 && playerCamera.transform.localEulerAngles.x >= 0) && + playerCamera.transform.localEulerAngles.y == 0 && + playerCamera.transform.localEulerAngles.z == 0) + ) { + playerCamera.transform.Rotate(new Vector3(rotateSpeed * -Input.GetAxis("Mouse Y") * mouseSensitive * Time.deltaTime, 0, 0)); + } else if ( + ((playerCamera.transform.localEulerAngles.x >= 270 && playerCamera.transform.localEulerAngles.x <= 360) && + playerCamera.transform.localEulerAngles.y == 180 && + playerCamera.transform.localEulerAngles.z == 180) + ) { + playerCamera.transform.Rotate(new Vector3(rotateSpeed * (-Input.GetAxis("Mouse Y") > 0 ? -Input.GetAxis("Mouse Y") : 0) * mouseSensitive * Time.deltaTime, 0, 0)); + } else if ( + ((playerCamera.transform.localEulerAngles.x <= 90 && playerCamera.transform.localEulerAngles.x >= 0) && + playerCamera.transform.localEulerAngles.y == 180 && + playerCamera.transform.localEulerAngles.z == 180) + ) { + playerCamera.transform.Rotate(new Vector3(rotateSpeed * (-Input.GetAxis("Mouse Y") < 0 ? -Input.GetAxis("Mouse Y") : 0) * mouseSensitive * Time.deltaTime, 0, 0)); + } + } + + void RunSwitch() + { + if (Input.GetAxisRaw("Run") > 0) + { + run = true; + } + else + { + run = false; + } + } + + void selectWeapon() + { + if (weaponList.Count > 0 && weaponHandList.Count == weaponList.Count) + { + weaponHandList[selectedWeapon].SetActive(false); + if (Input.mouseScrollDelta.y > 0) + { + if (weaponList.Count > selectedWeapon + 1) { + selectedWeapon++; + } + else + { + selectedWeapon = 0; + } + } + else if (Input.mouseScrollDelta.y < 0) + { + if (selectedWeapon > 0) + { + selectedWeapon--; + } + else + { + selectedWeapon = weaponList.Count - 1; + } + } + weaponHandList[selectedWeapon].SetActive(true); + } + } +} diff --git a/Assets/Scripts/Player_Manager.cs.meta b/Assets/Scripts/PlayerManager.cs.meta similarity index 100% rename from Assets/Scripts/Player_Manager.cs.meta rename to Assets/Scripts/PlayerManager.cs.meta diff --git a/Assets/Scripts/Player_Manager.cs b/Assets/Scripts/Player_Manager.cs deleted file mode 100644 index c2c2f87..0000000 --- a/Assets/Scripts/Player_Manager.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Player_Manager : MonoBehaviour -{ - - public float speed = 10; - public float runSpeed = 15; - public float rotateSpeed = 5; - public float mouseSensitive = 200; - private bool run = false; - private Camera playerCamera; - private Rigidbody rigidBody; - - - // Start is called before the first frame update - void Start() - { - playerCamera = GetComponentInChildren(); - rigidBody = GetComponent(); - } - - // Update is called once per frame - void Update() - { - Move(); - } - - void FixedUpdate() - { - Rotate(); - } - - void Move() - { - rigidBody.MovePosition( - transform.position + - (transform.forward * (run ? runSpeed : speed) * Input.GetAxis("Vertical") * Time.deltaTime) + - (transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime) - ); - } - - void Rotate() - { - transform.Rotate(new Vector3(0, rotateSpeed * Input.GetAxis("Mouse X") * mouseSensitive * Time.deltaTime, 0)); - - if ( - (playerCamera.transform.localEulerAngles.x > 271 && playerCamera.transform.localEulerAngles.x < 360) && - playerCamera.transform.localEulerAngles.y == 0 && - playerCamera.transform.localEulerAngles.z == 0 - ) { - playerCamera.transform.Rotate(new Vector3(rotateSpeed * -Input.GetAxis("Mouse Y") * mouseSensitive * Time.deltaTime, 0, 0)); - } - } -} diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 17c8f53..0a5364e 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -101,6 +101,22 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Run + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 - serializedVersion: 3 m_Name: Mouse X descriptiveName: