diff --git a/Assets/Objects/Weapons/M9/M9 Animation Controller.controller b/Assets/Objects/Weapons/M9/M9 Animation Controller.controller index 1a67fd3..1ad4ddd 100644 --- a/Assets/Objects/Weapons/M9/M9 Animation Controller.controller +++ b/Assets/Objects/Weapons/M9/M9 Animation Controller.controller @@ -68,13 +68,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: ShootSpeed m_Type: 1 m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -127,9 +127,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.03 m_TransitionOffset: 0 - m_ExitTime: 0.9 + m_ExitTime: 0.96 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 diff --git a/Assets/Prefabs/Player/Player Animation Test.prefab b/Assets/Prefabs/Player/Player Animation Test.prefab index 1f18b57..e02839c 100644 --- a/Assets/Prefabs/Player/Player Animation Test.prefab +++ b/Assets/Prefabs/Player/Player Animation Test.prefab @@ -160,37 +160,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Weight: 1 m_Effectors: [] ---- !u!1 &427244160471813103 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3995184887649218415} - m_Layer: 0 - m_Name: BulletExitPoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3995184887649218415 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427244160471813103} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0.1901, y: 0.0393, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4058555163434875561} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &1122453500918594702 GameObject: m_ObjectHideFlags: 0 @@ -317,7 +286,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4058555163434875561} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} --- !u!1 &2221492823855642591 GameObject: @@ -348,8 +317,39 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4058555163434875561} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} +--- !u!1 &2992488853448454767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1468248131875751636} + m_Layer: 0 + m_Name: GunAimPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1468248131875751636 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2992488853448454767} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.35} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6272346181657429396} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3649358604728444914 GameObject: m_ObjectHideFlags: 0 @@ -393,29 +393,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &4725102558119853970 -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: c98f5c47a8b7dd64f86fd6f42c4d6e5e, type: 3} - m_Name: - m_EditorClassIdentifier: - weaponKind: 1 - active: 0 - damage: 10 - firerate: 320 - roundsPerShot: 1 - recoilStrength: 15 - currentAmmunition: 16 - magazinSize: 16 - totalAmmunition: 64 - bulletExit: {fileID: 0} - allowAction: 1 --- !u!1 &4824770690127859843 GameObject: m_ObjectHideFlags: 0 @@ -588,51 +565,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 763023871062575730} m_maskType: 0 ---- !u!1 &5628772214698948044 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2573390158738433571} - - component: {fileID: 3277227182649658100} - m_Layer: 0 - m_Name: M92 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2573390158738433571 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5628772214698948044} - 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: 3087782655464804516} - m_Father: {fileID: 4074665071222326704} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3277227182649658100 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5628772214698948044} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &6272346181302961293 GameObject: m_ObjectHideFlags: 0 @@ -651,13 +583,13 @@ GameObject: - component: {fileID: 5630859218361338035} - component: {fileID: 8436279266335313624} - component: {fileID: 268368477457052331} + - component: {fileID: 3781802212159559521} - component: {fileID: 6207632454083444980} - component: {fileID: 1509131218531316230} - component: {fileID: 8957579265169979397} - component: {fileID: 3965891812990671158} - component: {fileID: 4276885029697240453} - - component: {fileID: 5971405436260802329} - - component: {fileID: 4889600355201469534} + - component: {fileID: 7198056240135858432} m_Layer: 0 m_Name: Player Animation Test m_TagString: Player @@ -748,11 +680,14 @@ MonoBehaviour: m_EditorClassIdentifier: syncMode: 0 syncInterval: 0.1 + ADSContoller: {fileID: 7198056240135858432} walkSpeed: 6 sprintSpeed: 8 + aimWalkSpeed: 3 moveSmoothTime: 0.05 gravity: -10 jumpHeight: 1.2 + inputDirection: {x: 0, y: 0, z: 0} groundCheck: {fileID: 6272346182417644039} groundMask: serializedVersion: 2 @@ -828,6 +763,7 @@ MonoBehaviour: minCameraAngle: -90 mouseSmoothTime: 0.001 lockCursor: 1 + fullPitch: 0 --- !u!114 &8436279266335313624 MonoBehaviour: m_ObjectHideFlags: 0 @@ -862,12 +798,33 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 playerController: {fileID: -4574526707603160507} + gunAnimation: {fileID: 4276885029697240453} posCheckDistance: 1 checkDist: 0 stepAmplitudeWalking: 0.05 stepAmplitudeSprinting: 0.07 stepFrequency: 0.8 Neck: {fileID: 6272346181657429396} + gunRotation: {fileID: 0} + rotationMultiplier: 0.1 +--- !u!114 &3781802212159559521 +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: bc5bc2b49bd326e4db460a6a3af59311, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + muzzle: {fileID: 3649358604728444914} + shootAnim: {fileID: 4276885029697240453} + fireRate: 320 + gunHoldPos: {fileID: 3682030003239559187} --- !u!114 &6207632454083444980 MonoBehaviour: m_ObjectHideFlags: 0 @@ -982,19 +939,27 @@ MonoBehaviour: gunRotationObj: {fileID: 7768205653369755348} positionRecoil: 1 rotationRecoil: 1 - positionMultX: 0.1 - positionMultY: 0.1 + positionMultX: 0.2 + positionMultY: 0.5 positionMultZ: 1 + playerMouseLook: {fileID: 5630859218361338035} + cameraRecoilX: 8 + cameraRecoilY: 4 rotX: 1 - rotationMultX: 25 + rotationMultX: 60 + rotationOffsetX: 0.1 rotY: 1 - rotationMultY: 25 + rotationMultY: 50 rotZ: 1 - rotationMultZ: 15 + rotationMultZ: 100 + ADSController: {fileID: 7198056240135858432} + sideSwey: 1 + sweyMult: 1.2 + sweyWhileAim: 0.05 returnForce: 0.006 impulsForce: 0.025 - maxRecoil: 0.1 ---- !u!114 &5971405436260802329 + maxRecoil: 0.25 +--- !u!114 &7198056240135858432 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1003,28 +968,15 @@ MonoBehaviour: m_GameObject: {fileID: 6272346181302961293} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0f43c52a1834dcb4bab807bc0cbddec2, type: 3} - m_Name: - m_EditorClassIdentifier: - syncMode: 0 - syncInterval: 0.1 - muzzle: {fileID: 427244160471813103} - shootAnim: {fileID: 4276885029697240453} - gunHoldPos: {fileID: 0} - weaponHolder: {fileID: 3682030003239559187} - GunRotation: {fileID: 7768205653369755348} ---- !u!114 &4889600355201469534 -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: 323a821a5fef23a45aa5333ce1f55202, type: 3} + m_Script: {fileID: 11500000, guid: 916f2d37f60a91149bbca3280a1b69ec, type: 3} m_Name: m_EditorClassIdentifier: + aimSpeed: 0.09 + aimVal: 1 + gun: {fileID: 6522444664664986769} + AimPoint: {fileID: 2992488853448454767} + HoldPoint: {fileID: 8043317747957554736} + isAiming: 0 --- !u!1 &6272346181657429393 GameObject: m_ObjectHideFlags: 0 @@ -1058,6 +1010,7 @@ Transform: - {fileID: 5021921342190399731} - {fileID: 4074665071222326704} - {fileID: 1979435770070801855} + - {fileID: 1468248131875751636} m_Father: {fileID: 981273033772084037} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1158,7 +1111,7 @@ GameObject: - component: {fileID: 4074665071222326704} - component: {fileID: 909517976577723968} m_Layer: 0 - m_Name: GunHoldPoint + m_Name: GunHolster m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1172,12 +1125,12 @@ 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.005, z: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0.4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6035287771982183217} - - {fileID: 2573390158738433571} + - {fileID: 3087782655464804516} m_Father: {fileID: 6272346181657429396} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1282,14 +1235,14 @@ Transform: 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_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.04} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2848367205963120269} - m_Father: {fileID: 2573390158738433571} - m_RootOrder: 0 + m_Father: {fileID: 4074665071222326704} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3590891737052679150 MonoBehaviour: @@ -1358,7 +1311,7 @@ GameObject: m_Component: - component: {fileID: 1979435770070801855} m_Layer: 0 - m_Name: GunHolsterPoint + m_Name: GunHoldPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1372,7 +1325,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.0500001, z: 0} + m_LocalPosition: {x: 0.108, y: -0.084, z: 0.35} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1440,16 +1393,16 @@ PrefabInstance: objectReference: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} ---- !u!4 &4058555163434875561 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - m_PrefabInstance: {fileID: 4600527171543473474} - m_PrefabAsset: {fileID: 0} --- !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} + m_PrefabInstance: {fileID: 4600527171543473474} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6305701708507383038 PrefabInstance: m_ObjectHideFlags: 0 @@ -1501,15 +1454,111 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.49565774 + objectReference: {fileID: 0} + - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: 0.4028321 + objectReference: {fileID: 0} + - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: 0.47084302 + objectReference: {fileID: 0} + - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: 0.6085693 + objectReference: {fileID: 0} + - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5662176 + objectReference: {fileID: 0} + - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: 0.8008484 + objectReference: {fileID: 0} + - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: 0.04959982 + objectReference: {fileID: 0} + - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: -0.18862498 + objectReference: {fileID: 0} + - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.6432096 + objectReference: {fileID: 0} + - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7010284 + objectReference: {fileID: 0} + - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: 0.02918151 + objectReference: {fileID: 0} + - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: 0.30657643 + objectReference: {fileID: 0} + - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.64756745 + objectReference: {fileID: 0} + - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: -0.6947033 + objectReference: {fileID: 0} + - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: -0.034390952 + objectReference: {fileID: 0} + - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: -0.3112249 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} propertyPath: m_Name value: Human without head objectReference: {fileID: 0} + - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.556481 + objectReference: {fileID: 0} + - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: 0.80733955 + objectReference: {fileID: 0} + - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: -0.048747048 + objectReference: {fileID: 0} + - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: 0.19014606 + objectReference: {fileID: 0} + - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.4882959 + objectReference: {fileID: 0} + - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: 0.41018188 + objectReference: {fileID: 0} + - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: -0.4844513 + objectReference: {fileID: 0} + - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: -0.59885305 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3} ---- !u!4 &5767109144009335573 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, 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 @@ -1542,8 +1591,8 @@ Transform: m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} ---- !u!1 &6576156620079053231 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} +--- !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/Scenes/Animation Test.unity b/Assets/Scenes/Animation Test.unity index 2df0ba3..466d1a5 100644 --- a/Assets/Scenes/Animation Test.unity +++ b/Assets/Scenes/Animation Test.unity @@ -302,6 +302,10 @@ PrefabInstance: propertyPath: m_Name value: DebugCanvas objectReference: {fileID: 0} + - target: {fileID: 4636852677861728911, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} --- !u!1 &518996702 diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index b2146ba..f3ed9b3 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -1045,7 +1045,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4636852677861728911, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4636852677968575729, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} propertyPath: m_text diff --git a/Assets/Scripts/Player/AimDownSights.cs b/Assets/Scripts/Player/AimDownSights.cs new file mode 100644 index 0000000..6a5da19 --- /dev/null +++ b/Assets/Scripts/Player/AimDownSights.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AimDownSights : MonoBehaviour +{ + [SerializeField] float aimSpeed = 0.01f; + [SerializeField][Range(0,1)] public float aimVal = 0; + [SerializeField] private GameObject gun; + [SerializeField] GameObject AimPoint; + [SerializeField] GameObject HoldPoint; + public bool isAiming = false; + bool ADS() + { + + return true; + } + private void FixedUpdate() + { + if (Input.GetButton("Aim")) + { + isAiming = true; + aimVal += aimSpeed; + } + else + { + isAiming = false; + aimVal -= aimSpeed; + } + aimVal = Mathf.Clamp(aimVal,0,1); + + gun.transform.position = Vector3.Lerp(HoldPoint.transform.position, AimPoint.transform.position,Mathf.Pow(aimVal,1.3f)) ; + } +} diff --git a/Assets/Scripts/Player/AimDownSights.cs.meta b/Assets/Scripts/Player/AimDownSights.cs.meta new file mode 100644 index 0000000..6277c4c --- /dev/null +++ b/Assets/Scripts/Player/AimDownSights.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 916f2d37f60a91149bbca3280a1b69ec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/Headbob.cs b/Assets/Scripts/Player/Headbob.cs index 85174f2..49cd66c 100644 --- a/Assets/Scripts/Player/Headbob.cs +++ b/Assets/Scripts/Player/Headbob.cs @@ -5,6 +5,7 @@ using Mirror; public class Headbob : NetworkBehaviour { [SerializeField] private PlayerController playerController; + [SerializeField] private ShootAnimation gunAnimation; [SerializeField] private float posCheckDistance = 0.01f; @@ -22,6 +23,14 @@ public class Headbob : NetworkBehaviour private Vector3 newPos; private float oldDist = 0; private float lerpVal = 0; + + + [Header("Gun Settings")] + [SerializeField] GameObject gunRotation; + [SerializeField] float rotationMultiplier = 0.1f; + + + private void Start() { lastPos = this.transform.position; @@ -50,6 +59,7 @@ public class Headbob : NetworkBehaviour { checkDist = currentDist + dist; } + gunAnimation.gunSideSwey(getSin(amplitude, stepFrequency/2, checkDist),playerController.inputDirection.magnitude); newPos = new Vector3(getSin(amplitude / 2, stepFrequency, checkDist), getSin(amplitude, stepFrequency, checkDist), 0); Neck.localPosition = newPos; } diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index afc7210..48ab828 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -8,15 +8,16 @@ using Mirror; public class PlayerController : NetworkBehaviour { - + [SerializeField] private AimDownSights ADSContoller; [Header("Movement")] [SerializeField] private float walkSpeed = 6.0f; [SerializeField] private float sprintSpeed = 10.0f; + [SerializeField] private float aimWalkSpeed = 3.0f; [SerializeField][Range(0.0f, 0.5f)] private float moveSmoothTime = 0.001f; [SerializeField] float gravity = -10.0f; [SerializeField] private float jumpHeight; - private Vector3 inputDirection = Vector3.zero; + public Vector3 inputDirection = Vector3.zero; private Vector3 moveDirection; [Header("Ground Check")] @@ -100,15 +101,15 @@ public class PlayerController : NetworkBehaviour { - if (Input.GetAxisRaw("Sprint") > 0 && isGrounded) + if (Input.GetAxisRaw("Sprint") > 0 && isGrounded && !ADSContoller.isAiming) { - //Debug.Log("Sprint"); movementSpeed = sprintSpeed; isSprinting = true; } else { - movementSpeed = walkSpeed; + if(ADSContoller.isAiming) movementSpeed = aimWalkSpeed; + else movementSpeed = walkSpeed; isSprinting = false; } diff --git a/Assets/Scripts/Player/PlayerMouseLook.cs b/Assets/Scripts/Player/PlayerMouseLook.cs index 215d2f6..55dc01a 100644 --- a/Assets/Scripts/Player/PlayerMouseLook.cs +++ b/Assets/Scripts/Player/PlayerMouseLook.cs @@ -18,7 +18,7 @@ public class PlayerMouseLook : NetworkBehaviour [SerializeField] [Range(0.0f, 0.5f)] private float mouseSmoothTime = 0.001f; [SerializeField] private bool lockCursor = true; - private float fullPitch = 0f; + public float fullPitch = 0f; private float cameraPitch = 0f; private float neckPitch = 0f; private float velocityY = 0.0f; diff --git a/Assets/Scripts/Weapons/ShootAnimation.cs b/Assets/Scripts/Weapons/ShootAnimation.cs index 52d2a96..22cb377 100644 --- a/Assets/Scripts/Weapons/ShootAnimation.cs +++ b/Assets/Scripts/Weapons/ShootAnimation.cs @@ -22,13 +22,26 @@ public class ShootAnimation : MonoBehaviour [SerializeField] float positionMultZ = 25f; [Header("Rotation Settings")] + [SerializeField] PlayerMouseLook playerMouseLook; + [SerializeField] float cameraRecoilX = 0.1f; + [SerializeField] float cameraRecoilY = 0.1f; + + [SerializeField] bool rotX = true; [SerializeField] float rotationMultX = 25f; + [SerializeField] float rotationOffsetX = 0.1f; [SerializeField] bool rotY = true; [SerializeField] float rotationMultY = 25f; [SerializeField] bool rotZ = true; [SerializeField] float rotationMultZ = 15f; + [Header("Swey Settings")] + [SerializeField] AimDownSights ADSController; + [SerializeField] bool sideSwey = true; + [SerializeField] float sweyMult = 15f; + [SerializeField] float sweyWhileAim = 0.1f; + float swey = 0f; + [SerializeField] float returnForce = 0.006f; @@ -59,11 +72,20 @@ public class ShootAnimation : MonoBehaviour { //Play the animation anim.Play("Shoot"); - + playerMouseLook.fullPitch -= cameraRecoilX * Mathf.PerlinNoise(Time.time * 3f + 10f, 1f); + transform.Rotate(Vector3.up * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) * cameraRecoilY); //Add force for the recoil recoilCounter++; } + public void gunSideSwey(float sinVal,float moveInput) + { + + swey = (sweyMult * sinVal * moveInput * 0.7f + + sweyMult * sinVal * moveInput * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) * 0.3f) * Mathf.Clamp((1 - ADSController.aimVal) * (1 - ADSController.aimVal), sweyWhileAim,1f); + + } + void FixedUpdate() { @@ -93,9 +115,12 @@ public class ShootAnimation : MonoBehaviour //Position recoil if (positionRecoil) { + int sideLock = 0; + + if (sideSwey) sideLock = 1; 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), + positionMultX * zOffset * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) + sideLock * swey, + positionMultY * zOffset * Mathf.PerlinNoise(Time.time * 2f + 20f, 2f), positionMultZ* zOffset * ((Mathf.PerlinNoise(Time.time * 3f + 30f, 3f) - 0.5f) * 2f)); } else @@ -109,13 +134,15 @@ public class ShootAnimation : MonoBehaviour 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.x + xLock * rotationMultX * zOffset * Mathf.PerlinNoise(Time.time * 3f + 30f, 4f), 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)); } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index eb72a3c..c9104e3 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,15 +14,15 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 13} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1536 - height: 730.8 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} + height: 731 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} vertical: 0 controlID: -1 --- !u!114 &2 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 492 + x: 713.60004 y: 73.6 - width: 678 - height: 449.4 + width: 455.59998 + height: 450.2 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: 678, y: 428.4} + m_TargetSize: {x: 455.59998, y: 429.2} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -271.2 - m_HBaseRangeMax: 271.2 - m_VBaseRangeMin: -171.36 - m_VBaseRangeMax: 171.36 + m_HBaseRangeMin: -182.23999 + m_HBaseRangeMax: 182.23999 + m_VBaseRangeMin: -171.68001 + m_VBaseRangeMax: 171.68001 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 678 - height: 428.4 + width: 455.59998 + height: 429.2 m_Scale: {x: 1.1592739, y: 1.1592739} - m_Translation: {x: 339, y: 214.2} + m_Translation: {x: 227.79999, y: 214.6} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -292.42444 - y: -184.77083 - width: 584.8489 - height: 369.54166 + x: -196.5023 + y: -185.11589 + width: 393.0046 + height: 370.23178 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 847.5, y: 561.75} + m_LastWindowPixelSize: {x: 569.5, y: 562.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -131,15 +131,15 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 10} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1172 - height: 730.8 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} + width: 1171.2 + height: 731 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 1 controlID: -1 --- !u!114 &4 @@ -157,14 +157,15 @@ MonoBehaviour: m_Children: - {fileID: 5} - {fileID: 7} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1172 - height: 470.4 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} + width: 1171.2 + height: 471.2 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 8096} vertical: 0 controlID: -1 --- !u!114 &5 @@ -184,8 +185,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 492 - height: 470.4 + width: 297.6 + height: 471.2 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -215,8 +216,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 491 - height: 449.4 + width: 296.6 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -224,9 +225,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9211f9ff - m_LastClickedID: -454254 - m_ExpandedIDs: 9211f9ff4212f9ffbc22f9ff5c27f9ff0c28f9ff822cf9ff322df9ff2a84f9ffde85f9ff2889f9ff2897f9ff009cf9ffa69cf9ffdaa4f9ff80a5f9ff4841faffc244faffb850faffbe50faffec50faff9c51faff1e56faffb856faffc856faffd456faffda56faff0857faffb857faffc4b6faffcab6fafff8b6faffa8b7fafffe24fbff0425fbff3225fbffe225fbff141dfcff421dfcfff21dfcff0678fcff1a78fcff2078fcff4e78fcfffe78fcff0082fcff0682fcff3482fcffe482fcffd4c2fcffdac2fcff08c3fcffb8c3fcff0050fdff2e50fdffde50fdff96ddfdff9cddfdffcaddfdff7adefdff92e3fdff98e3fdffc6e3fdff76e4fdffda01feffe001feff0e02feffbe02feff7a0dfeff800dfeffae0dfeff5e0efeffae18feffb418feffe218feff9219feffa22dfefff23ffeff0640feff0c40feff3a40feffea40feffb8a4feffbea4feffeca4feff9ca5feff660bffff7a0bffff800bffffac0bffff540fffff680fffff6e0fffff9a0fffffd842ffffec42fffff242ffff1e43ffff4c58ffff6058ffff6658ffff9258ffff6876ffff7c76ffff8276ffffae76ffff8cceffff96ceffff9aceffffc6ceffff7ef2ffff84f2ffffe0f3ffffe4f3ffffeef3fffff2f3ffff1ef4ffffdcfaffffeafaffffeefaffff1afbffff2afbfffff4ffffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 4e34fdfff434fdff5255fdffe496fdffb2b0fdff62d4fdff08d5fdffc6f5fdff6cf6fdff6251feff0852feff4658feff4859feffe695feff849ffeff34a0feff02cbfeff740affffa018ffff5019ffffdc1efffffe55ffff0456ffff1456ffff2056ffff2656ffff5656ffff0657ffff9265ffff9865ffffa865ffffb465ffffba65ffffea65ffff9a66ffff7e88ffff8488ffffb488ffff6489ffffa48dffff548effff3af4ffff40f4ffff50f4ffff5cf4ffff62f4ffff90f4ffff40f5ffffa6f7fffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -260,23 +261,22 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 492 + x: 297.6 y: 0 - width: 680 - height: 470.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 2} + width: 415.99997 + height: 471.2 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 9} m_Panes: - {fileID: 8} - {fileID: 9} - - {fileID: 2} - m_Selected: 2 + m_Selected: 1 m_LastSelected: 1 --- !u!114 &8 MonoBehaviour: @@ -298,10 +298,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 492 - y: 73.6 - width: 345.2 - height: 449.4 + x: 298.6 + y: 19 + width: 871.6 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -309,32 +309,15 @@ MonoBehaviour: m_ViewTransforms: m_KeySerializationHelper: - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - - {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} m_ValueSerializationHelper: - - e00: 0.9123797 + - e00: 1.0177464 e01: 0 e02: 0 - e03: -256.30267 + e03: -77.03352 e10: 0 - e11: 0.9123797 + e11: 1.0177464 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 + e13: 111.43313 e20: 0 e21: 0 e22: 1 @@ -379,10 +362,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 492 + x: 297.6 y: 73.6 - width: 678 - height: 449.4 + width: 413.99997 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -426,7 +409,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -447,9 +430,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -140.5, y: 86} + snapOffset: {x: 67.5, y: 86} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 0 id: Orientation index: 0 layout: 4 @@ -459,7 +442,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -481,7 +464,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Constraints index: 2 @@ -492,7 +475,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Collisions index: 3 @@ -503,7 +486,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Navmesh Display index: 4 @@ -514,7 +497,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Agent Display index: 5 @@ -525,7 +508,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Obstacle Display index: 6 @@ -536,7 +519,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Occlusion Culling index: 7 @@ -547,7 +530,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger index: 8 @@ -558,7 +541,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility index: 9 @@ -569,7 +552,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles index: 10 @@ -578,7 +561,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -595,9 +578,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.49072248, y: 7.6249065, z: 1.8747175} + m_Target: {x: -0.56465197, y: 2.0329852, z: -0.022925854} speed: 2 - m_Value: {x: 0.49072248, y: 7.6249065, z: 1.8747175} + m_Value: {x: -0.56465197, y: 2.0329852, z: -0.022925854} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -644,13 +627,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.02317691, y: 0.96904457, z: -0.09976932, w: 0.22486019} + m_Target: {x: 0.035058174, y: 0.9545344, z: -0.124399066, w: 0.2688129} speed: 2 - m_Value: {x: 0.023175744, y: 0.9689958, z: -0.099764295, w: 0.22484888} + m_Value: {x: 0.035056416, y: 0.9544865, z: -0.12439282, w: 0.2687994} m_Size: - m_Target: 1.7877662 + m_Target: 1.0003884 speed: 2 - m_Value: 1.7877662 + m_Value: 1.0003884 m_Ortho: m_Target: 1 speed: 2 @@ -676,6 +659,32 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 713.6 + y: 0 + width: 457.59998 + height: 471.2 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -691,18 +700,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 470.4 - width: 1172 - height: 260.4 + y: 471.2 + width: 1171.2 + height: 259.8 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 11} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 11} - {fileID: 12} + - {fileID: 13} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -723,9 +732,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 544 - width: 1171 - height: 239.4 + y: 544.8 + width: 1170.2 + height: 238.79999 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -755,10 +764,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 120} - m_SelectedIDs: 6a670000 - m_LastClickedID: 26474 - m_ExpandedIDs: 000000004e62000050620000606200006262000000ca9a3bffffff7f + scrollPos: {x: 0, y: 165.20001} + m_SelectedIDs: 2a690000 + m_LastClickedID: 26922 + m_ExpandedIDs: 00000000c4640000c6640000c8640000de64000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -774,7 +783,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -786,7 +795,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004e620000506200006062000000ca9a3bffffff7f + m_ExpandedIDs: 00000000c4640000c6640000c864000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -811,10 +820,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 9211f9ff - m_LastClickedInstanceID: -454254 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000825f0000205f0000 + m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -830,7 +839,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -842,7 +851,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -863,14 +872,14 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 544 - width: 1171 - height: 239.4 + y: 544.8 + width: 1170.2 + height: 238.79999 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -885,18 +894,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1172 + x: 1171.2 y: 0 - width: 364 - height: 730.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + width: 364.80005 + height: 731 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -916,10 +925,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1172 + x: 1171.2001 y: 73.6 - width: 363 - height: 709.8 + width: 363.80005 + height: 710 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index bb4e157..3f8bd50 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 780.8 m_ShowMode: 4 - m_Title: Animator + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 51 + controlID: 24963 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171 + width: 1171.2 height: 731 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 52 + controlID: 24964 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171 - height: 471 + width: 1171.2 + height: 471.2 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 53 + controlID: 24965 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,8 +188,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 298 - height: 471 + width: 297.6 + height: 471.2 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -207,22 +207,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 298 + x: 297.6 y: 0 - width: 580 - height: 471 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + width: 415.99997 + height: 471.2 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: + - {fileID: 15} - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 + m_Selected: 1 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -233,23 +234,22 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 878 + x: 713.6 y: 0 - width: 293 - height: 471 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + width: 457.59998 + height: 471.2 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 15} - {fileID: 13} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -266,9 +266,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 471 - width: 1171 - height: 260 + y: 471.2 + width: 1171.2 + height: 259.8 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 17} @@ -292,12 +292,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1171 + x: 1171.2 y: 0 - width: 365 + width: 364.80005 height: 731 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -323,10 +323,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 879.2 + x: 713.60004 y: 73.6 - width: 289.8 - height: 450 + width: 455.59998 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -337,7 +337,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 289.8, y: 429} + m_TargetSize: {x: 455.59998, y: 429.2} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -352,10 +352,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -115.92 - m_HBaseRangeMax: 115.92 - m_VBaseRangeMin: -171.6 - m_VBaseRangeMax: 171.6 + m_HBaseRangeMin: -182.23999 + m_HBaseRangeMax: 182.23999 + m_VBaseRangeMin: -171.68001 + m_VBaseRangeMax: 171.68001 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -364,7 +364,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -373,23 +373,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 289.8 - height: 429 + width: 455.59998 + height: 429.2 m_Scale: {x: 1.1592739, y: 1.1592739} - m_Translation: {x: 144.9, y: 214.5} + m_Translation: {x: 227.79999, y: 214.6} 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 + x: -196.5023 + y: -185.11589 + width: 393.0046 + height: 370.23178 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 362.25, y: 562.5} + m_LastWindowPixelSize: {x: 569.5, y: 562.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -417,8 +417,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 297 - height: 450 + width: 296.6 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -426,9 +426,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: f6e2fffffcecffff + m_SelectedIDs: 0ee80000 + m_LastClickedID: 59406 + m_ExpandedIDs: f8c1fcff2ec2fcff32c2fcff36c2fcff56c2fcffd8c2fcfff8e700002ee800004ee8000054e8000060e8000062e8000064e800006ae8000070e80000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -453,6 +453,70 @@ MonoBehaviour: m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 --- !u!114 &15 +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: 298.6 + y: 19 + width: 871.6 + height: 450.2 + 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.0177464 + e01: 0 + e02: 0 + e03: -77.03352 + e10: 0 + e11: 1.0177464 + e12: 0 + e13: 111.43313 + 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 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -472,10 +536,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 878.4 + x: 297.6 y: 73.6 - width: 291 - height: 450 + width: 413.99997 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -519,7 +583,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 @@ -552,7 +616,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 @@ -574,7 +638,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 @@ -585,7 +649,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 @@ -596,7 +660,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 @@ -607,7 +671,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 @@ -618,7 +682,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 @@ -629,7 +693,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 @@ -640,7 +704,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 @@ -651,7 +715,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 @@ -662,7 +726,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 @@ -671,8 +735,8 @@ 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 @@ -680,7 +744,7 @@ MonoBehaviour: layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 0 - m_OverrideSceneCullingMask: 6917529027641081856 + m_OverrideSceneCullingMask: 0 m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 0 @@ -688,9 +752,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.062267028, y: -0.11840155, z: 0.045074694} + m_Target: {x: -0.076223016, y: 3.9235106, z: 0.32627058} speed: 2 - m_Value: {x: -0.062267028, y: -0.11840155, z: 0.045074694} + m_Value: {x: -0.56465197, y: 2.0329852, z: -0.022925854} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -702,7 +766,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 1 + showSkybox: 0 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -737,13 +801,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.12716745, y: -0.27125975, z: 0.036181852, w: -0.9534008} + m_Target: {x: 0.06845912, y: -0.65953904, z: 0.06051697, w: 0.74609524} speed: 2 - m_Value: {x: -0.12716518, y: -0.27125493, z: 0.036181208, w: -0.95338386} + m_Value: {x: 0.035056416, y: 0.9544865, z: -0.12439282, w: 0.2687994} m_Size: - m_Target: 0.2153474 + m_Target: 0.3056236 speed: 2 - m_Value: 0.2153474 + m_Value: 1.0003884 m_Ortho: m_Target: 1 speed: 2 @@ -768,70 +832,6 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 -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: 298.4 - y: 73.6 - width: 578 - height: 450 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - 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 @@ -853,9 +853,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 544 - width: 1170 - height: 239 + y: 544.8 + width: 1170.2 + height: 238.79999 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -873,22 +873,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Objects + - Assets/Prefabs/Player m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Objects + - 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: 0} - m_SelectedIDs: b4690000 - m_LastClickedID: 27060 - m_ExpandedIDs: 000000005269000054690000b4690000746b000000ca9a3bffffff7f + scrollPos: {x: 0, y: 165.20001} + m_SelectedIDs: 2a690000 + m_LastClickedID: 26922 + m_ExpandedIDs: 00000000c4640000c6640000c8640000de64000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -916,7 +916,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005269000054690000 + m_ExpandedIDs: 00000000c4640000c6640000c864000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -994,7 +994,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 544.8 - width: 1170 + width: 1170.2 height: 238.79999 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1022,7 +1022,7 @@ MonoBehaviour: serializedVersion: 2 x: 1171.2001 y: 73.6 - width: 364 + width: 363.80005 height: 710 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1035,7 +1035,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 987.6001 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: