diff --git a/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab b/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab index dc47818..88f15d1 100644 --- a/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab +++ b/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab @@ -989,7 +989,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365318978058098897} - m_LocalRotation: {x: 0.03559524, y: -0.060832795, z: 0.014377562, w: 0.9974095} + m_LocalRotation: {x: 0.03559524, y: -0.060832832, z: 0.014377572, w: 0.9974095} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1078,7 +1078,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365318978543542559} - m_LocalRotation: {x: 0.15114106, y: -0.061787784, z: 0.009466145, w: 0.9865339} + m_LocalRotation: {x: 0.15114106, y: -0.061787855, z: 0.009466156, w: 0.9865339} m_LocalPosition: {x: -0.000023298204, y: 1.3199862, z: -2.4649107} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2033,103 +2033,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 7798805851187038303, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} m_PrefabInstance: {fileID: 365318977165309104} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2961128517497243755 +--- !u!1001 &4854301426680056479 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 3442891603357720395} m_Modifications: - - target: {fileID: 5105592443209329592, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_Name - value: LowPolyScifiGun - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalPosition.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalPosition.y - value: 0.06 - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalPosition.z - value: 0.35 - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalRotation.w - value: 0.6710231 - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalRotation.x - value: -0.67102337 - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalRotation.y - value: -0.22299753 - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalRotation.z - value: 0.22299753 - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -53.234 - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5267403626796195146, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalPosition.x value: -0.05 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalPosition.y value: 0.213 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalPosition.z value: 0.057 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalRotation.w value: -0.61237246 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalRotation.x value: -0.61237246 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalRotation.y value: 0.35355335 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalRotation.z value: -0.35355335 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 90 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 180 objectReference: {fileID: 0} - - target: {fileID: 5589360669647008002, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - target: {fileID: 2870092814380004342, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: -120 objectReference: {fileID: 0} + - target: {fileID: 3215375081412045132, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} + propertyPath: m_Name + value: Pistol1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} --- !u!1001 &5526373308689778747 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/GunPrefabs/FlareParticle.prefab b/Assets/Prefabs/GunPrefabs/FlareParticle.prefab index 1601b72..d2e8da7 100644 --- a/Assets/Prefabs/GunPrefabs/FlareParticle.prefab +++ b/Assets/Prefabs/GunPrefabs/FlareParticle.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 4575714109450776056} - component: {fileID: 4575714109450776059} - component: {fileID: 4575714109450776058} + - component: {fileID: -3126027469558985513} + - component: {fileID: -2166122047152726235} m_Layer: 0 m_Name: FlareParticle m_TagString: Untagged @@ -93,11 +95,40 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4575714109450776061} m_Material: {fileID: 0} - m_IsTrigger: 1 + m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &-3126027469558985513 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4575714109450776061} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 2 +--- !u!114 &-2166122047152726235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4575714109450776061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ea1ee4df8019a143b013f8837aa48d8, type: 3} + m_Name: + m_EditorClassIdentifier: + duration: 5 --- !u!1 &4575714110311104494 GameObject: m_ObjectHideFlags: 0 @@ -143,7 +174,7 @@ Light: m_Type: 2 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 23.86763 + m_Intensity: 81.24355 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -205,13 +236,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Intensity: 299.9295 + m_Intensity: 1020.9366 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 - m_VolumetricDimmer: 1 + m_VolumetricDimmer: 5 m_LightUnit: 0 m_FadeDistance: 10000 m_VolumetricFadeDistance: 10000 diff --git a/Assets/Prefabs/GunPrefabs/Pistol1.prefab b/Assets/Prefabs/GunPrefabs/Pistol1.prefab new file mode 100644 index 0000000..b97dd2c --- /dev/null +++ b/Assets/Prefabs/GunPrefabs/Pistol1.prefab @@ -0,0 +1,420 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &677003514784890560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 811384076594615178} + m_Layer: 2 + m_Name: BulletSpawnpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &811384076594615178 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677003514784890560} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.22, y: 0.37, z: -0.338} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870092814380004342} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2953970834469093617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5870767500957406260} + - component: {fileID: 935129114346117162} + - component: {fileID: 2459162007790655328} + m_Layer: 2 + m_Name: Spot Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5870767500957406260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2953970834469093617} + m_LocalRotation: {x: -1, y: 0, z: 0, w: 0} + m_LocalPosition: {x: -0, y: 0.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870092814380004342} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: -180, y: 0, z: 0} +--- !u!108 &935129114346117162 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2953970834469093617} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 2802.5015 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 2 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!114 &2459162007790655328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2953970834469093617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Intensity: 600 + m_EnableSpotReflector: 1 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0.025 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 0 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 + m_ShadowCascadeRatios: + - 0.05 + - 0.2 + - 0.3 + m_ShadowCascadeBorders: + - 0.2 + - 0.2 + - 0.2 + - 0.2 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 + useOldInspector: 0 + useVolumetric: 1 + featuresFoldout: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 +--- !u!1 &3215375081412045132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2870092814380004342} + - component: {fileID: 7836552235224166431} + m_Layer: 2 + m_Name: Pistol1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2870092814380004342 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3215375081412045132} + m_LocalRotation: {x: -0.61237246, y: 0.35355335, z: -0.35355335, w: -0.61237246} + m_LocalPosition: {x: -0.05, y: 0.213, z: 0.057} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5676451401199135327} + - {fileID: 2548026318584717246} + - {fileID: 5870767500957406260} + - {fileID: 811384076594615178} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 180, z: -120} +--- !u!114 &7836552235224166431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3215375081412045132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0bc8aa373bfbe44e91f0625324088be, type: 3} + m_Name: + m_EditorClassIdentifier: + targetingLight: {fileID: 935129114346117162} + targetObjectPrefab: {fileID: 7083481049935262560, guid: 25e7708870a1a78479d6e4df73bec788, type: 3} + projectilePrefab: {fileID: 4575714109450776061, guid: 5e611af8f39b09a4f9b479a29f3460ff, type: 3} + bulletSpawnPoint: {fileID: 811384076594615178} +--- !u!1 &6499420578328911065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5676451401199135327} + m_Layer: 2 + m_Name: Empty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5676451401199135327 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6499420578328911065} + m_LocalRotation: {x: 0.000000015454313, y: -0.70710677, z: 0.000000015454312, w: 0.7071068} + m_LocalPosition: {x: 0.9597562, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870092814380004342} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6700653566957051900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2548026318584717246} + - component: {fileID: 706563930751318416} + - component: {fileID: 1039715520343193334} + m_Layer: 2 + m_Name: Gun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2548026318584717246 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6700653566957051900} + m_LocalRotation: {x: -0.67102337, y: -0.22299753, z: 0.22299753, w: 0.6710231} + m_LocalPosition: {x: -0, y: 0.06, z: 0.35} + m_LocalScale: {x: 21.165749, y: 60.96772, z: 60.96772} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870092814380004342} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -53.234, y: -90, z: 90} +--- !u!33 &706563930751318416 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6700653566957051900} + m_Mesh: {fileID: 2941274158721294118, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} +--- !u!23 &1039715520343193334 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6700653566957051900} + 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_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 4874126678125670354, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} + - {fileID: -876546973899608171, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} + - {fileID: -6922793697723135513, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} + - {fileID: -6629797300637803691, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} + - {fileID: -3846018093981099296, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/GunPrefabs/Pistol1.prefab.meta b/Assets/Prefabs/GunPrefabs/Pistol1.prefab.meta new file mode 100644 index 0000000..8c6104e --- /dev/null +++ b/Assets/Prefabs/GunPrefabs/Pistol1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 396e7ba93ef9d4147a6a6c09b1abe39d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ShootingScene.unity b/Assets/Scenes/ShootingScene.unity index 426eb6c..2dadec5 100644 --- a/Assets/Scenes/ShootingScene.unity +++ b/Assets/Scenes/ShootingScene.unity @@ -1025,7 +1025,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121741571} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.34, y: 1.595, z: 12.5} + m_LocalPosition: {x: -0.34, y: 1.595, z: 38.07} m_LocalScale: {x: 0.2, y: 0.2, z: 0.24644701} m_ConstrainProportionsScale: 0 m_Children: @@ -1301,6 +1301,103 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 6, y: 2, z: 2} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &275712039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 275712040} + - component: {fileID: 275712043} + - component: {fileID: 275712042} + - component: {fileID: 275712041} + m_Layer: 0 + m_Name: Cube.011 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &275712040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 275712039} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -20, y: 4, z: 5.5} + m_LocalScale: {x: 400, y: 100, z: 400} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 645141303} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &275712041 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 275712039} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.020000005, y: 0.024, z: 0.019999996} + m_Center: {x: -0.0000000037252903, y: 0.0019999817, z: 1.4210857e-17} +--- !u!23 &275712042 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 275712039} + 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_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f9ea10f3715856a40886087ca7a992cc, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &275712043 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 275712039} + m_Mesh: {fileID: 4493585093827132993, guid: 5a1b5aacfbc242c4b998d66774454f6f, type: 3} --- !u!1 &295159158 GameObject: m_ObjectHideFlags: 0 @@ -1748,6 +1845,7 @@ Transform: - {fileID: 40528898} - {fileID: 889309543} - {fileID: 1003663203} + - {fileID: 1019123819} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1778,7 +1876,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 456355058} m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -12.45, y: 4, z: 0} + m_LocalPosition: {x: -39.48, y: 4, z: -0} m_LocalScale: {x: 600, y: 100, z: 400} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1848,6 +1946,200 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 456355058} m_Mesh: {fileID: 4493585093827132993, guid: 5a1b5aacfbc242c4b998d66774454f6f, type: 3} +--- !u!1 &463998214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 463998215} + - component: {fileID: 463998218} + - component: {fileID: 463998217} + - component: {fileID: 463998216} + m_Layer: 0 + m_Name: Cube.010 (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &463998215 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463998214} + m_LocalRotation: {x: -0.00000013767877, y: 0.7071068, z: 0.70710677, w: 0.00000013767878} + m_LocalPosition: {x: -35, y: 4, z: -5.5} + m_LocalScale: {x: 400, y: 100, z: 400} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 645141303} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &463998216 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463998214} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.020000005, y: 0.024000011, z: 0.02} + m_Center: {x: 0.000000011175871, y: 0.0019999896, z: -2.980234e-11} +--- !u!23 &463998217 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463998214} + 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_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f9ea10f3715856a40886087ca7a992cc, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &463998218 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463998214} + m_Mesh: {fileID: 4493585093827132993, guid: 5a1b5aacfbc242c4b998d66774454f6f, type: 3} +--- !u!1 &464231264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 464231265} + - component: {fileID: 464231268} + - component: {fileID: 464231267} + - component: {fileID: 464231266} + m_Layer: 0 + m_Name: Cube.011 (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &464231265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464231264} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -35, y: 4, z: 5.5} + m_LocalScale: {x: 400, y: 100, z: 400} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 645141303} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &464231266 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464231264} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.020000005, y: 0.024, z: 0.019999996} + m_Center: {x: -0.0000000037252903, y: 0.0019999817, z: 1.4210857e-17} +--- !u!23 &464231267 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464231264} + 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_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f9ea10f3715856a40886087ca7a992cc, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &464231268 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464231264} + m_Mesh: {fileID: 4493585093827132993, guid: 5a1b5aacfbc242c4b998d66774454f6f, type: 3} --- !u!1 &477210864 GameObject: m_ObjectHideFlags: 0 @@ -2903,6 +3195,12 @@ Transform: - {fileID: 875266415} - {fileID: 456355059} - {fileID: 419951040} + - {fileID: 1274345234} + - {fileID: 275712040} + - {fileID: 1473837352} + - {fileID: 855978115} + - {fileID: 463998215} + - {fileID: 464231265} m_Father: {fileID: 447227878} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} @@ -3417,6 +3715,103 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1feba8cdbdcbf374e870788a732d9d74, type: 3} m_PrefabInstance: {fileID: 829151459} m_PrefabAsset: {fileID: 0} +--- !u!1 &855978114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 855978115} + - component: {fileID: 855978118} + - component: {fileID: 855978117} + - component: {fileID: 855978116} + m_Layer: 0 + m_Name: Cube.011 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &855978115 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855978114} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -28, y: 4, z: 5.5} + m_LocalScale: {x: 400, y: 100, z: 400} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 645141303} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &855978116 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855978114} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.020000005, y: 0.024, z: 0.019999996} + m_Center: {x: -0.0000000037252903, y: 0.0019999817, z: 1.4210857e-17} +--- !u!23 &855978117 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855978114} + 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_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f9ea10f3715856a40886087ca7a992cc, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &855978118 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855978114} + m_Mesh: {fileID: 4493585093827132993, guid: 5a1b5aacfbc242c4b998d66774454f6f, type: 3} --- !u!1 &859496930 GameObject: m_ObjectHideFlags: 0 @@ -3507,8 +3902,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 875266414} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -15, y: 10, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: -38.477, y: 10, z: -0} + m_LocalScale: {x: 160.2, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645141303} @@ -4153,11 +4548,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 365318977785173342, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: m_LocalRotation.y - value: -0.060561996 + value: -0.06056196 objectReference: {fileID: 0} - target: {fileID: 365318977785173342, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: m_LocalRotation.z - value: 0.015478803 + value: 0.0154787935 objectReference: {fileID: 0} - target: {fileID: 365318978058098911, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: m_LocalRotation.w @@ -4169,11 +4564,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 365318978058098911, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: m_LocalRotation.y - value: -0.060832795 + value: -0.060832832 objectReference: {fileID: 0} - target: {fileID: 365318978058098911, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: m_LocalRotation.z - value: 0.014377562 + value: 0.014377572 objectReference: {fileID: 0} - target: {fileID: 365318978543542555, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: m_LocalPosition.x @@ -4197,11 +4592,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 365318978543542555, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: m_LocalRotation.y - value: -0.061787855 + value: -0.061787784 objectReference: {fileID: 0} - target: {fileID: 365318978543542555, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: m_LocalRotation.z - value: 0.009466156 + value: 0.009466145 + objectReference: {fileID: 0} + - target: {fileID: 365318978543542557, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} + propertyPath: clearColorMode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 365318978543542557, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} + propertyPath: backgroundColorHDR.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318978543542557, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} + propertyPath: backgroundColorHDR.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318978543542557, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} + propertyPath: backgroundColorHDR.r + value: 0 objectReference: {fileID: 0} - target: {fileID: 1307405647097536171, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: m_LocalPosition.x @@ -4239,6 +4650,10 @@ PrefabInstance: propertyPath: m_enableWordWrapping value: 0 objectReference: {fileID: 0} + - target: {fileID: 3430889494742284928, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} + propertyPath: firePower + value: 40 + objectReference: {fileID: 0} - target: {fileID: 3430889494742284928, guid: 57a1e0f3274302943993b8f55e87f3c9, type: 3} propertyPath: targetObjectPrefab value: @@ -4594,6 +5009,104 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1019123818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1019123819} + - component: {fileID: 1019123822} + - component: {fileID: 1019123821} + - component: {fileID: 1019123820} + m_Layer: 0 + m_Name: Plane (9) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1019123819 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019123818} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.33358335, y: -1.4643, z: 29.1935} + m_LocalScale: {x: 1, y: 1, z: 3.5267} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 447227878} + m_RootOrder: 21 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1019123820 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019123818} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1019123821 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019123818} + 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_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 54bbf98633e84e74db1593a8be6f1a38, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1019123822 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019123818} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1026015158 GameObject: m_ObjectHideFlags: 0 @@ -5317,7 +5830,7 @@ Transform: m_GameObject: {fileID: 1220923920} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.07932709, y: 1.2312082, z: 0.019855574} - m_LocalScale: {x: 50, y: 50, z: 50} + m_LocalScale: {x: 50, y: 50, z: 384.81} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -5452,6 +5965,103 @@ Transform: m_Father: {fileID: 859496931} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1274345233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1274345234} + - component: {fileID: 1274345237} + - component: {fileID: 1274345236} + - component: {fileID: 1274345235} + m_Layer: 0 + m_Name: Cube.010 (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1274345234 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274345233} + m_LocalRotation: {x: -0.00000013767877, y: 0.7071068, z: 0.70710677, w: 0.00000013767878} + m_LocalPosition: {x: -20, y: 4, z: -5.5} + m_LocalScale: {x: 400, y: 100, z: 400} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 645141303} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1274345235 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274345233} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.020000005, y: 0.024000011, z: 0.02} + m_Center: {x: 0.000000011175871, y: 0.0019999896, z: -2.980234e-11} +--- !u!23 &1274345236 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274345233} + 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_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f9ea10f3715856a40886087ca7a992cc, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1274345237 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274345233} + m_Mesh: {fileID: 4493585093827132993, guid: 5a1b5aacfbc242c4b998d66774454f6f, type: 3} --- !u!1 &1278811496 GameObject: m_ObjectHideFlags: 0 @@ -6313,7 +6923,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1434312199} m_LocalRotation: {x: -0, y: -0.9991295, z: -0, w: 0.041717622} - m_LocalPosition: {x: 1.12, y: 1.595, z: 12.5} + m_LocalPosition: {x: 1.12, y: 1.595, z: 38.07} m_LocalScale: {x: 0.2, y: 0.2, z: 0.24644701} m_ConstrainProportionsScale: 0 m_Children: @@ -6735,6 +7345,103 @@ Transform: m_Father: {fileID: 1510754465} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1473837351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1473837352} + - component: {fileID: 1473837355} + - component: {fileID: 1473837354} + - component: {fileID: 1473837353} + m_Layer: 0 + m_Name: Cube.010 (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1473837352 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1473837351} + m_LocalRotation: {x: -0.00000013767877, y: 0.7071068, z: 0.70710677, w: 0.00000013767878} + m_LocalPosition: {x: -28, y: 4, z: -5.5} + m_LocalScale: {x: 400, y: 100, z: 400} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 645141303} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1473837353 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1473837351} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.020000005, y: 0.024000011, z: 0.02} + m_Center: {x: 0.000000011175871, y: 0.0019999896, z: -2.980234e-11} +--- !u!23 &1473837354 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1473837351} + 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_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f9ea10f3715856a40886087ca7a992cc, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1473837355 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1473837351} + m_Mesh: {fileID: 4493585093827132993, guid: 5a1b5aacfbc242c4b998d66774454f6f, type: 3} --- !u!1 &1498460774 GameObject: m_ObjectHideFlags: 0 @@ -7172,7 +7879,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1531278847} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0.33358335, y: 3.5357044, z: -8.250476} + m_LocalPosition: {x: 0.33358335, y: 3.5357044, z: -6.61} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8302,7 +9009,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1936100424} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.5, y: 3.1178, z: -5.8628845} + m_LocalPosition: {x: 6.87, y: 3.1178, z: -5.8628845} m_LocalScale: {x: 5.3, y: 9.3756, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8759,7 +9466,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 919132148843899385} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.1, y: 1.595, z: 12.5} + m_LocalPosition: {x: -2.1, y: 1.595, z: 38.07} m_LocalScale: {x: 0.2, y: 0.2, z: 0.24644701} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scripts/Pistol/BulletComponent.cs b/Assets/Scripts/Pistol/BulletComponent.cs new file mode 100644 index 0000000..741fec4 --- /dev/null +++ b/Assets/Scripts/Pistol/BulletComponent.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BulletComponent : MonoBehaviour +{ + [SerializeField] + private float duration = 5f; + private float existed = 0f; + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + private void FixedUpdate() + { + if(existed >= duration) + { + Destroy(this.gameObject); + } + existed += Time.fixedDeltaTime; + + } +} diff --git a/Assets/Scripts/Pistol/BulletComponent.cs.meta b/Assets/Scripts/Pistol/BulletComponent.cs.meta new file mode 100644 index 0000000..e09361d --- /dev/null +++ b/Assets/Scripts/Pistol/BulletComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9ea1ee4df8019a143b013f8837aa48d8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Pistol/PistolComponent.cs b/Assets/Scripts/Pistol/PistolComponent.cs index 5144929..4d561bc 100644 --- a/Assets/Scripts/Pistol/PistolComponent.cs +++ b/Assets/Scripts/Pistol/PistolComponent.cs @@ -12,6 +12,16 @@ public class PistolComponent : MonoBehaviour GameObject targetObject; [SerializeField] GameObject targetObjectPrefab; + [SerializeField] + private GameObject projectilePrefab; + [SerializeField] + private Transform bulletSpawnPoint; + [SerializeField] + private float firePower = 20f; + [SerializeField] + private float maxProjectileDuration = 5f; + + //private Dictionary projectiles = new Dictionary(); // Start is called before the first frame update void Start() @@ -37,9 +47,20 @@ public class PistolComponent : MonoBehaviour targetObject.gameObject.transform.position = hit.point; } } - + + + } + public void Fire() + { + GameObject projectile = Instantiate(projectilePrefab, this.bulletSpawnPoint); + projectile.transform.localPosition = Vector3.zero; + projectile.transform.localEulerAngles = Vector3.zero; + projectile.transform.localScale = Vector3.one; + Rigidbody pRigid = projectile.GetComponent(); + pRigid.AddForce(pRigid.transform.up*this.firePower, ForceMode.Impulse); + projectile.transform.parent = null; } public void Enable() diff --git a/Assets/Scripts/Player/PlayerInteractionHandler.cs b/Assets/Scripts/Player/PlayerInteractionHandler.cs index d659459..bd4a36e 100644 --- a/Assets/Scripts/Player/PlayerInteractionHandler.cs +++ b/Assets/Scripts/Player/PlayerInteractionHandler.cs @@ -85,62 +85,71 @@ public class PlayerInteractionHandler : MonoBehaviour } if(Input.GetButtonDown("Fire1")) { - if (!IsCarrying) + if (this.GunEnabled) { - int t_index = 0; - bool pickupFound = false; - if (itemsInRange.Count > 0) - { - while (t_index 0) - { - pickupFound = true; - heavyInvent = heavyItemsInRange[0]; - - heavyInvent.transform.parent = carryingPos; - heavyInvent.transform.localPosition = Vector3.zero; - heavyInvent.GetComponent().isKinematic = true; - heavyItemsInRange.Remove(heavyItemsInRange[0]); - heavyInvent.Disable(); - heavyInvent.DisableAll(); - } - if (!pickupFound) - { - foreach(InteractableItem item in itemsInRange) - { - if (!item.CanPickup) - { - if(!item.Interact(ref invent, ref heavyInvent)) - { - item.Interact(); - } - - } - } - } + this.pistol.Fire(); } else { - heavyInvent.transform.parent = null; - heavyInvent.GetComponent().isKinematic = false; - heavyInvent.EnableAll(); - heavyInvent = null; - + if (!IsCarrying) + { + int t_index = 0; + bool pickupFound = false; + if (itemsInRange.Count > 0) + { + while (t_index < itemsInRange.Count && !itemsInRange[t_index].CanPickup) + { + t_index++; + } + if (t_index != itemsInRange.Count) + { + pickupFound = true; + invent.AddItem(itemsInRange[t_index]); + itemsInRange[0].transform.gameObject.SetActive(false); + itemsInRange.Remove(itemsInRange[t_index]); + } + + + } + else if (heavyItemsInRange.Count > 0) + { + pickupFound = true; + heavyInvent = heavyItemsInRange[0]; + + heavyInvent.transform.parent = carryingPos; + heavyInvent.transform.localPosition = Vector3.zero; + heavyInvent.GetComponent().isKinematic = true; + heavyItemsInRange.Remove(heavyItemsInRange[0]); + heavyInvent.Disable(); + heavyInvent.DisableAll(); + } + if (!pickupFound) + { + foreach (InteractableItem item in itemsInRange) + { + if (!item.CanPickup) + { + if (!item.Interact(ref invent, ref heavyInvent)) + { + item.Interact(); + } + + } + } + } + } + else + { + heavyInvent.transform.parent = null; + heavyInvent.GetComponent().isKinematic = false; + heavyInvent.EnableAll(); + heavyInvent = null; + + } + } - + + } if (Input.GetButtonDown("Fire2")) {