diff --git a/Assets/Objects/Weapons/Ammunition.meta b/Assets/Objects/Weapons/Ammunition.meta new file mode 100644 index 0000000..2da5077 --- /dev/null +++ b/Assets/Objects/Weapons/Ammunition.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff2215fb9e5d24041a63366549d6b489 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/Ammunition/7.62x39mm.meta b/Assets/Objects/Weapons/Ammunition/7.62x39mm.meta new file mode 100644 index 0000000..f9615c8 --- /dev/null +++ b/Assets/Objects/Weapons/Ammunition/7.62x39mm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55c64022200bfca43845476cad3259c8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.fbx b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.fbx new file mode 100644 index 0000000..f419ea3 Binary files /dev/null and b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.fbx differ diff --git a/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.fbx.meta b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.fbx.meta new file mode 100644 index 0000000..cea5b49 --- /dev/null +++ b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.fbx.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: f2c043b7ae1976b47a03bdef378c2a9a +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.prefab b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.prefab new file mode 100644 index 0000000..3806652 --- /dev/null +++ b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8986339084320976512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8646404845673739322} + - component: {fileID: 4634741612328942495} + - component: {fileID: 7472914036901187413} + m_Layer: 0 + m_Name: 7.62x39mm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8646404845673739322 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986339084320976512} + m_LocalRotation: {x: -0.7071067, y: -0.000000030908616, z: 0.000000030908623, w: 0.7071068} + m_LocalPosition: {x: 3.8501332, y: 0.0827, z: -1.151792} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4634741612328942495 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986339084320976512} + m_Mesh: {fileID: -5678053316160903336, guid: f2c043b7ae1976b47a03bdef378c2a9a, type: 3} +--- !u!23 &7472914036901187413 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986339084320976512} + 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: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6354c151b028ac2448d40f96176c8738, 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} diff --git a/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.prefab.meta b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.prefab.meta new file mode 100644 index 0000000..2a73157 --- /dev/null +++ b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mm.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 88b89aa132842ad4c8a023ca06184abe +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mmWithBullet.fbx b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mmWithBullet.fbx new file mode 100644 index 0000000..a66898d Binary files /dev/null and b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mmWithBullet.fbx differ diff --git a/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mmWithBullet.fbx.meta b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mmWithBullet.fbx.meta new file mode 100644 index 0000000..fa6f89e --- /dev/null +++ b/Assets/Objects/Weapons/Ammunition/7.62x39mm/7.62x39mmWithBullet.fbx.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: 3a7a356731a8aee4f9d8fd2c8ae20d8b +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/Ammunition/7.62x39mm/Brass.mat b/Assets/Objects/Weapons/Ammunition/7.62x39mm/Brass.mat new file mode 100644 index 0000000..71dd6bc --- /dev/null +++ b/Assets/Objects/Weapons/Ammunition/7.62x39mm/Brass.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Brass + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.76 + - _GlossyReflections: 1 + - _Metallic: 0.81 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.7830189, g: 0.61879027, b: 0.20978993, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Objects/Weapons/Ammunition/7.62x39mm/Brass.mat.meta b/Assets/Objects/Weapons/Ammunition/7.62x39mm/Brass.mat.meta new file mode 100644 index 0000000..0330e53 --- /dev/null +++ b/Assets/Objects/Weapons/Ammunition/7.62x39mm/Brass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6354c151b028ac2448d40f96176c8738 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/FN FAL.meta b/Assets/Objects/Weapons/FN FAL.meta new file mode 100644 index 0000000..73cc4f0 --- /dev/null +++ b/Assets/Objects/Weapons/FN FAL.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15d7a254e530a6747abcd011dc4b239c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/FN FAL/FN FAL Animation Controller.controller b/Assets/Objects/Weapons/FN FAL/FN FAL Animation Controller.controller new file mode 100644 index 0000000..c62bdb9 --- /dev/null +++ b/Assets/Objects/Weapons/FN FAL/FN FAL Animation Controller.controller @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-2290590639116004446 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FN FAL Animation Controller + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2290590639116004446} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Objects/Weapons/FN FAL/FN FAL Animation Controller.controller.meta b/Assets/Objects/Weapons/FN FAL/FN FAL Animation Controller.controller.meta new file mode 100644 index 0000000..5f859b0 --- /dev/null +++ b/Assets/Objects/Weapons/FN FAL/FN FAL Animation Controller.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77b7343a6556cd044813e50a5606aa48 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/FN FAL/FN FAL.fbx b/Assets/Objects/Weapons/FN FAL/FN FAL.fbx new file mode 100644 index 0000000..27af6c2 Binary files /dev/null and b/Assets/Objects/Weapons/FN FAL/FN FAL.fbx differ diff --git a/Assets/Objects/Weapons/FN FAL/FN FAL.fbx.meta b/Assets/Objects/Weapons/FN FAL/FN FAL.fbx.meta new file mode 100644 index 0000000..861707f --- /dev/null +++ b/Assets/Objects/Weapons/FN FAL/FN FAL.fbx.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: a20edfde9e55bf64d9f41cbe761278e2 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/FN FAL/FN FAL.prefab b/Assets/Objects/Weapons/FN FAL/FN FAL.prefab new file mode 100644 index 0000000..93171ec --- /dev/null +++ b/Assets/Objects/Weapons/FN FAL/FN FAL.prefab @@ -0,0 +1,272 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1736269094394446474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9051254843799276260} + m_Layer: 0 + m_Name: Right_Hand_REF + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9051254843799276260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736269094394446474} + m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0.030000005, y: -0.10400012, z: -0.42400002} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870801076959504653} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} +--- !u!1 &2198916926880211039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2794727537646687892} + m_Layer: 0 + m_Name: Left_Hand_REF + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2794727537646687892 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2198916926880211039} + m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: -0.03000002, y: -0.11399987, z: -0.42400002} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870801076959504653} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} +--- !u!1 &3671960848121589874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5035374462334232435} + m_Layer: 0 + m_Name: Muzzle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5035374462334232435 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3671960848121589874} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.0004, y: 0.0643, z: 0.4626} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870801076959504653} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7754769049505907028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2870801076959504653} + - component: {fileID: 8491175667892330244} + - component: {fileID: 7333614599252658809} + - component: {fileID: 1971239791447289992} + - component: {fileID: 3314533436064776167} + m_Layer: 0 + m_Name: FN FAL + m_TagString: Weapon + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2870801076959504653 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7754769049505907028} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.03999999} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5035374462334232435} + - {fileID: 2794727537646687892} + - {fileID: 9051254843799276260} + - {fileID: 3430765203720308525} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8491175667892330244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7754769049505907028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7333614599252658809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7754769049505907028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c98f5c47a8b7dd64f86fd6f42c4d6e5e, type: 3} + m_Name: + m_EditorClassIdentifier: + weaponKind: 1 + active: 0 + damage: 30 + firerate: 250 + roundsPerShot: 1 + recoilStrength: 15 + currentAmmunition: 30 + magazinSize: 30 + totalAmmunition: 200 + bulletExit: {fileID: 3671960848121589874} + allowAction: 1 + weaponAnimator: {fileID: 8754058770507160919} + gunRightREF: {fileID: 9051254843799276260} + gunLeftREF: {fileID: 2794727537646687892} +--- !u!65 &1971239791447289992 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7754769049505907028} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Size: {x: 0.040187918, y: 0.18547925, z: 1.081836} + m_Center: {x: 0.00017769635, y: 0.01462169, z: -0.08016777} +--- !u!54 &3314533436064776167 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7754769049505907028} + 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: 0 +--- !u!1001 &2888566287241863366 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2870801076959504653} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalPosition.y + value: -0.041 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalPosition.z + value: -0.293 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalRotation.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalRotation.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_Name + value: FN FAL (1) + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 77b7343a6556cd044813e50a5606aa48, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} +--- !u!4 &3430765203720308525 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + m_PrefabInstance: {fileID: 2888566287241863366} + m_PrefabAsset: {fileID: 0} +--- !u!95 &8754058770507160919 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + m_PrefabInstance: {fileID: 2888566287241863366} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Objects/Weapons/FN FAL/FN FAL.prefab.meta b/Assets/Objects/Weapons/FN FAL/FN FAL.prefab.meta new file mode 100644 index 0000000..537782c --- /dev/null +++ b/Assets/Objects/Weapons/FN FAL/FN FAL.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a77b42141c3c3504abd6b8c28ae1f761 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/FN FAL/FN FAL_Shoot.fbx b/Assets/Objects/Weapons/FN FAL/FN FAL_Shoot.fbx new file mode 100644 index 0000000..2a588b6 Binary files /dev/null and b/Assets/Objects/Weapons/FN FAL/FN FAL_Shoot.fbx differ diff --git a/Assets/Objects/Weapons/FN FAL/FN FAL_Shoot.fbx.meta b/Assets/Objects/Weapons/FN FAL/FN FAL_Shoot.fbx.meta new file mode 100644 index 0000000..6dea936 --- /dev/null +++ b/Assets/Objects/Weapons/FN FAL/FN FAL_Shoot.fbx.meta @@ -0,0 +1,137 @@ +fileFormatVersion: 2 +guid: a4644413063a17c4ba1efc6b88945c78 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: + - first: + 74: 4781951162920444690 + second: Shoot + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: Shoot + takeName: Armature|ArmatureAction + internalID: 0 + firstFrame: 0 + lastFrame: 24 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: a20edfde9e55bf64d9f41cbe761278e2, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index d9c9e67..2d6814b 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -523,7 +523,7 @@ MonoBehaviour: aimVal: 0 AimPoint: {fileID: 2992488853448454767} HoldPoint: {fileID: 8043317747957554736} - isAiming: 0 + isAiming: 1 rotationMod: - {x: 0, y: 0, z: 0, w: 0} - {x: 0, y: 0, z: 0, w: 0} @@ -605,7 +605,7 @@ MonoBehaviour: sceneId: 0 serverOnly: 0 visible: 0 - m_AssetId: 2935eead9a075fd489d6a6dc273a5999 + m_AssetId: a14d876ac00bdf6498e30b3e58b68fdf hasSpawned: 0 --- !u!114 &7273209952621479910 MonoBehaviour: @@ -841,7 +841,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.1 + near clip plane: 0.01 far clip plane: 1000 field of view: 61.4 orthographic: 0 @@ -952,42 +952,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!95 &1978909962 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6576156620079053231} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: 01316cb596562384da845bc519fb90de, type: 3} - m_Controller: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &3855419186248803448 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6576156620079053231} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RigLayers: - - m_Rig: {fileID: 8865635171929772803} - m_Active: 1 - m_Effectors: [] --- !u!1 &7061967201775281134 GameObject: m_ObjectHideFlags: 0 @@ -1502,6 +1466,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3} +--- !u!4 &8703533484509679896 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} --- !u!4 &5767109144009335573 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} @@ -1512,6 +1481,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} +--- !u!1 &6576156620079053231 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} --- !u!4 &5739201115059209923 stripped Transform: m_CorrespondingSourceObject: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} @@ -1522,11 +1496,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} ---- !u!1 &6576156620079053231 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} - m_PrefabInstance: {fileID: 6305701708507383038} - m_PrefabAsset: {fileID: 0} --- !u!4 &9127245645273413481 stripped Transform: m_CorrespondingSourceObject: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} @@ -1537,11 +1506,42 @@ Transform: m_CorrespondingSourceObject: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} ---- !u!4 &8703533484509679896 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} - m_PrefabInstance: {fileID: 6305701708507383038} +--- !u!95 &1978909962 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576156620079053231} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_Controller: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &3855419186248803448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576156620079053231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RigLayers: + - m_Rig: {fileID: 8865635171929772803} + m_Active: 1 + m_Effectors: [] --- !u!1001 &6343958082870406749 PrefabInstance: m_ObjectHideFlags: 0 @@ -1643,16 +1643,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3} ---- !u!1 &4484858124469057131 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7365407325767981110, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3} - m_PrefabInstance: {fileID: 6343958082870406749} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8787644481610465855 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2448190575139433570, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3} - m_PrefabInstance: {fileID: 6343958082870406749} - m_PrefabAsset: {fileID: 0} --- !u!4 &365391085992511043 stripped Transform: m_CorrespondingSourceObject: {fileID: 6708222704297240606, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3} @@ -1668,3 +1658,13 @@ Transform: m_CorrespondingSourceObject: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3} m_PrefabInstance: {fileID: 6343958082870406749} m_PrefabAsset: {fileID: 0} +--- !u!1 &4484858124469057131 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7365407325767981110, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3} + m_PrefabInstance: {fileID: 6343958082870406749} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8787644481610465855 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2448190575139433570, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3} + m_PrefabInstance: {fileID: 6343958082870406749} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 2f85073..d950179 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -132,7 +132,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalPosition.x @@ -597,7 +597,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalPosition.x @@ -1008,7 +1008,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &739500445 PrefabInstance: @@ -1453,7 +1453,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1351784389 GameObject: @@ -1574,7 +1574,7 @@ RectTransform: - {fileID: 1684293625} - {fileID: 1430445132} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1884,7 +1884,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalPosition.x @@ -2218,7 +2218,7 @@ Transform: - {fileID: 76630395} - {fileID: 104338203} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2119583729 GameObject: @@ -2315,7 +2315,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1496806602367600913 PrefabInstance: @@ -2326,7 +2326,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3365311783543717598, guid: 5cd2e2b44dc49ae44b48fc76a1e09712, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 3365311783543717598, guid: 5cd2e2b44dc49ae44b48fc76a1e09712, type: 3} propertyPath: m_LocalPosition.x @@ -2378,6 +2378,63 @@ PrefabInstance: objectReference: {fileID: 6272346181302961293, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5cd2e2b44dc49ae44b48fc76a1e09712, type: 3} +--- !u!1001 &2232569135400255858 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalPosition.x + value: 3.8501332 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0827 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalPosition.z + value: -1.151792 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000000030908616 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000030908623 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8646404845673739322, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8986339084320976512, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} + propertyPath: m_Name + value: 7.62x39mm + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 88b89aa132842ad4c8a023ca06184abe, type: 3} --- !u!1001 &3454029965885532949 PrefabInstance: m_ObjectHideFlags: 0 @@ -2407,7 +2464,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2849906635484503724, guid: f0c1bca3291086d449266d9ed8942180, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 2849906635484503724, guid: f0c1bca3291086d449266d9ed8942180, type: 3} propertyPath: m_LocalPosition.x @@ -2455,6 +2512,71 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f0c1bca3291086d449266d9ed8942180, type: 3} +--- !u!1001 &7539634667887576952 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1971239791447289992, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalPosition.x + value: 0.134 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalPosition.y + value: 0.533 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalPosition.z + value: 0.03999999 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2870801076959504653, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3314533436064776167, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_UseGravity + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7754769049505907028, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} + propertyPath: m_Name + value: FN FAL + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a77b42141c3c3504abd6b8c28ae1f761, type: 3} --- !u!1001 &8307265127065581321 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs new file mode 100644 index 0000000..0e26efe --- /dev/null +++ b/Assets/Scripts/Bullet.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Bullet : MonoBehaviour +{ + int seconds = 30; + private void Start() + { + StartCoroutine("dest"); + } + IEnumerator dest() + { + yield return new WaitForSeconds(seconds); + Destroy(this); + } +} diff --git a/Assets/Scripts/Bullet.cs.meta b/Assets/Scripts/Bullet.cs.meta new file mode 100644 index 0000000..03b4c05 --- /dev/null +++ b/Assets/Scripts/Bullet.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6edc64fed0b209c4da9e92035149367d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameManager/GameMaster.cs b/Assets/Scripts/GameManager/GameMaster.cs index 2f1eaaf..5013a58 100644 --- a/Assets/Scripts/GameManager/GameMaster.cs +++ b/Assets/Scripts/GameManager/GameMaster.cs @@ -87,7 +87,6 @@ public class GameMaster : NetworkBehaviour break; case 3: gameState = 0; - Debug.Log("Team died"); break; default: break; diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index d158c15..3fc7ff1 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -95,7 +95,6 @@ public class Player : NetworkBehaviour { isAlive = false; AddDeaths(1); - Debug.Log("DIE"); } //Health diff --git a/Assets/Scripts/Player/ProcedualAnimationController.cs b/Assets/Scripts/Player/ProcedualAnimationController.cs index f516fb0..fe55a14 100644 --- a/Assets/Scripts/Player/ProcedualAnimationController.cs +++ b/Assets/Scripts/Player/ProcedualAnimationController.cs @@ -244,7 +244,8 @@ public class ProcedualAnimationController : NetworkBehaviour } void AimDownSights() { - aimVal = gravityValue(aimVal, aimSpeed, 1, 0, isAiming); + //aimVal = gravityValue(aimVal, aimSpeed, 1, 0, isAiming); + aimVal = gravityValue(aimVal, aimSpeed, 1, 0, true); positionMod[2] = Vector3.Lerp(HoldPoint.transform.localPosition, AimPoint.transform.localPosition, Mathf.Pow(aimVal, 1.3f)); } void calcRecoilOffset() diff --git a/UIElementsSchema/UIElements.xsd b/UIElementsSchema/UIElements.xsd new file mode 100644 index 0000000..8295ca6 --- /dev/null +++ b/UIElementsSchema/UIElements.xsd @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/Unity.Cloud.Collaborate.Components.ChangeListEntries.xsd b/UIElementsSchema/Unity.Cloud.Collaborate.Components.ChangeListEntries.xsd new file mode 100644 index 0000000..37db2cb --- /dev/null +++ b/UIElementsSchema/Unity.Cloud.Collaborate.Components.ChangeListEntries.xsd @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/Unity.Cloud.Collaborate.Components.xsd b/UIElementsSchema/Unity.Cloud.Collaborate.Components.xsd new file mode 100644 index 0000000..06b7da5 --- /dev/null +++ b/UIElementsSchema/Unity.Cloud.Collaborate.Components.xsd @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/Unity.Cloud.Collaborate.Views.xsd b/UIElementsSchema/Unity.Cloud.Collaborate.Views.xsd new file mode 100644 index 0000000..f6ec2fb --- /dev/null +++ b/UIElementsSchema/Unity.Cloud.Collaborate.Views.xsd @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/Unity.Profiling.Editor.xsd b/UIElementsSchema/Unity.Profiling.Editor.xsd new file mode 100644 index 0000000..32d7ed8 --- /dev/null +++ b/UIElementsSchema/Unity.Profiling.Editor.xsd @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/Unity.UI.Builder.xsd b/UIElementsSchema/Unity.UI.Builder.xsd new file mode 100644 index 0000000..0de8a5b --- /dev/null +++ b/UIElementsSchema/Unity.UI.Builder.xsd @@ -0,0 +1,953 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/UnityEditor.Experimental.GraphView.xsd b/UIElementsSchema/UnityEditor.Experimental.GraphView.xsd new file mode 100644 index 0000000..f9b22e3 --- /dev/null +++ b/UIElementsSchema/UnityEditor.Experimental.GraphView.xsd @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/UnityEditor.Overlays.xsd b/UIElementsSchema/UnityEditor.Overlays.xsd new file mode 100644 index 0000000..d60844f --- /dev/null +++ b/UIElementsSchema/UnityEditor.Overlays.xsd @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd b/UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd new file mode 100644 index 0000000..665abd5 --- /dev/null +++ b/UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd @@ -0,0 +1,584 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/UnityEditor.Search.xsd b/UIElementsSchema/UnityEditor.Search.xsd new file mode 100644 index 0000000..216cd6d --- /dev/null +++ b/UIElementsSchema/UnityEditor.Search.xsd @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/UnityEditor.ShortcutManagement.xsd b/UIElementsSchema/UnityEditor.ShortcutManagement.xsd new file mode 100644 index 0000000..400097b --- /dev/null +++ b/UIElementsSchema/UnityEditor.ShortcutManagement.xsd @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd b/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd new file mode 100644 index 0000000..a2be34b --- /dev/null +++ b/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/UnityEditor.UIElements.xsd b/UIElementsSchema/UnityEditor.UIElements.xsd new file mode 100644 index 0000000..d16ef98 --- /dev/null +++ b/UIElementsSchema/UnityEditor.UIElements.xsd @@ -0,0 +1,896 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UIElementsSchema/UnityEngine.UIElements.xsd b/UIElementsSchema/UnityEngine.UIElements.xsd new file mode 100644 index 0000000..60d663f --- /dev/null +++ b/UIElementsSchema/UnityEngine.UIElements.xsd @@ -0,0 +1,896 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 0db15c8..3b5f1ec 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 96 + controlID: -1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,9 +45,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 496 + x: 603.2 y: 73.6 - width: 754 + width: 646.8 height: 418.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -59,11 +59,11 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 754, y: 397.2} + m_TargetSize: {x: 646.8, y: 397.2} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 1 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 1 m_Gizmos: 0 @@ -74,8 +74,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -301.6 - m_HBaseRangeMax: 301.6 + m_HBaseRangeMin: -258.72 + m_HBaseRangeMax: 258.72 m_VBaseRangeMin: -158.88 m_VBaseRangeMax: 158.88 m_HAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 754 + width: 646.8 height: 397.2 - m_Scale: {x: 1.1919038, y: 1.1919038} - m_Translation: {x: 377, y: 198.6} + m_Scale: {x: 1, y: 1} + m_Translation: {x: 323.4, y: 198.6} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -316.3007 - y: -166.62419 - width: 632.6014 - height: 333.24838 + x: -323.4 + y: -198.6 + width: 646.8 + height: 397.2 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 942.5, y: 522.75} + m_LastWindowPixelSize: {x: 808.5, y: 522.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 97 + controlID: -1 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -167,7 +167,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 98 + controlID: -1 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,7 +185,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 194.4 + width: 193.6 height: 439.2 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -216,7 +216,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 193.4 + width: 192.6 height: 418.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -266,9 +266,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 194.4 + x: 193.6 y: 0 - width: 301.6 + width: 409.6 height: 439.2 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -379,9 +379,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 194.40001 + x: 193.6 y: 73.6 - width: 299.6 + width: 407.6 height: 418.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -447,7 +447,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -112.000015, y: 86} + snapOffset: {x: -112, y: 86} snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: Orientation @@ -588,16 +588,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 0 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 + m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 12.512918, y: 0.016688704, z: -0.825264} + m_Target: {x: 6.1841583, y: -2.4709787, z: 4.387806} speed: 2 - m_Value: {x: 12.512918, y: 0.016688704, z: -0.825264} + m_Value: {x: 6.1841583, y: -2.4709787, z: 4.387806} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -644,13 +644,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.07891053, y: -0.9205256, z: 0.25329545, w: -0.28690428} + m_Target: {x: 0.20607823, y: 0.4751202, z: -0.11551487, w: 0.84761405} speed: 2 - m_Value: {x: -0.07890789, y: -0.9204949, z: 0.253287, w: -0.2868947} + m_Value: {x: 0.20607823, y: 0.47512016, z: -0.11551487, w: 0.84761405} m_Size: - m_Target: 3.2342763 + m_Target: 4.957287 speed: 2 - m_Value: 3.2342763 + m_Value: 4.957287 m_Ortho: m_Target: 0 speed: 2 @@ -690,12 +690,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 496 + x: 603.2 y: 0 - width: 756 + width: 648.8 height: 439.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -748,10 +748,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.2000003 - y: 510.4 - width: 1119 - height: 265 + x: 0 + y: 512 + width: 1251 + height: 271 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -769,22 +769,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts/Weapons m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scripts/Weapons m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\.Downloads\Programming\Unity\Projects\Rheinmetall\3dshooter\3d-shooter + m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 79} - m_SelectedIDs: d8960000 - m_LastClickedID: 38616 - m_ExpandedIDs: 0000000086640000886400008a6400008c6400008e640000 + scrollPos: {x: 0, y: 269} + m_SelectedIDs: 806d0000 + m_LastClickedID: 28032 + m_ExpandedIDs: 000000008464000086640000886400008a6400008c6400008e64000090640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -812,7 +812,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000086640000886400008a6400008c6400008e640000 + m_ExpandedIDs: 000000008464000086640000886400008a6400008c6400008e64000090640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -837,8 +837,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 20630000 + m_LastClickedInstanceID: 25376 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000 m_RenameOverlay: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index d5f27bf..034e3a1 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 780.8 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 267 + controlID: 50 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 268 + controlID: 51 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,7 +170,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 269 + controlID: 52 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,7 +188,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 194.4 + width: 193.6 height: 439.2 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -212,7 +212,7 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 194.4 + x: 193.6 y: 0 width: 409.6 height: 439.2 @@ -239,12 +239,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 604 + x: 603.2 y: 0 - width: 648 + width: 648.8 height: 439.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -323,9 +323,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 604 + x: 603.2 y: 73.6 - width: 646 + width: 646.8 height: 418.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -337,7 +337,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 646, y: 397.2} + m_TargetSize: {x: 646.8, y: 397.2} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -352,8 +352,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -258.4 - m_HBaseRangeMax: 258.4 + m_HBaseRangeMin: -258.72 + m_HBaseRangeMax: 258.72 m_VBaseRangeMin: -158.88 m_VBaseRangeMax: 158.88 m_HAllowExceedBaseRangeMin: 1 @@ -373,23 +373,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 646 + width: 646.8 height: 397.2 - m_Scale: {x: 1.1919038, y: 1.1919038} - m_Translation: {x: 323, y: 198.6} + m_Scale: {x: 1, y: 1} + m_Translation: {x: 323.4, y: 198.6} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -270.99503 - y: -166.62419 - width: 541.99005 - height: 333.24838 + x: -323.4 + y: -198.6 + width: 646.8 + height: 397.2 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 807.5, y: 522.75} + m_LastWindowPixelSize: {x: 808.5, y: 522.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -417,7 +417,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 193.4 + width: 192.6 height: 418.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -426,9 +426,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3e6b0000 - m_LastClickedID: 27454 - m_ExpandedIDs: 34e3ffff40e3ffff446b0000826b0000886b0000966b0000986b00009a6b0000 + m_SelectedIDs: a898ffff + m_LastClickedID: -26456 + m_ExpandedIDs: 2e37ffff3a37ffff4a37ffff5237ffff5837ffff7e37ffff2647ffff4c47ffff526dffff5a6dffff606dffff866dffffb89affffbc9affffc49affffd09affffb49dffffb89dffffbe9dffff2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -553,7 +553,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 194.40001 + x: 193.6 y: 73.6 width: 407.6 height: 418.2 @@ -600,7 +600,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -633,7 +633,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -655,7 +655,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Constraints index: 2 @@ -666,7 +666,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Collisions index: 3 @@ -677,7 +677,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Navmesh Display index: 4 @@ -688,7 +688,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Agent Display index: 5 @@ -699,7 +699,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Obstacle Display index: 6 @@ -710,7 +710,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Occlusion Culling index: 7 @@ -721,7 +721,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger index: 8 @@ -732,7 +732,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility index: 9 @@ -743,7 +743,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles index: 10 @@ -752,7 +752,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -761,7 +761,7 @@ MonoBehaviour: layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 0 - m_OverrideSceneCullingMask: 0 + m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 0 @@ -769,9 +769,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.1277141, y: 3.8030603, z: -0.017456843} + m_Target: {x: 0.1161976, y: 0.056583047, z: 0.27936852} speed: 2 - m_Value: {x: 10.9051895, y: 3.3461263, z: 8.300079} + m_Value: {x: 0.1161976, y: 0.056583047, z: 0.27936852} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -783,7 +783,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 0 + showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -818,13 +818,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.057347883, y: 0.942116, z: -0.24952282, w: -0.21652032} + m_Target: {x: 0.24681377, y: 0.31336677, z: -0.08470608, w: 0.9130785} speed: 2 - m_Value: {x: 0.14027107, y: -0.802565, z: 0.20790805, w: 0.5412835} + m_Value: {x: 0.24681339, y: 0.3133663, z: -0.08470595, w: 0.91307706} m_Size: - m_Target: 0.45841318 + m_Target: 0.93294144 speed: 2 - m_Value: 0.48001382 + m_Value: 0.93294144 m_Ortho: m_Target: 0 speed: 2 @@ -879,8 +879,7 @@ MonoBehaviour: m_SaveData: [] m_SearchFilter: m_NameFilter: - m_ClassNames: - - Prefab + m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] m_VersionControlStates: [] @@ -890,22 +889,23 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/Scripts/Player m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scripts/Player m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\.Downloads\Programming\Unity\Projects\Rheinmetall\3dshooter\3d-shooter + m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 04ca9a3b - m_LastClickedID: 1000000004 - m_ExpandedIDs: 0000000086640000886400008a6400008c6400008e64000000ca9a3b + scrollPos: {x: 0, y: 360} + m_SelectedIDs: ec640000 + m_LastClickedID: 25836 + m_ExpandedIDs: 000000008e64000090640000926400009464000096640000986400009a640000b2640000bc6400001c67000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -933,7 +933,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000086640000886400008a6400008c6400008e640000 + m_ExpandedIDs: 000000008e64000090640000926400009464000096640000986400009a640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -961,7 +961,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000 + m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e6000003665000030650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: