diff --git a/Assets/Pics_Materials/final_Map1.jpg b/Assets/Pics_Materials/final_Map1.jpg new file mode 100644 index 0000000..a84f172 Binary files /dev/null and b/Assets/Pics_Materials/final_Map1.jpg differ diff --git a/Assets/Pics_Materials/final_Map1.jpg.meta b/Assets/Pics_Materials/final_Map1.jpg.meta new file mode 100644 index 0000000..b81ce91 --- /dev/null +++ b/Assets/Pics_Materials/final_Map1.jpg.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: c9b66bd59750bb947af3cc089a4d2969 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/AR.prefab b/Assets/Prefabs/AR.prefab index 409d5cb..09ce634 100644 --- a/Assets/Prefabs/AR.prefab +++ b/Assets/Prefabs/AR.prefab @@ -647,7 +647,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5850548977863442861} serializedVersion: 2 +<<<<<<< HEAD m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} +======= + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} +>>>>>>> f9295a93aa1ad4e11e0c2aca217f299e8ab071be m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2828, y: 3.615999, z: 1.2828} m_ConstrainProportionsScale: 0 @@ -657,7 +661,7 @@ Transform: - {fileID: 9091445594414695264} - {fileID: 7448449092846401218} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8402877828330663370 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Pistole.prefab b/Assets/Prefabs/Pistole.prefab index 14915f0..74bf0e0 100644 --- a/Assets/Prefabs/Pistole.prefab +++ b/Assets/Prefabs/Pistole.prefab @@ -27,7 +27,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3150477364047279588} serializedVersion: 2 +<<<<<<< HEAD m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} +======= + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} +>>>>>>> f9295a93aa1ad4e11e0c2aca217f299e8ab071be m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.62523, y: 0.62523, z: 2.5534475} m_ConstrainProportionsScale: 0 diff --git a/Assets/Prefabs/Wand_Cube.prefab b/Assets/Prefabs/Wand_Cube.prefab index db56e95..0fbdeae 100644 --- a/Assets/Prefabs/Wand_Cube.prefab +++ b/Assets/Prefabs/Wand_Cube.prefab @@ -29,7 +29,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 9, y: 12.886, z: 9} + m_LocalScale: {x: 3.08502, y: 12.886, z: 9} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Scenes/Test_Scene.unity b/Assets/Scenes/Test_Scene.unity index f1ba0e0..5a6cbab 100644 --- a/Assets/Scenes/Test_Scene.unity +++ b/Assets/Scenes/Test_Scene.unity @@ -131,6 +131,8 @@ GameObject: - component: {fileID: 330585545} - component: {fileID: 330585544} - component: {fileID: 330585547} + - component: {fileID: 330585548} + - component: {fileID: 330585549} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -256,6 +258,46 @@ MonoBehaviour: m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 m_Version: 2 +--- !u!114 &330585548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330585543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e857b6f5c4484c449d9e726f2fc5d36, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PlayerController + speed: 5 +--- !u!54 &330585549 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330585543} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -440,6 +482,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d6e2533bcfdaed4bbe3b0d811451466, type: 3} +--- !u!4 &825507998 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3761782979458803265, guid: a0abf67d2f77de14aba69a9826c206df, type: 3} + m_PrefabInstance: {fileID: 6183749844758426995} + m_PrefabAsset: {fileID: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -489,79 +536,10 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1112380836 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 4140538247651255256} - m_Modifications: - - target: {fileID: 1345163984726252992, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_Name - value: Munition (1) - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalScale.x - value: 0.5355531 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalScale.y - value: 0.35106266 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalScale.z - value: 0.06261455 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalPosition.x - value: 0.013612632 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalPosition.y - value: -0.4932232 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalPosition.z - value: -0.08104772 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalRotation.w - value: 0.71056306 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalRotation.x - value: -0.70363355 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 95.061005 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} ---- !u!4 &1112380837 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3} - m_PrefabInstance: {fileID: 1112380836} +--- !u!1 &934917315 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3150477364047279588, guid: a0abf67d2f77de14aba69a9826c206df, type: 3} + m_PrefabInstance: {fileID: 6183749844758426995} m_PrefabAsset: {fileID: 0} --- !u!1 &1741774807 GameObject: @@ -573,6 +551,8 @@ GameObject: m_Component: - component: {fileID: 1741774809} - component: {fileID: 1741774808} + - component: {fileID: 1741774810} + - component: {fileID: 1741774811} m_Layer: 0 m_Name: Code m_TagString: Untagged @@ -592,7 +572,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 079eca2fab980b94ea6d88afb4570141, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Map_Generator - tex: {fileID: 2800000, guid: 72ed3652e97b6d944991b49268c4603d, type: 3} + tex: {fileID: 2800000, guid: c9b66bd59750bb947af3cc089a4d2969, type: 3} width: 0 heigt: 0 pixelFarbe: [] @@ -612,6 +592,48 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1741774810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741774807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a10d4b5b33d924c428453e46c9513163, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Shoot + bulletPrefab: {fileID: 1055045214131575312} + spawnPointAR: {fileID: 4140538247651255258} + spawnPointPistol: {fileID: 825507998} + AR: 1 + Pistole: 1 +--- !u!114 &1741774811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741774807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57a6119ff88b0eb45940808859180edd, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EquipmentManager + AR: {fileID: 1910231657} + Pistole: {fileID: 934917315} + Verband: {fileID: 0} + Knife: {fileID: 0} + ARisOn: 1 + PistoleIsOn: 0 + VerbandIsOn: 0 + KnifeIsOn: 0 +--- !u!1 &1910231657 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} + m_PrefabInstance: {fileID: 4140538247651255255} + m_PrefabAsset: {fileID: 0} --- !u!1001 &748466228950979670 PrefabInstance: m_ObjectHideFlags: 0 @@ -796,54 +818,16 @@ PrefabInstance: propertyPath: m_Name value: AR objectReference: {fileID: 0} - - target: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} - propertyPath: m_LocalPosition.y - value: -2.133 - objectReference: {fileID: 0} - - target: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} - propertyPath: m_LocalPosition.z - value: 0.01 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 3358950876010158595, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} - insertIndex: -1 - addedObject: {fileID: 1112380837} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} - insertIndex: -1 - addedObject: {fileID: 4140538247651255259} + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} ---- !u!4 &4140538247651255256 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3358950876010158595, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} - m_PrefabInstance: {fileID: 4140538247651255255} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4140538247651255257 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} - m_PrefabInstance: {fileID: 4140538247651255255} - m_PrefabAsset: {fileID: 0} --- !u!4 &4140538247651255258 stripped Transform: m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} m_PrefabInstance: {fileID: 4140538247651255255} m_PrefabAsset: {fileID: 0} ---- !u!114 &4140538247651255259 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4140538247651255257} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a10d4b5b33d924c428453e46c9513163, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Shoot - bulletPrefab: {fileID: 1055045214131575312} - spawnPoint: {fileID: 4140538247651255258} --- !u!1001 &6183749844758426995 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/EquipmentManager.cs b/Assets/Scripts/EquipmentManager.cs new file mode 100644 index 0000000..de7a9b2 --- /dev/null +++ b/Assets/Scripts/EquipmentManager.cs @@ -0,0 +1,69 @@ +using UnityEngine; + +public class EquipmentManager : MonoBehaviour +{ + [SerializeField] public GameObject AR; + [SerializeField]public GameObject Pistole; + [SerializeField]public GameObject Verband; + [SerializeField]public GameObject Knife; + public bool ARisOn = true; + public bool PistoleIsOn = false; + public bool VerbandIsOn = false; + public bool KnifeIsOn = false; + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if(Input.GetKeyDown(KeyCode.Alpha2) && PistoleIsOn == false) + { + AR.SetActive(false); + Pistole.SetActive(true); + Verband.SetActive(false); + Knife.SetActive(false); + ARisOn = false; + PistoleIsOn = true; + VerbandIsOn = false; + KnifeIsOn = false; +} + if (Input.GetKeyDown(KeyCode.Alpha1) && ARisOn == false) + { + AR.SetActive(true); + Pistole.SetActive(false); + Verband.SetActive(false); + Knife.SetActive(false); + ARisOn = true; + PistoleIsOn = false; + VerbandIsOn = false; + KnifeIsOn = false; + + } + if (Input.GetKeyDown(KeyCode.Alpha3) && VerbandIsOn == false) + { + AR.SetActive(false); + Pistole.SetActive(false); + Verband.SetActive(true); + Knife.SetActive(false); + ARisOn = false; + PistoleIsOn = false; + VerbandIsOn = true; + KnifeIsOn = false; + + } + if (Input.GetKeyDown(KeyCode.Alpha4) && KnifeIsOn == false) + { + AR.SetActive(false); + Pistole.SetActive(false); + Verband.SetActive(false); + Knife.SetActive(true); + ARisOn = false; + PistoleIsOn = false; + VerbandIsOn = false; + KnifeIsOn = true; + + } + } +} diff --git a/Assets/Scripts/EquipmentManager.cs.meta b/Assets/Scripts/EquipmentManager.cs.meta new file mode 100644 index 0000000..884b817 --- /dev/null +++ b/Assets/Scripts/EquipmentManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 57a6119ff88b0eb45940808859180edd \ No newline at end of file diff --git a/Assets/animatens/ARReload.anim b/Assets/animatens/ARReload.anim index ce5a08f..4d38559 100644 --- a/Assets/animatens/ARReload.anim +++ b/Assets/animatens/ARReload.anim @@ -14,24 +14,67 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.212, y: 0.0055308715, z: 1.0134083} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0.212, y: 0.0055308715, z: 3} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3 + value: {x: 0.212, y: 0.0055308715, z: 1.0134083} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 20 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 3 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -46,8 +89,125 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.212 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.212 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0.212 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.0055308715 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.0055308715 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0.0055308715 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.0134083 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 1.0134083 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/animatens/Cube.controller b/Assets/animatens/Cube.controller index 92ef2be..826f0d5 100644 --- a/Assets/animatens/Cube.controller +++ b/Assets/animatens/Cube.controller @@ -1,5 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1109 &-8268199595776567124 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2786755031836192759} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,4 +23,117 @@ AnimatorController: m_Name: Cube serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 4654066992943198112} + 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} +--- !u!1101 &2037024320818357559 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5863680127007597875} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9166667 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &2786755031836192759 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PistolenReload + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2037024320818357559} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e057e97a5652a134b8fd6c61b3561981, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &4654066992943198112 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 2786755031836192759} + m_Position: {x: 370, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5863680127007597875} + m_Position: {x: 520, y: 170, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: + - {fileID: -8268199595776567124} + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 80, y: 130, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 2786755031836192759} +--- !u!1102 &5863680127007597875 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/animatens/Magazin.controller b/Assets/animatens/Magazin.controller index 04c265e..d3f9908 100644 --- a/Assets/animatens/Magazin.controller +++ b/Assets/animatens/Magazin.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-5636005725336394374 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 4205160119636926277} + m_Position: {x: 330, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1835453411591454278} + m_Position: {x: 589.83514, y: 86.648346, z: 0} + 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: 4205160119636926277} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,4 +34,91 @@ AnimatorController: m_Name: Magazin serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5636005725336394374} + 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} +--- !u!1102 &1835453411591454278 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &4205160119636926277 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ARReload + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5610612670239543290} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3db9ce13a5a789b499eaf571cd2cccd0, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &5610612670239543290 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1835453411591454278} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9166667 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/animatens/PistolenReload.anim b/Assets/animatens/PistolenReload.anim index b5df516..401260f 100644 --- a/Assets/animatens/PistolenReload.anim +++ b/Assets/animatens/PistolenReload.anim @@ -14,24 +14,67 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -0.9836381, z: 0.2898042} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: -5, z: 0.2898042} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3 + value: {x: 0, y: -0.9836381, z: 0.2898042} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 20 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 3 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -46,8 +89,125 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.9836381 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -0.9836381 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2898042 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2898042 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0.2898042 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: []