mirror of
https://github.com/DerTyp7/defrain-shooter-unity.git
synced 2025-10-29 12:52:07 +01:00
Merge remote-tracking branch 'origin/Player-Animation' into weapons-without-scriptableobjects
This commit is contained in:
Noah4ever
@@ -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
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
34
Assets/Scripts/Player/AimDownSights.cs
Normal file
34
Assets/Scripts/Player/AimDownSights.cs
Normal file
@@ -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)) ;
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Player/AimDownSights.cs.meta
Normal file
11
Assets/Scripts/Player/AimDownSights.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 916f2d37f60a91149bbca3280a1b69ec
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user