diff --git a/Assets/Pics_Materials/map2.jpg b/Assets/Pics_Materials/map2.jpg new file mode 100644 index 0000000..215d312 Binary files /dev/null and b/Assets/Pics_Materials/map2.jpg differ diff --git a/Assets/Pics_Materials/map2.jpg.meta b/Assets/Pics_Materials/map2.jpg.meta new file mode 100644 index 0000000..b54153f --- /dev/null +++ b/Assets/Pics_Materials/map2.jpg.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 72ed3652e97b6d944991b49268c4603d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/AR.prefab b/Assets/Prefabs/AR.prefab index ef814ef..75210aa 100644 --- a/Assets/Prefabs/AR.prefab +++ b/Assets/Prefabs/AR.prefab @@ -224,6 +224,37 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &2419706330575798562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7448449092846401218} + m_Layer: 0 + m_Name: Muzzle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7448449092846401218 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2419706330575798562} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.014, y: -1.6178, z: 0.008} + m_LocalScale: {x: 0.7795448, y: 0.77954465, z: 0.27654868} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3945699778904299871} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4628214535345608438 GameObject: m_ObjectHideFlags: 0 @@ -373,6 +404,7 @@ Transform: - {fileID: 3358950876010158595} - {fileID: 4994417827637223817} - {fileID: 9091445594414695264} + - {fileID: 7448449092846401218} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &8402877828330663370 diff --git a/Assets/Scenes/Test_Scene.unity b/Assets/Scenes/Test_Scene.unity index e95cab1..c6237f0 100644 --- a/Assets/Scenes/Test_Scene.unity +++ b/Assets/Scenes/Test_Scene.unity @@ -489,161 +489,80 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1000010070 -GameObject: +--- !u!1001 &1112380836 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1000010076} - - component: {fileID: 1000010075} - - component: {fileID: 1000010074} - - component: {fileID: 1000010073} - - component: {fileID: 1000010072} - - component: {fileID: 1000010071} - m_Layer: 0 - m_Name: Capsule - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1000010071 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1000010070} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5e857b6f5c4484c449d9e726f2fc5d36, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::PlayerController ---- !u!54 &1000010072 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1000010070} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!136 &1000010073 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1000010070} - 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: 2 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1000010074 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1000010070} - m_Enabled: 1 - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - 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_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1000010075 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1000010070} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1000010076 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4140538247651255256} + m_Modifications: + - target: {fileID: 1345163984726252992, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_Name + value: Munition (1) + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalScale.x + value: 0.5355531 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalScale.y + value: 0.35106266 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalScale.z + value: 0.06261455 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalPosition.x + value: 0.013612632 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.4932232 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalPosition.z + value: -0.08104772 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.71056306 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalRotation.x + value: -0.70363355 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 95.061005 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} +--- !u!4 &1112380837 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} + m_PrefabInstance: {fileID: 1112380836} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1000010070} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.68884, y: 0, z: -8.49082} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1741774807 GameObject: m_ObjectHideFlags: 0 @@ -673,7 +592,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 079eca2fab980b94ea6d88afb4570141, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Map_Generator - tex: {fileID: 2800000, guid: e80b4a87182284848b2ae78a963dc5fc, type: 3} + tex: {fileID: 2800000, guid: 72ed3652e97b6d944991b49268c4603d, type: 3} width: 0 heigt: 0 pixelFarbe: [] @@ -834,7 +753,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} propertyPath: m_LocalPosition.y - value: 3.96 + value: 4.04 objectReference: {fileID: 0} - target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} propertyPath: m_LocalPosition.z @@ -874,9 +793,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3358950876010158595, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} + insertIndex: -1 + addedObject: {fileID: 1112380837} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} +--- !u!4 &4140538247651255256 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3358950876010158595, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} + m_PrefabInstance: {fileID: 4140538247651255255} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6183749844758426995 PrefabInstance: m_ObjectHideFlags: 0 @@ -947,4 +874,3 @@ SceneRoots: - {fileID: 1055045214131575311} - {fileID: 6183749844758426995} - {fileID: 454556875} - - {fileID: 1000010076} diff --git a/Assets/Scripts/Shoot.cs b/Assets/Scripts/Shoot.cs new file mode 100644 index 0000000..9eabb56 --- /dev/null +++ b/Assets/Scripts/Shoot.cs @@ -0,0 +1,24 @@ +using UnityEngine; + +public class Shoot : MonoBehaviour +{ + [SerializeField] GameObject bulletPrefab; + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (Input.GetKeyDown(KeyCode.Mouse0)) + { + Shot(); + } + } + public void Shot() + { + Instantiate(bulletPrefab); + } +} diff --git a/Assets/Scripts/Shoot.cs.meta b/Assets/Scripts/Shoot.cs.meta new file mode 100644 index 0000000..2e1ee84 --- /dev/null +++ b/Assets/Scripts/Shoot.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a10d4b5b33d924c428453e46c9513163 \ No newline at end of file diff --git a/Assets/StarterAssets/Environment/RenderPipelineProfiles/StarterAssetsURPAsset.asset b/Assets/StarterAssets/Environment/RenderPipelineProfiles/StarterAssetsURPAsset.asset index 79ebbbb..5879724 100644 --- a/Assets/StarterAssets/Environment/RenderPipelineProfiles/StarterAssetsURPAsset.asset +++ b/Assets/StarterAssets/Environment/RenderPipelineProfiles/StarterAssetsURPAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: StarterAssetsURPAsset m_EditorClassIdentifier: - k_AssetVersion: 12 - k_AssetPreviousVersion: 12 + k_AssetVersion: 13 + k_AssetPreviousVersion: 13 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -53,6 +53,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierHigh: 1024 m_ReflectionProbeBlending: 0 m_ReflectionProbeBoxProjection: 0 + m_ReflectionProbeAtlas: 1 m_ShadowDistance: 50 m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 @@ -127,8 +128,14 @@ MonoBehaviour: m_PrefilterSoftShadowsQualityHigh: 0 m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 0 + m_PrefilterScreenSpaceIrradiance: 0 m_PrefilterNativeRenderPass: 0 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterBicubicLightmapSampling: 0 + m_PrefilterReflectionProbeRotation: 0 + m_PrefilterReflectionProbeBlending: 0 + m_PrefilterReflectionProbeBoxProjection: 0 + m_PrefilterReflectionProbeAtlas: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: