diff --git a/Assets/Animation.meta b/Assets/Animation.meta new file mode 100644 index 0000000..dfbcff6 --- /dev/null +++ b/Assets/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c3cc3a11b9034f439736e25c88f13e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Animations.meta b/Assets/Animation/Animations.meta new file mode 100644 index 0000000..edd63a3 --- /dev/null +++ b/Assets/Animation/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0fb4e52060e990949b544210b71a2266 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Animatior Objects.meta b/Assets/Animation/Animatior Objects.meta new file mode 100644 index 0000000..1dc3787 --- /dev/null +++ b/Assets/Animation/Animatior Objects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b996c0ece643834bbdc6db3df644d3c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Animatior Objects/Animations.meta b/Assets/Animation/Animatior Objects/Animations.meta new file mode 100644 index 0000000..9a77e1d --- /dev/null +++ b/Assets/Animation/Animatior Objects/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4744cad65085324bb87eaa3484e490d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Animatior Objects/PlayerAnimatior.controller b/Assets/Animation/Animatior Objects/PlayerAnimatior.controller new file mode 100644 index 0000000..1fec27c --- /dev/null +++ b/Assets/Animation/Animatior Objects/PlayerAnimatior.controller @@ -0,0 +1,193 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller +--- !u!1102 &-7052686061329051644 +======= +--- !u!1102 &-4337559610742278692 +>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Shoot + m_Speed: 4 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1689963099303595595} + 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: 1 + m_Motion: {fileID: -8945691123924629249, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} + m_Tag: + m_SpeedParameter: Time + m_MirrorParameter: + m_CycleOffsetParameter: +<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller + m_TimeParameter: Time +--- !u!1107 &-2034536485000263243 +AnimatorStateMachine: + serializedVersion: 6 +======= + m_TimeParameter: +--- !u!1101 &-1689963099303595595 +AnimatorStateTransition: +>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} +<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7052686061329051644} + m_Position: {x: 247.81976, y: 182.43098, 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: -7052686061329051644} +======= + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2698501508598014645} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-900705370146274576 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: shootTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4337559610742278692} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9945216 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerAnimatior + serializedVersion: 5 + m_AnimatorParameters: +<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller + - m_Name: Time + m_Type: 1 +======= + - m_Name: shootTrigger + m_Type: 9 +>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2034536485000263243} + 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} +<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller +======= +--- !u!1102 &2698501508598014645 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Default + m_Speed: 3 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -900705370146274576} + 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: -3100369314251171874, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &7614406280852874800 +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: 2698501508598014645} + m_Position: {x: 260, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4337559610742278692} + m_Position: {x: 260, y: 100, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 30, y: 10, z: 0} + m_EntryPosition: {x: 30, y: 130, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 2698501508598014645} +>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller diff --git a/Assets/Animation/Animatior Objects/PlayerAnimatior.controller.meta b/Assets/Animation/Animatior Objects/PlayerAnimatior.controller.meta new file mode 100644 index 0000000..95210db --- /dev/null +++ b/Assets/Animation/Animatior Objects/PlayerAnimatior.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 37294cd9ecc09aa4a8f3cbdcf0f82dbc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Human.blend b/Assets/Objects/Human.blend index 7c4c72b..2bb9140 100644 Binary files a/Assets/Objects/Human.blend and b/Assets/Objects/Human.blend differ diff --git a/Assets/Objects/Human.blend1 b/Assets/Objects/Human.blend1 index 9e8cc94..d399570 100644 Binary files a/Assets/Objects/Human.blend1 and b/Assets/Objects/Human.blend1 differ diff --git a/Assets/Objects/Human.fbx b/Assets/Objects/Human.fbx index 7fcf471..76b2d89 100644 Binary files a/Assets/Objects/Human.fbx and b/Assets/Objects/Human.fbx differ diff --git a/Assets/Objects/Human.fbx.meta b/Assets/Objects/Human.fbx.meta index 03a6b89..18ba1ca 100644 --- a/Assets/Objects/Human.fbx.meta +++ b/Assets/Objects/Human.fbx.meta @@ -4,8 +4,20 @@ ModelImporter: serializedVersion: 21100 internalIDToNameTable: - first: - 74: 8349542763059015795 - second: Armature|Walk + 74: 6881873686158965456 + second: Armature|Falling + - first: + 74: -8945691123924629249 + second: Idle + - first: + 74: 1079665108409675491 + second: Armature|Jump + - first: + 74: -3386421022173712162 + second: Armature|yeet + - first: + 74: -3176884680461750752 + second: Aim externalObjects: {} materials: materialImportMode: 2 @@ -26,7 +38,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 3 + animationCompression: 0 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 @@ -35,10 +47,10 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: Armature|Walk - takeName: Armature|Walk + name: Idle + takeName: Armature|Idle internalID: 0 - firstFrame: 0 + firstFrame: 1 lastFrame: 24 wrapMode: 0 orientationOffsetY: 0 @@ -56,11 +68,152 @@ ModelImporter: keepOriginalPositionXZ: 0 heightFromFeet: 0 mirror: 0 + bodyMask: 01000000010000000000000001000000010000000000000000000000000000000000000001000000010000000000000000000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: Armature + weight: 1 + - path: Armature/Foot_Control_L + weight: 1 + - path: Armature/Foot_Control_R + weight: 1 + - path: Armature/Hand_L.001 + weight: 1 + - path: Armature/Hand_R.001 + weight: 1 + - path: Armature/Hip + weight: 1 + - path: Armature/Hip/Abdomen + weight: 1 + - path: Armature/Hip/Abdomen/Chest + weight: 1 + - path: Armature/Hip/Abdomen/Chest/Head + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_L + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L/Hand_L + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_R + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R/Hand_R + weight: 1 + - path: Armature/Hip/Thigh_L + weight: 1 + - path: Armature/Hip/Thigh_L/Shin_L + weight: 1 + - path: Armature/Hip/Thigh_L/Shin_L/Foot_L + weight: 1 + - path: Armature/Hip/Thigh_R + weight: 1 + - path: Armature/Hip/Thigh_R/Shin_R + weight: 1 + - path: Armature/Hip/Thigh_R/Shin_R/Foot_R + weight: 1 + - path: Armature/LookAt + weight: 1 + - path: Armature/Thigh_Control_L + weight: 1 + - path: Armature/Thigh_Control_R + weight: 1 + - path: Armature/UpperArm_Control_L + weight: 1 + - path: Armature/UpperArm_Control_R + weight: 1 + - path: Cube + weight: 1 + maskType: 1 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Aim + takeName: Armature|Idle + internalID: 0 + firstFrame: 34 + lastFrame: 213 + 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 + transformMask: + - path: + weight: 1 + - path: Armature + weight: 1 + - path: Armature/Foot_Control_L + weight: 0 + - path: Armature/Foot_Control_R + weight: 0 + - path: Armature/Hand_L.001 + weight: 0 + - path: Armature/Hand_R.001 + weight: 0 + - path: Armature/Hip + weight: 1 + - path: Armature/Hip/Abdomen + weight: 1 + - path: Armature/Hip/Abdomen/Chest + weight: 1 + - path: Armature/Hip/Abdomen/Chest/Head + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_L + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L/Hand_L + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_R + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R/Hand_R + weight: 1 + - path: Armature/Hip/Thigh_L + weight: 1 + - path: Armature/Hip/Thigh_L/Shin_L + weight: 1 + - path: Armature/Hip/Thigh_L/Shin_L/Foot_L + weight: 1 + - path: Armature/Hip/Thigh_R + weight: 1 + - path: Armature/Hip/Thigh_R/Shin_R + weight: 1 + - path: Armature/Hip/Thigh_R/Shin_R/Foot_R + weight: 1 + - path: Armature/LookAt + weight: 0 + - path: Armature/Thigh_Control_L + weight: 0 + - path: Armature/Thigh_Control_R + weight: 0 + - path: Armature/UpperArm_Control_L + weight: 0 + - path: Armature/UpperArm_Control_R + weight: 0 + - path: Cube + weight: 0 + maskType: 0 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 isReadable: 0 @@ -255,127 +408,127 @@ ModelImporter: scale: {x: 100, y: 100, z: 100} - name: Hip parentName: Armature - position: {x: 7.948426e-10, y: 0.0000000017881393, z: 0.008924431} - rotation: {x: 0.7071068, y: -0.0000000020579487, z: -0.0000000020579605, w: 0.7071068} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.0000000011205334, y: 0.0000000023841857, z: 0.00892443} + rotation: {x: 0.7071068, y: -0, z: -4.8445783e-15, w: 0.7071068} + scale: {x: 1, y: 0.9999998, z: 0.9999998} - name: Abdomen parentName: Hip - position: {x: -0, y: 0.0010998978, z: 0} - rotation: {x: -0, y: -0.000000116415315, z: 7.1054274e-15, w: 1} - scale: {x: 0.9999999, y: 1, z: 0.9999999} + position: {x: -0, y: 0.0010998979, z: 0} + rotation: {x: -0, y: -0.00000011920927, z: 7.1054274e-15, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} - name: Chest parentName: Abdomen - position: {x: -0, y: 0.002230785, z: 0} + position: {x: -0, y: 0.0022307856, z: 0} rotation: {x: -0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 0.9999999, z: 0.99999994} + scale: {x: 1, y: 1, z: 1} - name: Head parentName: Chest - position: {x: -0, y: 0.002965438, z: 0} - rotation: {x: -1.6584554e-17, y: 1.1934986e-10, z: -1.4246027e-10, w: 1} - scale: {x: 0.99999994, y: 0.9999998, z: 0.99999994} + position: {x: -0, y: 0.0029654386, z: 0} + rotation: {x: -1.6940657e-21, y: -2.1316282e-14, z: -1.4210855e-14, w: 1} + scale: {x: 1, y: 1, z: 1} - name: UpperArm_L parentName: Chest - position: {x: -0.0013659928, y: 0.0018180575, z: -0.00022726202} - rotation: {x: -0.4864988, y: 0.46149784, z: 0.5357424, w: 0.51314586} - scale: {x: 0.99999976, y: 0.9999995, z: 1} + position: {x: -0.0013659928, y: 0.0018180588, z: -0.00022726202} + rotation: {x: -0.48649895, y: 0.46149766, z: 0.53574246, w: 0.5131458} + scale: {x: 0.99999994, y: 0.99999976, z: 1} - name: Forearm_L parentName: UpperArm_L - position: {x: -9.313225e-11, y: 0.0029282072, z: -7.4505804e-11} - rotation: {x: -0.009157031, y: -0.09181186, z: -0.038012516, w: -0.99500847} - scale: {x: 1.0000002, y: 0.9999999, z: 0.99999976} + position: {x: 3.7252902e-11, y: 0.0029282074, z: 3.7252902e-11} + rotation: {x: -0.009157182, y: -0.09181181, z: -0.038012523, w: -0.99500847} + scale: {x: 0.9999999, y: 0.9999997, z: 1.0000002} - name: Hand_L parentName: Forearm_L - position: {x: -1.3038516e-10, y: 0.0018045367, z: -5.820766e-11} - rotation: {x: 0.09934627, y: 0.7378955, z: -0.010978944, w: -0.667473} - scale: {x: 1.0000004, y: 1.0000006, z: 0.99999994} + position: {x: -1.862645e-10, y: 0.001804537, z: -1.11758706e-10} + rotation: {x: 0.09934618, y: 0.7378954, z: -0.010979064, w: -0.6674731} + scale: {x: 1, y: 1.0000002, z: 0.99999976} - name: UpperArm_R parentName: Chest - position: {x: 0.0013659928, y: 0.0018180575, z: -0.00022726262} - rotation: {x: 0.486499, y: 0.4614976, z: 0.53574234, w: -0.51314604} - scale: {x: 1.0000004, y: 1.0000004, z: 0.9999998} + position: {x: 0.0013659928, y: 0.0018180588, z: -0.00022726266} + rotation: {x: 0.48649913, y: 0.46149755, z: 0.5357424, w: -0.513146} + scale: {x: 1.0000004, y: 1.0000002, z: 1.0000001} - name: Forearm_R parentName: UpperArm_R - position: {x: 1.8626451e-11, y: 0.002928207, z: -5.401671e-10} - rotation: {x: 0.009157239, y: -0.09181183, z: -0.038012635, w: 0.99500847} - scale: {x: 1.0000006, y: 1.0000002, z: 1.0000002} + position: {x: 1.11758706e-10, y: 0.0029282072, z: -2.7939676e-10} + rotation: {x: 0.009157656, y: -0.09181198, z: -0.03801266, w: 0.99500847} + scale: {x: 1.0000002, y: 0.9999999, z: 0.99999976} - name: Hand_R parentName: Forearm_R - position: {x: -7.4505804e-11, y: 0.0018045371, z: -5.3551046e-11} - rotation: {x: -0.09934638, y: 0.73789537, z: -0.010979169, w: 0.66747296} - scale: {x: 0.9999997, y: 0.9999999, z: 0.99999976} + position: {x: -1.3038516e-10, y: 0.0018045371, z: -1.8626451e-11} + rotation: {x: -0.09934641, y: 0.7378955, z: -0.010979316, w: 0.66747296} + scale: {x: 0.9999999, y: 0.9999998, z: 0.99999976} - name: Thigh_L parentName: Hip - position: {x: -0.00069675926, y: -0.00007037975, z: -0.00040403535} - rotation: {x: 0.7066821, y: -0.08031961, z: -0.70253026, w: -0.024505584} - scale: {x: 1.000001, y: 1, z: 1.0000001} + position: {x: -0.00069675926, y: -0.000070379676, z: -0.00040403535} + rotation: {x: 0.7066821, y: -0.08031961, z: -0.70253026, w: -0.024505585} + scale: {x: 1.0000002, y: 1.0000006, z: 0.99999976} - name: Shin_L parentName: Thigh_L - position: {x: -1.5366822e-10, y: 0.003972938, z: -1.6298145e-11} - rotation: {x: -0.00014329328, y: 0.008907664, z: 0.05948525, w: -0.9981895} - scale: {x: 1.0000004, y: 1.0000004, z: 1} + position: {x: 4.4703483e-10, y: 0.003972937, z: 0} + rotation: {x: -0.00014327465, y: 0.008907662, z: 0.05948522, w: -0.9981895} + scale: {x: 1.0000012, y: 0.99999994, z: 1.0000004} - name: Foot_L parentName: Shin_L - position: {x: -2.3283064e-12, y: 0.0039656768, z: 1.36788e-10} - rotation: {x: 0.45208237, y: -0.604719, z: -0.36648977, w: -0.54371107} - scale: {x: 0.9999999, y: 1.0000004, z: 0.9999999} + position: {x: -4.842877e-10, y: 0.0039656768, z: -1.2340023e-10} + rotation: {x: 0.45208246, y: -0.604719, z: -0.36648992, w: -0.54371107} + scale: {x: 0.9999998, y: 1.0000002, z: 1.0000002} - name: Thigh_R parentName: Hip - position: {x: 0.00069675926, y: -0.00007037975, z: -0.00040403544} - rotation: {x: 0.70668215, y: 0.080319576, z: 0.7025302, w: -0.024505673} - scale: {x: 1.000001, y: 1.0000001, z: 1.0000005} + position: {x: 0.00069675926, y: -0.000070379676, z: -0.00040403535} + rotation: {x: 0.70668215, y: 0.080319576, z: 0.7025302, w: -0.024505671} + scale: {x: 1.0000004, y: 1.0000004, z: 1} - name: Shin_R parentName: Thigh_R - position: {x: -8.8475643e-11, y: 0.003972937, z: 2.2933817e-10} - rotation: {x: 0.00014321505, y: 0.008907782, z: 0.059485234, w: 0.9981895} - scale: {x: 1.0000005, y: 1.0000004, z: 1.0000005} + position: {x: -3.7252902e-11, y: 0.003972937, z: -9.313225e-11} + rotation: {x: 0.00014320014, y: 0.00890778, z: 0.05948522, w: 0.9981895} + scale: {x: 1.0000007, y: 0.9999999, z: 1} - name: Foot_R parentName: Shin_R - position: {x: 3.7252902e-11, y: 0.003965677, z: -3.259629e-11} + position: {x: 3.5390257e-10, y: 0.0039656763, z: -1.3853423e-10} rotation: {x: -0.45208243, y: -0.604719, z: -0.36648992, w: 0.54371107} - scale: {x: 0.99999964, y: 0.99999946, z: 1.0000005} + scale: {x: 0.99999994, y: 1.0000002, z: 0.9999997} - name: Foot_Control_L parentName: Armature - position: {x: -0.0013605166, y: -0.0016545627, z: -0.007761089} - rotation: {x: 0.999981, y: -3.552714e-15, z: 1.0658142e-14, w: 0.006168336} - scale: {x: 1, y: 0.99999994, z: 1.000678} + position: {x: -0.0018724086, y: 0.0002533596, z: -0.0075386786} + rotation: {x: 0.999981, y: -3.552714e-15, z: 1.776357e-15, w: 0.006168336} + scale: {x: 1, y: 0.99999994, z: 1.0006776} - name: Thigh_Control_L parentName: Armature - position: {x: -0.00093339814, y: -0.006269274, z: -0.0039872816} + position: {x: -0.0012845839, y: -0.006269274, z: -0.0039872816} rotation: {x: 0.98892564, y: -0.000000008188669, z: -0.14841183, w: -8.881784e-16} scale: {x: 1, y: 1, z: 0.99999994} - name: UpperArm_Control_L parentName: Armature - position: {x: -0.00085530936, y: -0.0039713676, z: 0.003075037} - rotation: {x: -0.2692533, y: -0.6538369, z: 0.6538369, w: 0.2692533} - scale: {x: 0.72619903, y: 0.99999976, z: 0.7314929} + position: {x: -0.0034226924, y: -0.0039713676, z: 0.0025702473} + rotation: {x: -0.26925328, y: -0.6538369, z: 0.6538369, w: 0.26925328} + scale: {x: 0.99999994, y: 1, z: 1} - name: Hand_L.001 parentName: Armature - position: {x: -0.0022795226, y: -0.00026142012, z: 0.0010587472} + position: {x: -0.004653928, y: -0.0010747877, z: 0.000071166156} rotation: {x: 0.00009068196, y: -0.7071068, z: 0.7071068, w: 0.00009159633} - scale: {x: 0.48980606, y: 0.99999964, z: 0.9999998} + scale: {x: 0.9999995, y: 0.99999964, z: 0.9999998} - name: Foot_Control_R parentName: Armature - position: {x: 0.0013605207, y: 0.0031248948, z: -0.0069798133} - rotation: {x: 0.999981, y: -0.000000025788854, z: -0.000004175075, w: 0.006168336} - scale: {x: 1, y: 0.99999994, z: 1.000678} + position: {x: 0.0018724086, y: 0.0002533596, z: -0.0075386786} + rotation: {x: 0.999981, y: -0.000000025788854, z: -0.000004175074, w: 0.006168336} + scale: {x: 1, y: 0.99999994, z: 1.0006776} - name: Thigh_Control_R parentName: Armature - position: {x: 0.00093339814, y: -0.006269274, z: -0.0039872816} + position: {x: 0.0012845839, y: -0.006269274, z: -0.0039872816} rotation: {x: 0.98892564, y: -0.000000008188669, z: 0.14841184, w: 1.5543122e-15} scale: {x: 1, y: 1, z: 1.0000001} - name: UpperArm_Control_R parentName: Armature - position: {x: 0.00085530936, y: -0.0039713676, z: 0.003075037} - rotation: {x: 0.2692533, y: -0.6538369, z: 0.6538369, w: -0.2692533} - scale: {x: 0.72619903, y: 0.99999976, z: 0.7314929} + position: {x: 0.0034226924, y: -0.0039713676, z: 0.0025702473} + rotation: {x: 0.26925328, y: -0.6538369, z: 0.6538369, w: -0.26925328} + scale: {x: 0.99999994, y: 1, z: 1} - name: Hand_R.001 parentName: Armature - position: {x: 0.0022795226, y: -0.00026142012, z: 0.0010587472} + position: {x: 0.004653928, y: -0.0010747877, z: 0.000071166156} rotation: {x: -0.000090681955, y: -0.7071068, z: 0.7071068, w: -0.000091596325} - scale: {x: 0.48980606, y: 0.99999964, z: 0.9999998} + scale: {x: 0.9999995, y: 0.99999964, z: 0.9999998} - name: LookAt parentName: Armature - position: {x: -0, y: -0.0037967255, z: 0.0062961215} + position: {x: -0, y: -0.0037967255, z: 0.0019327133} rotation: {x: 0.7071068, y: -0.00000008429373, z: -0.000000084293724, w: 0.7071068} scale: {x: 1, y: 0.9999998, z: 0.9999998} armTwist: 0.5 diff --git a/Assets/Objects/HumanAnimationControler.controller b/Assets/Objects/HumanAnimationControler.controller index 82b653c..5aaf9fa 100644 --- a/Assets/Objects/HumanAnimationControler.controller +++ b/Assets/Objects/HumanAnimationControler.controller @@ -1,28 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!206 &-7127493751781251651 -BlendTree: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Childs: [] - m_BlendParameter: Blend - m_BlendParameterY: Blend - m_MinThreshold: 0 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 1 - m_NormalizedBlendValues: 0 - m_BlendType: 0 ---- !u!1102 &-1129337770131920209 +--- !u!1102 &-4969741544625218604 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Armature|Walk + m_Name: Aim m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -34,13 +19,39 @@ AnimatorState: m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 8349542763059015795, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} + m_TimeParameterActive: 1 + m_Motion: {fileID: -3176884680461750752, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} + m_Tag: + m_SpeedParameter: Time + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: Time +--- !u!1102 &-781170557910458175 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Aim + 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: 1 + m_Motion: {fileID: -3176884680461750752, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: - m_TimeParameter: + m_TimeParameter: Time --- !u!1107 &-29801462378204144 AnimatorStateMachine: serializedVersion: 6 @@ -49,13 +60,7 @@ AnimatorStateMachine: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -1129337770131920209} - m_Position: {x: 240, y: 70, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1753614070743940096} - m_Position: {x: 130, y: 180, z: 0} + m_ChildStates: [] m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -65,7 +70,7 @@ AnimatorStateMachine: 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: -1129337770131920209} + m_DefaultState: {fileID: 0} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -75,12 +80,18 @@ AnimatorController: m_Name: HumanAnimationControler serializedVersion: 5 m_AnimatorParameters: + - m_Name: Time + m_Type: 1 + m_DefaultFloat: 1 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} - m_Name: Blend m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -94,14 +105,38 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &1753614070743940096 + - serializedVersion: 5 + m_Name: idle + m_StateMachine: {fileID: 6188539927546276906} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: yeet3 + m_StateMachine: {fileID: 2359803421989368082} + m_Mask: {fileID: 31900000, guid: 6c0f24f42b987ce4884915e4f15bba46, type: 2} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &111108561234939883 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree + m_Name: New State m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -114,9 +149,75 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -7127493751781251651} + m_Motion: {fileID: -8945691123924629249, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1107 &949450522252485443 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Aim + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -781170557910458175} + m_Position: {x: 230, y: 60, 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: -781170557910458175} +--- !u!1107 &2359803421989368082 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: yeet3 + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -4969741544625218604} + m_Position: {x: 320, y: 80, 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: -4969741544625218604} +--- !u!1107 &6188539927546276906 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 111108561234939883} + m_Position: {x: 321.26492, y: 66.38924, 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: 111108561234939883} diff --git a/Assets/Objects/HumanArms.mask b/Assets/Objects/HumanArms.mask new file mode 100644 index 0000000..635b25a --- /dev/null +++ b/Assets/Objects/HumanArms.mask @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!319 &31900000 +AvatarMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HumanArms + m_Mask: 00000000010000000100000000000000000000000100000001000000010000000100000000000000000000000100000001000000 + m_Elements: [] diff --git a/Assets/Objects/HumanArms.mask.meta b/Assets/Objects/HumanArms.mask.meta new file mode 100644 index 0000000..4f9358f --- /dev/null +++ b/Assets/Objects/HumanArms.mask.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c0f24f42b987ce4884915e4f15bba46 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 31900000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/HumanLegs.mask b/Assets/Objects/HumanLegs.mask new file mode 100644 index 0000000..d05c116 --- /dev/null +++ b/Assets/Objects/HumanLegs.mask @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!319 &31900000 +AvatarMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HumanLegs + m_Mask: 01000000010000000000000001000000010000000000000000000000000000000000000001000000010000000000000000000000 + m_Elements: + - m_Path: + m_Weight: 1 + - m_Path: Armature + m_Weight: 1 + - m_Path: Armature/Foot_Control_L + m_Weight: 1 + - m_Path: Armature/Foot_Control_R + m_Weight: 1 + - m_Path: Armature/Hand_L.001 + m_Weight: 1 + - m_Path: Armature/Hand_R.001 + m_Weight: 1 + - m_Path: Armature/Hip + m_Weight: 1 + - m_Path: Armature/Hip/Abdomen + m_Weight: 1 + - m_Path: Armature/Hip/Abdomen/Chest + m_Weight: 1 + - m_Path: Armature/Hip/Abdomen/Chest/Head + m_Weight: 1 + - m_Path: Armature/Hip/Abdomen/Chest/UpperArm_L + m_Weight: 1 + - m_Path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L + m_Weight: 1 + - m_Path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L/Hand_L + m_Weight: 1 + - m_Path: Armature/Hip/Abdomen/Chest/UpperArm_R + m_Weight: 1 + - m_Path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R + m_Weight: 1 + - m_Path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R/Hand_R + m_Weight: 1 + - m_Path: Armature/Hip/Thigh_L + m_Weight: 1 + - m_Path: Armature/Hip/Thigh_L/Shin_L + m_Weight: 1 + - m_Path: Armature/Hip/Thigh_L/Shin_L/Foot_L + m_Weight: 1 + - m_Path: Armature/Hip/Thigh_R + m_Weight: 1 + - m_Path: Armature/Hip/Thigh_R/Shin_R + m_Weight: 1 + - m_Path: Armature/Hip/Thigh_R/Shin_R/Foot_R + m_Weight: 1 + - m_Path: Armature/LookAt + m_Weight: 1 + - m_Path: Armature/Thigh_Control_L + m_Weight: 1 + - m_Path: Armature/Thigh_Control_R + m_Weight: 1 + - m_Path: Armature/UpperArm_Control_L + m_Weight: 1 + - m_Path: Armature/UpperArm_Control_R + m_Weight: 1 + - m_Path: Cube + m_Weight: 1 diff --git a/Assets/Objects/HumanLegs.mask.meta b/Assets/Objects/HumanLegs.mask.meta new file mode 100644 index 0000000..b25486e --- /dev/null +++ b/Assets/Objects/HumanLegs.mask.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 260396a74121dac48aa1a8521a962289 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 31900000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/M9/M9 Animation Controller.controller b/Assets/Objects/Weapons/M9/M9 Animation Controller.controller index 3ee8730..1a67fd3 100644 --- a/Assets/Objects/Weapons/M9/M9 Animation Controller.controller +++ b/Assets/Objects/Weapons/M9/M9 Animation Controller.controller @@ -7,10 +7,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Idle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 1172386202742331217} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -20,12 +21,39 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 4781951162920444690, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_Motion: {fileID: -3100369314251171874, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-885011302923738855 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Shoot + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6832378349465690128} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 1 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 4781951162920444690, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_Tag: + m_SpeedParameter: ShootSpeed + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -34,7 +62,19 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: M9 Animation Controller serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Shoot + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: ShootSpeed + m_Type: 1 + m_DefaultFloat: 1 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -48,6 +88,53 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &1172386202742331217 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Shoot + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -885011302923738855} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6832378349465690128 +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: -4965080280457402183} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &7614406280852874800 AnimatorStateMachine: serializedVersion: 6 @@ -60,6 +147,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -4965080280457402183} m_Position: {x: 300, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -885011302923738855} + m_Position: {x: 310, y: 230, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Objects/Weapons/M9/M92.fbx b/Assets/Objects/Weapons/M9/M92.fbx index e3bcb46..f1b540e 100644 Binary files a/Assets/Objects/Weapons/M9/M92.fbx and b/Assets/Objects/Weapons/M9/M92.fbx differ diff --git a/Assets/Objects/Weapons/M9/M92.fbx.meta b/Assets/Objects/Weapons/M9/M92.fbx.meta index 34e0e49..f785f17 100644 --- a/Assets/Objects/Weapons/M9/M92.fbx.meta +++ b/Assets/Objects/Weapons/M9/M92.fbx.meta @@ -5,7 +5,10 @@ ModelImporter: internalIDToNameTable: - first: 74: 4781951162920444690 - second: Armature|ArmatureAction + second: Shoot + - first: + 74: -3100369314251171874 + second: Idle externalObjects: {} materials: materialImportMode: 2 @@ -36,11 +39,11 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: Armature|ArmatureAction + name: Shoot takeName: Armature|ArmatureAction internalID: 0 firstFrame: 0 - lastFrame: 10 + lastFrame: 24 wrapMode: 0 orientationOffsetY: 0 level: 0 @@ -64,6 +67,35 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Idle + takeName: Armature|ArmatureAction + internalID: 0 + firstFrame: 24 + lastFrame: 25 + 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: [] diff --git a/Assets/Prefabs/Networing.meta b/Assets/Prefabs/Networing.meta new file mode 100644 index 0000000..34857f6 --- /dev/null +++ b/Assets/Prefabs/Networing.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8a065d12eb72f14eb0cd83ccd9258fd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/DebugCanvas.prefab b/Assets/Prefabs/Networing/DebugCanvas.prefab similarity index 100% rename from Assets/Prefabs/DebugCanvas.prefab rename to Assets/Prefabs/Networing/DebugCanvas.prefab diff --git a/Assets/Prefabs/DebugCanvas.prefab.meta b/Assets/Prefabs/Networing/DebugCanvas.prefab.meta similarity index 100% rename from Assets/Prefabs/DebugCanvas.prefab.meta rename to Assets/Prefabs/Networing/DebugCanvas.prefab.meta diff --git a/Assets/Prefabs/GameManager.prefab b/Assets/Prefabs/Networing/GameManager.prefab similarity index 100% rename from Assets/Prefabs/GameManager.prefab rename to Assets/Prefabs/Networing/GameManager.prefab diff --git a/Assets/Prefabs/GameManager.prefab.meta b/Assets/Prefabs/Networing/GameManager.prefab.meta similarity index 100% rename from Assets/Prefabs/GameManager.prefab.meta rename to Assets/Prefabs/Networing/GameManager.prefab.meta diff --git a/Assets/Prefabs/Player.meta b/Assets/Prefabs/Player.meta new file mode 100644 index 0000000..208ce0b --- /dev/null +++ b/Assets/Prefabs/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9503bb9b0dcaf34097c8a469fd53dc0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player Animation Test.prefab b/Assets/Prefabs/Player/Player Animation Test.prefab similarity index 74% rename from Assets/Prefabs/Player Animation Test.prefab rename to Assets/Prefabs/Player/Player Animation Test.prefab index 86b591a..3cf621c 100644 --- a/Assets/Prefabs/Player Animation Test.prefab +++ b/Assets/Prefabs/Player/Player Animation Test.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 65959153} + - component: {fileID: 291279326086681984} m_Layer: 0 m_Name: LeftHand m_TagString: Untagged @@ -31,6 +32,30 @@ Transform: m_Father: {fileID: 1197111049} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &291279326086681984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65959152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aeda7bfbf984f2a4da5ab4b8967b115d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_Root: {fileID: 8334588817950881727} + m_Mid: {fileID: 5739201115059209923} + m_Tip: {fileID: 1706812538552309319} + m_Target: {fileID: 2781132594439880980} + m_Hint: {fileID: 0} + m_TargetPositionWeight: 1 + m_TargetRotationWeight: 1 + m_HintWeight: 1 + m_MaintainTargetPositionOffset: 0 + m_MaintainTargetRotationOffset: 0 --- !u!1 &357599823 GameObject: m_ObjectHideFlags: 0 @@ -59,8 +84,7 @@ Transform: m_LocalPosition: {x: 0.023, y: -0.035, z: -0.066} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1893374244} + m_Children: [] m_Father: {fileID: 1197111049} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} @@ -120,7 +144,7 @@ Transform: - {fileID: 357599824} - {fileID: 65959153} m_Father: {fileID: 6272346181302961296} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8865635171929772803 MonoBehaviour: @@ -136,7 +160,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Weight: 1 m_Effectors: [] ---- !u!1 &1893374243 +--- !u!1 &1122453500918594702 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -144,29 +168,95 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1893374244} + - component: {fileID: 6035287771982183217} + - component: {fileID: 562931964943938264} + - component: {fileID: 7322695044511352809} + - component: {fileID: 492736715721067422} m_Layer: 0 - m_Name: RightHint + m_Name: Mid m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1893374244 + m_IsActive: 0 +--- !u!4 &6035287771982183217 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1893374243} + m_GameObject: {fileID: 1122453500918594702} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.934, y: 0, z: -0.306} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 357599824} + m_Father: {fileID: 4074665071222326704} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &562931964943938264 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122453500918594702} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7322695044511352809 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122453500918594702} + 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: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!135 &492736715721067422 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122453500918594702} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1749713556945343754 GameObject: m_ObjectHideFlags: 0 @@ -190,14 +280,45 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1749713556945343754} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 0.09, y: -0.05, z: 0.03} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4058555163434875561} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} +--- !u!1 &2221492823855642591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2781132594439880980} + 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 &2781132594439880980 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2221492823855642591} + m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 0.09, y: -0.06, z: -0.03} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4058555163434875561} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} --- !u!1 &3649358604728444914 GameObject: m_ObjectHideFlags: 0 @@ -229,6 +350,18 @@ Transform: m_Father: {fileID: 6272346181657429396} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2425026116520232903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3682030003239559187} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4824770690127859843 GameObject: m_ObjectHideFlags: 0 @@ -424,6 +557,7 @@ GameObject: - component: {fileID: 1509131218531316230} - component: {fileID: 8957579265169979397} - component: {fileID: 3965891812990671158} + - component: {fileID: 4276885029697240453} m_Layer: 0 m_Name: Player Animation Test m_TagString: Player @@ -446,8 +580,8 @@ Transform: - {fileID: 5844730607706440515} - {fileID: 6272346182417644039} - {fileID: 981273033772084037} - - {fileID: 5767109144009335573} - {fileID: 1197111049} + - {fileID: 5767109144009335573} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -517,7 +651,7 @@ MonoBehaviour: walkSpeed: 6 sprintSpeed: 8 moveSmoothTime: 0.05 - gravity: 0 + gravity: -10 jumpHeight: 1.2 groundCheck: {fileID: 6272346182417644039} groundMask: @@ -649,6 +783,9 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 muzzle: {fileID: 3649358604728444914} + shootAnim: {fileID: 4276885029697240453} + fireRate: 320 + gunHoldPos: {fileID: 3682030003239559187} --- !u!114 &6207632454083444980 MonoBehaviour: m_ObjectHideFlags: 0 @@ -745,6 +882,36 @@ MonoBehaviour: - m_Rig: {fileID: 8865635171929772803} m_Active: 1 m_Effectors: [] +--- !u!114 &4276885029697240453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b366149a1bdd3ad4884ac2afe0fe11a1, type: 3} + m_Name: + m_EditorClassIdentifier: + gun: {fileID: 3682030003239559187} + gunHolder: {fileID: 6522444664664986769} + gunPositionObj: {fileID: 7263663517583319679} + gunRotationObj: {fileID: 7768205653369755348} + positionRecoil: 1 + rotationRecoil: 1 + positionMultX: 0.1 + positionMultY: 0.1 + positionMultZ: 1 + rotX: 1 + rotationMultX: 25 + rotY: 1 + rotationMultY: 25 + rotZ: 1 + rotationMultZ: 15 + returnForce: 0.006 + impulsForce: 0.025 + maxRecoil: 0.1 --- !u!1 &6272346181657429393 GameObject: m_ObjectHideFlags: 0 @@ -755,6 +922,7 @@ GameObject: m_Component: - component: {fileID: 6272346181657429396} - component: {fileID: 6272346181657429395} + - component: {fileID: 7087117678379852523} m_Layer: 0 m_Name: Camera m_TagString: MainCamera @@ -823,6 +991,18 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!114 &7087117678379852523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181657429393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6272346182417644038 GameObject: m_ObjectHideFlags: 0 @@ -863,6 +1043,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4074665071222326704} + - component: {fileID: 909517976577723968} m_Layer: 0 m_Name: GunHoldPoint m_TagString: Untagged @@ -878,14 +1059,47 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6522444664664986769} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.056, z: 0.4} + m_LocalPosition: {x: 0, y: -0.005, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4058555163434875561} + - {fileID: 6035287771982183217} + - {fileID: 3087782655464804516} m_Father: {fileID: 6272346181657429396} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &909517976577723968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6522444664664986769} + m_Enabled: 1 + m_EditorHideFlags: 0 + 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: 0} + m_Controller: {fileID: 0} + 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!1 &7061967201775281134 GameObject: m_ObjectHideFlags: 0 @@ -895,6 +1109,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 981273033772084037} + - component: {fileID: 1345655087433563259} m_Layer: 0 m_Name: neck m_TagString: Untagged @@ -918,6 +1133,108 @@ Transform: m_Father: {fileID: 6272346181302961296} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1345655087433563259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7061967201775281134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &7263663517583319679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3087782655464804516} + - component: {fileID: 3590891737052679150} + m_Layer: 0 + m_Name: GunPosition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3087782655464804516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7263663517583319679} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2848367205963120269} + m_Father: {fileID: 4074665071222326704} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3590891737052679150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7263663517583319679} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &7768205653369755348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2848367205963120269} + - component: {fileID: 8468733188726769796} + m_Layer: 0 + m_Name: GunRotation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2848367205963120269 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7768205653369755348} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4058555163434875561} + m_Father: {fileID: 3087782655464804516} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8468733188726769796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7768205653369755348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8043317747957554736 GameObject: m_ObjectHideFlags: 0 @@ -942,7 +1259,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8043317747957554736} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.15000013, z: 0} + m_LocalPosition: {x: 0, y: -0.0500001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -954,7 +1271,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 4074665071222326704} + m_TransformParent: {fileID: 2848367205963120269} m_Modifications: - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} propertyPath: m_RootOrder @@ -966,11 +1283,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.054000046 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.13 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} propertyPath: m_LocalRotation.w @@ -1010,6 +1327,11 @@ PrefabInstance: objectReference: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} +--- !u!1 &3682030003239559187 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_PrefabInstance: {fileID: 4600527171543473474} + m_PrefabAsset: {fileID: 0} --- !u!4 &4058555163434875561 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} @@ -1024,7 +1346,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} propertyPath: m_LocalPosition.x @@ -1072,6 +1394,26 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3} +--- !u!1 &6576156620079053231 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8334588817950881727 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6617984589164989631, 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} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1706812538552309319 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4598867093515939143, 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} @@ -1082,13 +1424,13 @@ Transform: m_CorrespondingSourceObject: {fileID: -5945183352512053224, 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} - 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} m_PrefabAsset: {fileID: 0} +--- !u!4 &5767109144009335573 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Player Animation Test.prefab.meta b/Assets/Prefabs/Player/Player Animation Test.prefab.meta similarity index 100% rename from Assets/Prefabs/Player Animation Test.prefab.meta rename to Assets/Prefabs/Player/Player Animation Test.prefab.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player/Player.prefab similarity index 100% rename from Assets/Prefabs/Player.prefab rename to Assets/Prefabs/Player/Player.prefab diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player/Player.prefab.meta similarity index 100% rename from Assets/Prefabs/Player.prefab.meta rename to Assets/Prefabs/Player/Player.prefab.meta diff --git a/Assets/Scenes/Animation Test.unity b/Assets/Scenes/Animation Test.unity index 6f3411d..2df0ba3 100644 --- a/Assets/Scenes/Animation Test.unity +++ b/Assets/Scenes/Animation Test.unity @@ -207,6 +207,103 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &453716095 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728911, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_Name + value: DebugCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} --- !u!1 &518996702 GameObject: m_ObjectHideFlags: 0 @@ -302,7 +399,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1113968959 GameObject: @@ -398,17 +495,13 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1728263333 +--- !u!1001 &2086555069 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3094132477016057847, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: onlineScene - value: Assets/Scenes/Animation Test.unity - objectReference: {fileID: 0} - target: {fileID: 3094132477016057847, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} propertyPath: playerPrefab value: @@ -419,7 +512,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} propertyPath: m_LocalPosition.x @@ -463,89 +556,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} ---- !u!1001 &1852602306 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 320375778840406984, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: sceneId - value: 1961350237 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961293, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_Name - value: Player Animation Test - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalPosition.y - value: 2.15 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} ---- !u!1 &1978909960 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6576156620079053231, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} - m_PrefabInstance: {fileID: 1852602306} - m_PrefabAsset: {fileID: 0} ---- !u!95 &1978909962 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1978909960} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - 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 diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 34825c9..b664d5a 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -1039,6 +1039,10 @@ PrefabInstance: propertyPath: m_Name value: DebugCanvas objectReference: {fileID: 0} + - target: {fileID: 4636852677861728911, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4636852677968575729, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} propertyPath: m_text value: '[J] Lock Cursor | [H] Unlock Cursor' diff --git a/Assets/Scripts/Player/Headbob.cs b/Assets/Scripts/Player/Headbob.cs index f8346f1..85174f2 100644 --- a/Assets/Scripts/Player/Headbob.cs +++ b/Assets/Scripts/Player/Headbob.cs @@ -18,12 +18,14 @@ public class Headbob : NetworkBehaviour [SerializeField] private Transform Neck; private Vector3 lastPos; + private Vector3 startPos; private Vector3 newPos; private float oldDist = 0; private float lerpVal = 0; private void Start() { lastPos = this.transform.position; + //startPos = this.transform.position; } private void Update() @@ -53,19 +55,7 @@ public class Headbob : NetworkBehaviour } else { - Neck.localPosition = Vector3.zero; - if (false) { - Neck.localPosition = Vector3.Lerp(newPos, Vector3.zero, lerpVal); - if (lerpVal < 1) - { - lerpVal = lerpVal + 0.01f; - } - else - { - Neck.position = Vector3.zero; - } - } - + Neck.localPosition = Vector3.zero; } } diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index f93611d..afc7210 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -102,7 +102,7 @@ public class PlayerController : NetworkBehaviour if (Input.GetAxisRaw("Sprint") > 0 && isGrounded) { - Debug.Log("Sprint"); + //Debug.Log("Sprint"); movementSpeed = sprintSpeed; isSprinting = true; } @@ -115,11 +115,11 @@ public class PlayerController : NetworkBehaviour //Grounded if (velocityY < 0) { - velocityY += gravity * Time.deltaTime; + velocityY += gravity * 0.9f * Time.deltaTime; } else { - velocityY += gravity * 1.0f * Time.deltaTime; + velocityY += gravity* Time.deltaTime; } if (isGrounded && velocityY < 0) velocityY = 0.0f; diff --git a/Assets/Scripts/Player/PlayerMouseLook.cs b/Assets/Scripts/Player/PlayerMouseLook.cs index 81b8765..215d2f6 100644 --- a/Assets/Scripts/Player/PlayerMouseLook.cs +++ b/Assets/Scripts/Player/PlayerMouseLook.cs @@ -76,7 +76,7 @@ public class PlayerMouseLook : NetworkBehaviour } playerCamera.position = playerNeck.position; playerCamera.position += playerNeck.up * neckLength; - + transform.Rotate(Vector3.up * currentMouseDelta.x * mouseSensitivity); //Rotate the hole player if looked sideways (Rotates the player left and right) } diff --git a/Assets/Scripts/Weapons/ShootAnimation.cs b/Assets/Scripts/Weapons/ShootAnimation.cs new file mode 100644 index 0000000..52d2a96 --- /dev/null +++ b/Assets/Scripts/Weapons/ShootAnimation.cs @@ -0,0 +1,129 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ShootAnimation : MonoBehaviour +{ + + [Header("GameObjects")] + [SerializeField] private GameObject gun; + [SerializeField] private GameObject gunHolder; + [SerializeField] private GameObject gunPositionObj; + [SerializeField] private GameObject gunRotationObj; + + + [Header("Settings")] + [SerializeField] bool positionRecoil = true; + [SerializeField] bool rotationRecoil = true; + + [Header("Position Settings")] + [SerializeField] float positionMultX = 25f; + [SerializeField] float positionMultY = 25f; + [SerializeField] float positionMultZ = 25f; + + [Header("Rotation Settings")] + [SerializeField] bool rotX = true; + [SerializeField] float rotationMultX = 25f; + [SerializeField] bool rotY = true; + [SerializeField] float rotationMultY = 25f; + [SerializeField] bool rotZ = true; + [SerializeField] float rotationMultZ = 15f; + + + + [SerializeField] float returnForce = 0.006f; + [SerializeField] float impulsForce = 0.025f; + [SerializeField] float maxRecoil = 0.1f; + + private Animator anim; + + Vector3 startPos,startRot; + + float zOffset = 0f; + float zVelocity = 0f; + + int recoilCounter = 0; + + //Has to be called once at the beginning and then again when switching guns + public void OnSwitchWeapon(float fireRate) + { + //gun = newGun; + anim = gun.GetComponent(); + anim.SetFloat("ShootSpeed",1f/(60f/fireRate)); + startPos = gunPositionObj.transform.localPosition; + startRot = gunRotationObj.transform.localRotation.eulerAngles; + } + + + public void recoil(GameObject gun, float force) + { + //Play the animation + anim.Play("Shoot"); + + //Add force for the recoil + recoilCounter++; + } + + + void FixedUpdate() + { + //Apply recoil based on the number of shots fired + for (int i = 0; i < recoilCounter; i++) + { + zVelocity -= impulsForce * 0.9f + impulsForce * 0.1f * Mathf.PerlinNoise(i,1f); + } + recoilCounter = 0; + + + zOffset += zVelocity; + + if (zOffset > 0) + { + zOffset = 0f; + zVelocity = 0f; + } + else if (zOffset < 0) + { + zVelocity += returnForce * 0.9f + returnForce * 0.1f * Mathf.PerlinNoise(Time.time,1f); + + } + + zOffset = Mathf.Clamp(zOffset,-maxRecoil * 0.5f + -maxRecoil * 0.5f * Mathf.PerlinNoise(Time.time * 1000,1),0); + + //Position recoil + if (positionRecoil) + { + gunPositionObj.transform.localPosition = startPos + new Vector3( + positionMultX * zOffset * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f), + positionMultY * zOffset * ((Mathf.PerlinNoise(Time.time * 2f + 20f, 2f) - 0.5f) * 2f), + positionMultZ* zOffset * ((Mathf.PerlinNoise(Time.time * 3f + 30f, 3f) - 0.5f) * 2f)); + } + else + { + gunPositionObj.transform.localPosition = startPos; + } + + //Rotation recoil + if (rotationRecoil) + { + int xLock = 0; + int yLock = 0; + int zLock = 0; + + if (rotX) xLock = 1; + if (rotY) yLock = 1; + if (rotZ) zLock = 1; + + gunRotationObj.transform.localRotation = Quaternion.Euler( + startRot.x + xLock * rotationMultX * zOffset * ((Mathf.PerlinNoise(Time.time * 3f + 30f, 4f) - 0.5f) * 2f), + startRot.y + yLock * rotationMultY * zOffset * ((Mathf.PerlinNoise(Time.time * 2f + 10f, 3f) - 0.5f) * 2f), + startRot.z + zLock * rotationMultZ * zOffset * ((Mathf.PerlinNoise(Time.time * 1.5f, 2f) - 0.5f) * 2f)); + } + else + { + gunRotationObj.transform.localRotation = Quaternion.Euler(startRot.x, startRot.y, startRot.z); + } + + + } +} diff --git a/Assets/Scripts/Weapons/ShootAnimation.cs.meta b/Assets/Scripts/Weapons/ShootAnimation.cs.meta new file mode 100644 index 0000000..825b949 --- /dev/null +++ b/Assets/Scripts/Weapons/ShootAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b366149a1bdd3ad4884ac2afe0fe11a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 880c687..1c728b9 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,10 +6,10 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 510150040406500e0b5c0f26497b0d44444f40297f7c76617f7d1e36bbe4623e flags: 0 RecentlyUsedSceneGuid-1: - value: 510150040406500e0b5c0f26497b0d44444f40297f7c76617f7d1e36bbe4623e + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-2: value: 5303575756005a0f0c0d5e7a487a0a44154e19727f7b7f67757b1936b4b73268 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 007f6d5..eb72a3c 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,15 +14,15 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 14} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1536 height: 730.8 - m_MinSize: {x: 400, y: 200} - m_MaxSize: {x: 32384, y: 16192} + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 controlID: -1 --- !u!114 &2 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 298.4 + x: 492 y: 73.6 - width: 710.80005 - height: 413.4 + width: 678 + height: 449.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 710.80005, y: 392.4} + m_TargetSize: {x: 678, y: 428.4} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -284.32004 - m_HBaseRangeMax: 284.32004 - m_VBaseRangeMin: -156.96 - m_VBaseRangeMax: 156.96 + m_HBaseRangeMin: -271.2 + m_HBaseRangeMax: 271.2 + m_VBaseRangeMin: -171.36 + m_VBaseRangeMax: 171.36 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 710.80005 - height: 392.4 + width: 678 + height: 428.4 m_Scale: {x: 1.1592739, y: 1.1592739} - m_Translation: {x: 355.40002, y: 196.2} + m_Translation: {x: 339, y: 214.2} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -306.57123 - y: -169.24387 - width: 613.14246 - height: 338.48773 + x: -292.42444 + y: -184.77083 + width: 584.8489 + height: 369.54166 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 888.50006, y: 516.75} + m_LastWindowPixelSize: {x: 847.5, y: 561.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -131,15 +131,15 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 11} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 + width: 1172 height: 730.8 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 controlID: -1 --- !u!114 &4 @@ -157,15 +157,14 @@ MonoBehaviour: m_Children: - {fileID: 5} - {fileID: 7} - - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 434.4 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 8096} + width: 1172 + height: 470.4 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 controlID: -1 --- !u!114 &5 @@ -185,8 +184,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 298.4 - height: 434.4 + width: 492 + height: 470.4 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -216,8 +215,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 297.4 - height: 413.4 + width: 491 + height: 449.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -225,9 +224,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 581cffff - m_LastClickedID: -58280 - m_ExpandedIDs: 621cffff661cffff8e1cffffb220ffffbc20ffffc020ffffe820ffff3ab1ffff3eb1ffff48b1ffff4cb1ffff74b1ffffb0f2ffff2cfbffff + m_SelectedIDs: 9211f9ff + m_LastClickedID: -454254 + m_ExpandedIDs: 9211f9ff4212f9ffbc22f9ff5c27f9ff0c28f9ff822cf9ff322df9ff2a84f9ffde85f9ff2889f9ff2897f9ff009cf9ffa69cf9ffdaa4f9ff80a5f9ff4841faffc244faffb850faffbe50faffec50faff9c51faff1e56faffb856faffc856faffd456faffda56faff0857faffb857faffc4b6faffcab6fafff8b6faffa8b7fafffe24fbff0425fbff3225fbffe225fbff141dfcff421dfcfff21dfcff0678fcff1a78fcff2078fcff4e78fcfffe78fcff0082fcff0682fcff3482fcffe482fcffd4c2fcffdac2fcff08c3fcffb8c3fcff0050fdff2e50fdffde50fdff96ddfdff9cddfdffcaddfdff7adefdff92e3fdff98e3fdffc6e3fdff76e4fdffda01feffe001feff0e02feffbe02feff7a0dfeff800dfeffae0dfeff5e0efeffae18feffb418feffe218feff9219feffa22dfefff23ffeff0640feff0c40feff3a40feffea40feffb8a4feffbea4feffeca4feff9ca5feff660bffff7a0bffff800bffffac0bffff540fffff680fffff6e0fffff9a0fffffd842ffffec42fffff242ffff1e43ffff4c58ffff6058ffff6658ffff9258ffff6876ffff7c76ffff8276ffffae76ffff8cceffff96ceffff9aceffffc6ceffff7ef2ffff84f2ffffe0f3ffffe4f3ffffeef3fffff2f3ffff1ef4ffffdcfaffffeafaffffeefaffff1afbffff2afbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -266,19 +265,101 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 298.4 + x: 492 y: 0 - width: 712.80005 - height: 434.4 + width: 680 + height: 470.4 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} + - {fileID: 9} - {fileID: 2} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 2 + m_LastSelected: 1 --- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 492 + y: 73.6 + width: 345.2 + height: 449.4 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + - {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} + m_ValueSerializationHelper: + - e00: 0.9123797 + e01: 0 + e02: 0 + e03: -256.30267 + e10: 0 + e11: 0.9123797 + e12: 0 + e13: 77.84196 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5589181 + e01: 0 + e02: 0 + e03: -28.54406 + e10: 0 + e11: 0.5589181 + e12: 0 + e13: 174.21025 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -298,10 +379,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 298.4 + x: 492 y: 73.6 - width: 579.6 - height: 413.4 + width: 678 + height: 449.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -345,7 +426,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -366,9 +447,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: -140.5, y: 86} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 1 id: Orientation index: 0 layout: 4 @@ -378,7 +459,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -400,7 +481,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Cloth Constraints index: 2 @@ -411,7 +492,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Cloth Collisions index: 3 @@ -422,7 +503,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Navmesh Display index: 4 @@ -433,7 +514,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Agent Display index: 5 @@ -444,7 +525,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Obstacle Display index: 6 @@ -455,7 +536,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Occlusion Culling index: 7 @@ -466,7 +547,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Physics Debugger index: 8 @@ -477,7 +558,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Scene Visibility index: 9 @@ -488,7 +569,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Particles index: 10 @@ -497,26 +578,26 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} + displayed: 1 + snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Animation Rigging index: 11 layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 1 + 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: 0.6799998, y: -2899.7808, z: 0} + m_Target: {x: 0.49072248, y: 7.6249065, z: 1.8747175} speed: 2 - m_Value: {x: 0.6799998, y: -2899.7808, z: 0} + m_Value: {x: 0.49072248, y: 7.6249065, z: 1.8747175} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -563,13 +644,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.15275785, y: -0.5323912, z: 0.09836364, w: 0.8267796} + m_Target: {x: 0.02317691, y: 0.96904457, z: -0.09976932, w: 0.22486019} speed: 2 - m_Value: {x: -0.15275785, y: 0.5323912, z: -0.09836363, w: -0.82677954} + m_Value: {x: 0.023175744, y: 0.9689958, z: -0.099764295, w: 0.22484888} m_Size: - m_Target: 12.124355 + m_Target: 1.7877662 speed: 2 - m_Value: 12.124355 + m_Value: 1.7877662 m_Ortho: m_Target: 1 speed: 2 @@ -594,97 +675,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1011.2 - y: 0 - width: 159.99994 - height: 434.4 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 10} - m_Panes: - - {fileID: 10} - m_Selected: 0 - m_LastSelected: 0 --- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1011.2 - y: 73.6 - width: 157.99994 - height: 413.4 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - m_ValueSerializationHelper: - - e00: 1 - e01: 0 - e02: 0 - e03: -330.4 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 0 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -700,18 +691,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 434.4 - width: 1171.2 - height: 296.4 + y: 470.4 + width: 1172 + height: 260.4 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 11} m_Panes: + - {fileID: 11} - {fileID: 12} - - {fileID: 13} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -732,9 +723,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 508 - width: 1170.2 - height: 275.4 + y: 544 + width: 1171 + height: 239.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -752,22 +743,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Objects/Weapons/M9 + - Assets/Prefabs/Player m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Objects/Weapons/M9 + - Assets/Prefabs/Player m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 68.600006} - m_SelectedIDs: 926f0000 - m_LastClickedID: 28562 - m_ExpandedIDs: 000000000e5c0000105c0000325d00008466000000ca9a3bffffff7f + scrollPos: {x: 0, y: 120} + m_SelectedIDs: 6a670000 + m_LastClickedID: 26474 + m_ExpandedIDs: 000000004e62000050620000606200006262000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -783,7 +774,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -795,7 +786,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000000e5c0000105c000000ca9a3bffffff7f + m_ExpandedIDs: 000000004e620000506200006062000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -820,10 +811,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 581cffff - m_LastClickedInstanceID: -58280 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000986f000030660000 + m_SelectedInstanceIDs: 9211f9ff + m_LastClickedInstanceID: -454254 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000825f0000205f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -839,7 +830,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -851,7 +842,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &13 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -872,14 +863,14 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 508 - width: 1170 - height: 275 + y: 544 + width: 1171 + height: 239.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &14 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -894,18 +885,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1171.2 + x: 1172 y: 0 - width: 364.80005 + width: 364 height: 730.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 15} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -925,9 +916,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1171.2001 + x: 1172 y: 73.6 - width: 363.80005 + width: 363 height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 3373ffc..bb4e157 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,121 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 1536 - y: 43 - width: 1920 - height: 997 + x: 0 + y: 43.2 + width: 1536 + height: 780.8 m_ShowMode: 4 - m_Title: Inspector - m_RootView: {fileID: 6} + m_Title: Animator + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 9} - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1920 - height: 947 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 16 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1464 - y: 0 - width: 456 - height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 216 - height: 564 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 564 - width: 1464 - height: 383 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 12} - - {fileID: 17} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -141,22 +37,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 2} - - {fileID: 8} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1536 + height: 781 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &7 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -173,12 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1536 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &8 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -194,11 +90,113 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 761 + width: 1536 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + - {fileID: 12} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1536 + height: 731 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} + vertical: 0 + controlID: 51 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1171 + height: 731 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 1 + controlID: 52 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 9} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1171 + height: 471 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 8096} + vertical: 0 + controlID: 53 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 298 + height: 471 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -208,22 +206,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimatorControllerTool m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 5} + m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 298 y: 0 - width: 1464 - height: 947 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 17 + width: 580 + height: 471 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -232,23 +231,25 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 11} + m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 878 y: 0 - width: 1464 - height: 564 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 18 + width: 293 + height: 471 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,21 +260,21 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 216 - y: 0 - width: 1248 - height: 564 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + x: 0 + y: 471 + width: 1171 + height: 260 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 15} - - {fileID: 16} + - {fileID: 17} + - {fileID: 18} m_Selected: 0 m_LastSelected: 1 --- !u!114 &12 @@ -285,137 +286,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: + m_Children: [] + m_Position: serializedVersion: 2 - x: 1536 - y: 637 - width: 1463 - height: 362 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Scripts/Player - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/Scripts/Player - m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 172.6497} - m_SelectedIDs: 24600000 - m_LastClickedID: 24612 - m_ExpandedIDs: 000000000e5c0000105c0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 000000000e5c0000105c0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 + x: 1171 + y: 0 + width: 365 + height: 731 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 19} + m_Panes: + - {fileID: 19} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -425,38 +312,89 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} + m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 3000 - y: 73 - width: 455 - height: 926 + x: 879.2 + y: 73.6 + width: 289.8 + height: 450 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 289.8, y: 429} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -115.92 + m_HBaseRangeMax: 115.92 + m_VBaseRangeMin: -171.6 + m_VBaseRangeMax: 171.6 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 289.8 + height: 429 + m_Scale: {x: 1.1592739, y: 1.1592739} + m_Translation: {x: 144.9, y: 214.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -124.99203 + y: -185.02962 + width: 249.98405 + height: 370.05923 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 362.25, y: 562.5} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -473,14 +411,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1536 - y: 73 - width: 215 - height: 543 + x: 0 + y: 73.6 + width: 297 + height: 450 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -490,7 +428,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e2f8ffff2cfbffff + m_ExpandedIDs: f6e2fffffcecffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -506,7 +444,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 4} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -530,14 +468,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1752 - y: 73 - width: 1246 - height: 543 + x: 878.4 + y: 73.6 + width: 291 + height: 450 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -729,19 +667,30 @@ MonoBehaviour: id: Scene View/Particles index: 10 layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Animation Rigging + index: 11 + layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 1 + 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: 18.647648, y: 1.4988656, z: 13.325598} + m_Target: {x: -0.062267028, y: -0.11840155, z: 0.045074694} speed: 2 - m_Value: {x: 18.647648, y: 1.4988656, z: 13.325598} + m_Value: {x: -0.062267028, y: -0.11840155, z: 0.045074694} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -767,7 +716,7 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} + m_Size: {x: 1, y: 1} yGrid: m_Fade: m_Target: 1 @@ -788,13 +737,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.03279638, y: -0.9367419, z: 0.091338895, w: 0.33631974} + m_Target: {x: -0.12716745, y: -0.27125975, z: 0.036181852, w: -0.9534008} speed: 2 - m_Value: {x: 0.032796137, y: -0.936735, z: 0.09133822, w: 0.33631727} + m_Value: {x: -0.12716518, y: -0.27125493, z: 0.036181208, w: -0.95338386} m_Size: - m_Target: 452.24496 + m_Target: 0.2153474 speed: 2 - m_Value: 452.24496 + m_Value: 0.2153474 m_Ortho: m_Target: 1 speed: 2 @@ -827,91 +776,203 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1752 - y: 73 - width: 1246 - height: 543 + x: 298.4 + y: 73.6 + width: 578 + height: 450 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1246, y: 522} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -623 - m_HBaseRangeMax: 623 - m_VBaseRangeMin: -261 - m_VBaseRangeMax: 261 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1246 - height: 522 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 623, y: 261} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -623 - y: -261 - width: 1246 - height: 522 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1246, y: 543} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_ValueSerializationHelper: + - e00: 0.93576187 + e01: 0 + e02: 0 + e03: -83.14328 + e10: 0 + e11: 0.93576187 + e12: 0 + e13: 81.3544 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 --- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 544 + width: 1170 + height: 239 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Objects + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Objects + m_LastFoldersGridSize: -1 + 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: b4690000 + m_LastClickedID: 27060 + m_ExpandedIDs: 000000005269000054690000b4690000746b000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 11} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000005269000054690000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 11} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -927,15 +988,56 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1536 - y: 637 - width: 1463 - height: 362 + x: 0 + y: 544.8 + width: 1170 + height: 238.79999 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1171.2001 + y: 73.6 + width: 364 + height: 710 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0}