wip: add aim

This commit is contained in:
2022-04-17 14:03:57 +07:00
parent 60e8cc14fd
commit 2fd9694679
7 changed files with 391 additions and 2800 deletions

View File

@ -1 +1 @@
{"count":1,"self":30.4209088,"total":30.476561099999998,"children":{"InitializeActuators":{"count":1,"self":0.0009994,"total":0.0009994,"children":null},"AgentSendState":{"count":1272,"self":0.0023281,"total":0.0023281,"children":null},"DecideAction":{"count":1272,"self":0.0513236,"total":0.0513236,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1649867954","unity_version":"2019.4.35f1","command_line_arguments":"D:\\Unity\\2019.4.35f1\\Editor\\Unity.exe -projectpath C:\\Users\\kiril\\real-shooter -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-kiril -hubSessionId 08b23f90-bb2b-11ec-8f91-71b1a8087934 -accessToken wPoaGUoqAdMDDj6g73Y4y-aTBFUY2UVeaU34xyILphA009f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"dont touch me plz","end_time_seconds":"1649867984"}}
{"count":1,"self":16.6838208,"total":16.712662599999998,"children":{"InitializeActuators":{"count":1,"self":0,"total":0,"children":null},"AgentSendState":{"count":576,"self":0.0019632,"total":0.0019632,"children":null},"DecideAction":{"count":576,"self":0.0258802,"total":0.0258802,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1650178667","unity_version":"2019.4.35f1","command_line_arguments":"D:\\Unity\\2019.4.35f1\\Editor\\Unity.exe -projectpath C:\\Users\\kiril\\real-shooter -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-kiril -hubSessionId 98771190-be1a-11ec-9c09-9dc92f6b967a -accessToken s8caeOYfqx6g6xnYk94RfMv2OTjaX6uA5gfR3X2X-yU009f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"dont touch me plz","end_time_seconds":"1650178683"}}

View File

@ -133,6 +133,7 @@ GameObject:
- component: {fileID: 254804101}
- component: {fileID: 254804100}
- component: {fileID: 254804099}
- component: {fileID: 254804103}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
@ -212,97 +213,27 @@ Transform:
m_LocalScale: {x: 100, y: 1, z: 100}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &440413021
PrefabInstance:
--- !u!95 &254804103
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalPosition.x
value: 28.21
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalPosition.y
value: 10.9
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalPosition.z
value: 46.67
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 8510909888689775086, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: settings.MovementSwayX
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8510909888689775086, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: settings.MovementSwayY
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8510909888689775086, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: settings.MovementSwaySmoothing
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8510909888689775086, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: settings.MovementSwayYInverted
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 80f6c1c85e5daed4c96c70205ed5503d, type: 3}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 254804098}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6defa2fea7e9a934a8d2cafa30dc567a, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &676942498
GameObject:
m_ObjectHideFlags: 0
@ -395,3 +326,83 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1642807971
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalPosition.x
value: 27.722527
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalPosition.y
value: 11.01
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalPosition.z
value: 40.66469
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480121, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5245491127989480122, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: flashPoof
value:
objectReference: {fileID: 7831239082239589406, guid: eaa8223f88e923a4c9f55187542c1c65,
type: 3}
- target: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 80f6c1c85e5daed4c96c70205ed5503d, type: 3}

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: f432554f564e69242897607d34218939
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,126 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4990518237621721504
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2899293721311086279}
- component: {fileID: 882715573061308690}
- component: {fileID: 4617010341778439690}
m_Layer: 0
m_Name: Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2899293721311086279
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4990518237621721504}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 17878.16, z: 616.4097}
m_LocalScale: {x: 100, y: 100, z: 100}
m_Children: []
m_Father: {fileID: 7072444061591351696}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &882715573061308690
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4990518237621721504}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &4617010341778439690
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4990518237621721504}
m_Enabled: 1
--- !u!1 &6277443649044622161
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4627080026632482293}
m_Layer: 0
m_Name: CameraHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4627080026632482293
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6277443649044622161}
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_Children:
- {fileID: 7207249014110603258}
- {fileID: 7072444061591351728}
- {fileID: 7072444061591351740}
- {fileID: 7072444061591351712}
- {fileID: 7072444061591351714}
- {fileID: 7072444061591351696}
- {fileID: 7072444061591351702}
- {fileID: 7072444061591351684}
m_Father: {fileID: 7072444061591351794}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7072444061591710752
GameObject:
m_ObjectHideFlags: 0
@ -515,12 +636,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711104}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: -138.49533, z: 34.48629}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -138.49533, z: 34.48629}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children: []
m_Father: {fileID: 7072444061591351794}
m_RootOrder: 2
m_Father: {fileID: 4627080026632482293}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7072444061578043540
SkinnedMeshRenderer:
@ -654,12 +775,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711106}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.0000018693923, y: -129.49721, z: -6.0212374}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -129.49721, z: -6.0212374}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children: []
m_Father: {fileID: 7072444061591351794}
m_RootOrder: 3
m_Father: {fileID: 4627080026632482293}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7072444061578043542
SkinnedMeshRenderer:
@ -987,12 +1108,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711120}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: -163.22968, z: -0.3527179}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -163.22968, z: -0.3527179}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children: []
m_Father: {fileID: 7072444061591351794}
m_RootOrder: 0
m_Father: {fileID: 4627080026632482293}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7072444061578043536
SkinnedMeshRenderer:
@ -1278,12 +1399,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711132}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -118.131454, y: -98.01, z: -57.969975}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children: []
m_Father: {fileID: 7072444061591351794}
m_RootOrder: 1
m_Father: {fileID: 4627080026632482293}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7072444061578043538
SkinnedMeshRenderer:
@ -1715,6 +1836,7 @@ GameObject:
m_Component:
- component: {fileID: 7072444061591351794}
- component: {fileID: 7072444061582351952}
- component: {fileID: 6146116838354622185}
m_Layer: 0
m_Name: PolyartCharacter
m_TagString: Untagged
@ -1733,13 +1855,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7072444061591351728}
- {fileID: 7072444061591351740}
- {fileID: 7072444061591351712}
- {fileID: 7072444061591351714}
- {fileID: 7072444061591351696}
- {fileID: 7072444061591351702}
- {fileID: 7072444061591351684}
- {fileID: 4627080026632482293}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1762,6 +1878,63 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &6146116838354622185
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711186}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9826297ef4d853741b2af768441ec7f7, type: 3}
m_Name:
m_EditorClassIdentifier:
input_Movement: {x: 0, y: 0}
input_View: {x: 0, y: 0}
cameraHolder: {fileID: 4627080026632482293}
feetTransform: {fileID: 7072444061591351684}
playerSettings:
ViewXSensetivity: 0
ViewYSensetivity: 0
ViewXInverted: 0
ViewYInverted: 0
SprintingHold: 0
MovementSmoothing: 0
RunningForwardSpeed: 0
RunningStrafeSpeed: 0
WalkingForwardSpeed: 0
WalkingBackwardSpeed: 0
WalkingStrafeSpeed: 0
JumpingHeight: 0
JumpingFalloff: 0
FallingSmoothing: 0
SpeedEffector: 1
CrouchSpeedEffector: 0
ProneSpeedEffector: 0
FallingSpeedEffector: 0
ViewClampYMin: -70
ViewClampYMax: 80
playerMask:
serializedVersion: 2
m_Bits: 0
gravityAmount: 0
gravityMin: 0
jumpingForce: {x: 0, y: 0, z: 0}
playerStance: 0
playerStanceSmoothing: 0
playerStandStance:
CameraHeight: 0
StanceCollider: {fileID: 0}
playerCrouchStance:
CameraHeight: 0
StanceCollider: {fileID: 0}
playerProneStance:
CameraHeight: 0
StanceCollider: {fileID: 0}
isSprinting: 0
currentWeapon: {fileID: 0}
weaponAnimationSpeed: 0
--- !u!1 &7072444061591711188
GameObject:
m_ObjectHideFlags: 0
@ -2032,12 +2205,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711204}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: -96.69518, z: -8.197696}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -96.69518, z: -8.197696}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children: []
m_Father: {fileID: 7072444061591351794}
m_RootOrder: 6
m_Father: {fileID: 4627080026632482293}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7072444061578043546
SkinnedMeshRenderer:
@ -2325,12 +2498,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711216}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: -176.9416, z: -6.1230974}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -176.9416, z: -6.1230974}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children: []
m_Father: {fileID: 7072444061591351794}
m_RootOrder: 4
m_Children:
- {fileID: 2899293721311086279}
m_Father: {fileID: 4627080026632482293}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7072444061578043544
SkinnedMeshRenderer:
@ -2524,16 +2698,16 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711222}
m_LocalRotation: {x: -0.4582423, y: 0.5385295, z: -0.4582423, w: 0.5385295}
m_LocalPosition: {x: -0, y: 1.0650933, z: 0.038611155}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_LocalPosition: {x: 0, y: 1.0650933, z: 0.038611155}
m_LocalScale: {x: 0.010000001, y: 0.01, z: 0.01}
m_Children:
- {fileID: 7072444061591351736}
- {fileID: 7072444061591351738}
- {fileID: 7072444061591351760}
- {fileID: 7072444061591351756}
- {fileID: 7072444061591351758}
m_Father: {fileID: 7072444061591351794}
m_RootOrder: 5
m_Father: {fileID: 4627080026632482293}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7072444061591711224
GameObject:
@ -2657,3 +2831,53 @@ Transform:
m_Father: {fileID: 7072444061591351682}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7976818881840838822
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7207249014110603258}
- component: {fileID: 1822822644330576206}
m_Layer: 0
m_Name: CharacterAnimator
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7207249014110603258
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7976818881840838822}
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_Children: []
m_Father: {fileID: 4627080026632482293}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &1822822644330576206
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7976818881840838822}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6defa2fea7e9a934a8d2cafa30dc567a, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0

View File

@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using Unity.Barracuda;
using UnityEngine;
using UnityEngine.InputSystem;
using static scr_Models;
@ -11,6 +12,7 @@ public class scr_CharacterController : MonoBehaviour
private CharacterController characterController;
private DefaultInput defaultInput;
[HideInInspector]
public Vector2 input_Movement;
[HideInInspector]
@ -60,6 +62,11 @@ public class scr_CharacterController : MonoBehaviour
public float weaponAnimationSpeed;
public float damage = 10f;
public float range = 100f;
public Camera fpsCam;
private void Awake()
{
defaultInput = new DefaultInput();
@ -91,12 +98,26 @@ public class scr_CharacterController : MonoBehaviour
private void Update()
{
if (Input.GetButtonDown("Fire1"))
{
Shoot();
}
CalculateView();
CalculateMovement();
CalculateJump();
CalculateCameraHeight();
}
void Shoot()
{
RaycastHit hit;
if (Physics.Raycast(fpsCam.transform.position, fpsCam.transform.forward, out hit, range))
{
Debug.Log(hit.transform.name);
}
}
private void CalculateView()
{
newCharacterRotation.y += playerSettings.ViewXSensetivity * (playerSettings.ViewXInverted ? -input_View.x : input_View.x) * Time.deltaTime;

View File

@ -1,6 +1,9 @@
using System;
using UnityEditor;
using UnityEngine;
using UnityEngine.InputSystem;
using static scr_Models;
public class scr_WeaponController : MonoBehaviour
{
private scr_CharacterController characterController;
@ -8,8 +11,8 @@ public class scr_WeaponController : MonoBehaviour
public WeaponSettingsModel settings;
[Header("References")]
public Animator weaponAnimator;
private bool isInitialised;
Vector3 newWeaponRotation;
@ -23,7 +26,6 @@ public class scr_WeaponController : MonoBehaviour
Vector3 targetWeaponMovementRotation;
Vector3 targetWeaponMovementRotationVelocity;
private void Start()
{
newWeaponRotation = transform.localRotation.eulerAngles;
@ -45,7 +47,6 @@ public class scr_WeaponController : MonoBehaviour
CalculateWeaponRotation();
SetWeaponAnimation();
}
private void CalculateWeaponRotation()
{
weaponAnimator.speed = characterController.weaponAnimationSpeed;