diff --git a/Assets/Prefabs/AR.prefab b/Assets/Prefabs/AR.prefab index 75210aa..6fda78a 100644 --- a/Assets/Prefabs/AR.prefab +++ b/Assets/Prefabs/AR.prefab @@ -124,6 +124,7 @@ GameObject: - component: {fileID: 544493013632528032} - component: {fileID: 1281095378038919116} - component: {fileID: 536243226925001407} + - component: {fileID: 6577416588327676514} m_Layer: 0 m_Name: Magazin m_TagString: Untagged @@ -143,7 +144,8 @@ Transform: m_LocalPosition: {x: 0.212, y: 0.0055308715, z: 1.0134083} m_LocalScale: {x: 0.17445877, y: 1.4734803, z: 0.17246339} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8106650884638092069} m_Father: {fileID: 3945699778904299871} m_LocalEulerAnglesHint: {x: 94.5, y: 0, z: 0} --- !u!33 &544493013632528032 @@ -224,6 +226,255 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!95 &6577416588327676514 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616760358415966690} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d489640b78374334c842856c1704b741, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &1106370384454530052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2738580378295177801} + - component: {fileID: 8526056759557678377} + - component: {fileID: 382357218144423143} + - component: {fileID: 6333319151337256526} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2738580378295177801 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1106370384454530052} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.52709705, z: 0} + m_LocalScale: {x: 0.9487386, y: 0.94873834, z: 2.2373555} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8106650884638092069} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8526056759557678377 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1106370384454530052} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &382357218144423143 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1106370384454530052} + 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: bf739c48a51448b40b5c18a13e64606c, 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!135 &6333319151337256526 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1106370384454530052} + 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: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1345163984726252992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8106650884638092069} + - component: {fileID: 2145416997532695745} + - component: {fileID: 365273443409107270} + - component: {fileID: 6757658965492992778} + m_Layer: 0 + m_Name: Munition (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8106650884638092069 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345163984726252992} + serializedVersion: 2 + m_LocalRotation: {x: -0.70363355, y: -0, z: -0, w: 0.71056306} + m_LocalPosition: {x: 0.013612632, y: -0.4932232, z: -0.08104772} + m_LocalScale: {x: 0.5355531, y: 0.35106266, z: 0.06261455} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2738580378295177801} + m_Father: {fileID: 3358950876010158595} + m_LocalEulerAnglesHint: {x: 95.061005, y: 0, z: 0} +--- !u!33 &2145416997532695745 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345163984726252992} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &365273443409107270 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345163984726252992} + 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: bf739c48a51448b40b5c18a13e64606c, 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!136 &6757658965492992778 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345163984726252992} + 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.5000001 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} --- !u!1 &2419706330575798562 GameObject: m_ObjectHideFlags: 0 @@ -249,7 +500,7 @@ Transform: 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_LocalPosition: {x: 0.014, y: -2.133, z: 0.01} m_LocalScale: {x: 0.7795448, y: 0.77954465, z: 0.27654868} m_ConstrainProportionsScale: 0 m_Children: [] @@ -397,7 +648,7 @@ Transform: m_GameObject: {fileID: 5850548977863442861} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0.000000016859, y: 4.04, z: -8.99} m_LocalScale: {x: 1.2828, y: 3.615999, z: 1.2828} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Prefabs/Pistole.prefab b/Assets/Prefabs/Pistole.prefab index c6a195b..7c3f862 100644 --- a/Assets/Prefabs/Pistole.prefab +++ b/Assets/Prefabs/Pistole.prefab @@ -28,12 +28,14 @@ Transform: m_GameObject: {fileID: 3150477364047279588} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 1.58, y: 4, z: -8.54} m_LocalScale: {x: 0.62523, y: 0.62523, z: 2.5534475} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7041550960457458345} - {fileID: 6127259917231396667} - {fileID: 1292371226238404395} + - {fileID: 3761782979458803265} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6696152723858882624 @@ -114,6 +116,37 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &3831243632405294257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3761782979458803265} + m_Layer: 0 + m_Name: Muzzle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3761782979458803265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3831243632405294257} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.7063} + m_LocalScale: {x: 1.5994115, y: 1.5994115, z: 0.3916274} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2396971725620813859} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4465938783623711180 GameObject: m_ObjectHideFlags: 0 @@ -255,13 +288,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6168136869709037227} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0.031148236, y: -0, z: -0, w: 0.9995148} m_LocalPosition: {x: 0, y: -0.9836381, z: 0.2898042} m_LocalScale: {x: 0.82158005, y: 1.7515001, z: 0.17967622} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2396971725620813859} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -3.57, y: 0, z: 0} --- !u!33 &4931314749659474147 MeshFilter: m_ObjectHideFlags: 0 @@ -340,3 +373,138 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6466004486352871641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7041550960457458345} + - component: {fileID: 8555358297939343597} + - component: {fileID: 1669394216283532439} + - component: {fileID: 4637096885773485562} + - component: {fileID: 6447497229472730237} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7041550960457458345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6466004486352871641} + serializedVersion: 2 + m_LocalRotation: {x: -0.031148236, y: -0, z: -0, w: 0.9995148} + m_LocalPosition: {x: 0, y: -0.9836381, z: 0.2898042} + m_LocalScale: {x: 0.46977156, y: 2.1702838, z: 0.13453436} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2396971725620813859} + m_LocalEulerAnglesHint: {x: -3.57, y: 0, z: 0} +--- !u!33 &8555358297939343597 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6466004486352871641} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1669394216283532439 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6466004486352871641} + 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: 94507ccd4f290af47b3074def140aa5a, 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!65 &4637096885773485562 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6466004486352871641} + 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: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!95 &6447497229472730237 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6466004486352871641} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 34cb7ae045aa42546817624141b8e0fb, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Scenes/Menue.unity b/Assets/Scenes/Menue.unity index 7f2bf8a..ed0fbec 100644 --- a/Assets/Scenes/Menue.unity +++ b/Assets/Scenes/Menue.unity @@ -146,8 +146,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 341578674} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 5.3197, y: 5.3197, z: 5.3197} + m_LocalPosition: {x: 0, y: 0, z: 147} + m_LocalScale: {x: 1.9719063, y: 1.9719063, z: 1.9719063} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1428790033} @@ -155,7 +155,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -88} + m_AnchoredPosition: {x: 0, y: 17} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &341578676 @@ -610,7 +610,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 35, y: 560} + m_AnchoredPosition: {x: 587, y: -60} m_SizeDelta: {x: 1500, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &973236473 @@ -635,7 +635,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 200 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -682,8 +682,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1279372961} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 5.3197, y: 5.3197, z: 5.3197} + m_LocalPosition: {x: 0, y: 0, z: 174} + m_LocalScale: {x: 1.971906, y: 1.971906, z: 1.971906} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 342036763} @@ -691,7 +691,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -581.1} + m_AnchoredPosition: {x: 0, y: -149} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1279372963 @@ -894,8 +894,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1498331874} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 5.3197, y: 5.3197, z: 5.3197} + m_LocalPosition: {x: 0, y: 0, z: 147} + m_LocalScale: {x: 1.971906, y: 1.971906, z: 1.971906} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1596926618} @@ -903,7 +903,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -338} + m_AnchoredPosition: {x: 0, y: -64} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1498331876 diff --git a/Assets/Scenes/Test_Scene.unity b/Assets/Scenes/Test_Scene.unity index c6237f0..f1ba0e0 100644 --- a/Assets/Scenes/Test_Scene.unity +++ b/Assets/Scenes/Test_Scene.unity @@ -739,6 +739,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: afa71643f370d394e8dd19e0ab40ab57, type: 3} +--- !u!1 &1055045214131575312 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4474395191186681843, guid: afa71643f370d394e8dd19e0ab40ab57, type: 3} + m_PrefabInstance: {fileID: 1055045214131575311} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4140538247651255255 PrefabInstance: m_ObjectHideFlags: 0 @@ -791,19 +796,54 @@ PrefabInstance: propertyPath: m_Name value: AR objectReference: {fileID: 0} + - target: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} + propertyPath: m_LocalPosition.y + value: -2.133 + objectReference: {fileID: 0} + - target: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} + propertyPath: m_LocalPosition.z + value: 0.01 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3358950876010158595, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} insertIndex: -1 addedObject: {fileID: 1112380837} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} + insertIndex: -1 + addedObject: {fileID: 4140538247651255259} 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!1 &4140538247651255257 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} + m_PrefabInstance: {fileID: 4140538247651255255} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4140538247651255258 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} + m_PrefabInstance: {fileID: 4140538247651255255} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4140538247651255259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4140538247651255257} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a10d4b5b33d924c428453e46c9513163, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Shoot + bulletPrefab: {fileID: 1055045214131575312} + spawnPoint: {fileID: 4140538247651255258} --- !u!1001 &6183749844758426995 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Shoot.cs b/Assets/Scripts/Shoot.cs index 9eabb56..28e69ec 100644 --- a/Assets/Scripts/Shoot.cs +++ b/Assets/Scripts/Shoot.cs @@ -1,24 +1,34 @@ +using Unity.VisualScripting; using UnityEngine; public class Shoot : MonoBehaviour { [SerializeField] GameObject bulletPrefab; - // Start is called once before the first execution of Update after the MonoBehaviour is created + [SerializeField] Transform spawnPointAR; + [SerializeField] Transform spawnPointPistol; + [SerializeField] bool AR = true; + [SerializeField] bool Pistole = true; void Start() { } - // Update is called once per frame void Update() { - if (Input.GetKeyDown(KeyCode.Mouse0)) + + if ( AR == true && Input.GetKey(KeyCode.Mouse0)) { - Shot(); + Shot(spawnPointAR); + } + else if (Pistole == true && Input.GetKeyDown(KeyCode.Mouse0)) + { + Shot(spawnPointPistol); } } - public void Shot() + public void Shot(Transform spawnPoint) { - Instantiate(bulletPrefab); + GameObject bullet = Instantiate(bulletPrefab, spawnPoint.position, spawnPoint.rotation); + bullet.transform.Rotate(90,0,0); + Destroy(bullet, 2); } } diff --git a/Assets/animatens/ARReload.anim b/Assets/animatens/ARReload.anim new file mode 100644 index 0000000..ce5a08f --- /dev/null +++ b/Assets/animatens/ARReload.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ARReload + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/animatens/ARReload.anim.meta b/Assets/animatens/ARReload.anim.meta new file mode 100644 index 0000000..4128466 --- /dev/null +++ b/Assets/animatens/ARReload.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3db9ce13a5a789b499eaf571cd2cccd0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/animatens/Cube.controller b/Assets/animatens/Cube.controller new file mode 100644 index 0000000..92ef2be --- /dev/null +++ b/Assets/animatens/Cube.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Cube + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/animatens/Cube.controller.meta b/Assets/animatens/Cube.controller.meta new file mode 100644 index 0000000..5f4fdf7 --- /dev/null +++ b/Assets/animatens/Cube.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34cb7ae045aa42546817624141b8e0fb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/animatens/Magazin.controller b/Assets/animatens/Magazin.controller new file mode 100644 index 0000000..04c265e --- /dev/null +++ b/Assets/animatens/Magazin.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Magazin + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/animatens/Magazin.controller.meta b/Assets/animatens/Magazin.controller.meta new file mode 100644 index 0000000..0ac7adc --- /dev/null +++ b/Assets/animatens/Magazin.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d489640b78374334c842856c1704b741 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/animatens/PistolenReload.anim b/Assets/animatens/PistolenReload.anim new file mode 100644 index 0000000..b5df516 --- /dev/null +++ b/Assets/animatens/PistolenReload.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PistolenReload + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/animatens/PistolenReload.anim.meta b/Assets/animatens/PistolenReload.anim.meta new file mode 100644 index 0000000..6194846 --- /dev/null +++ b/Assets/animatens/PistolenReload.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e057e97a5652a134b8fd6c61b3561981 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: