diff --git a/.gitconfig b/.gitconfig
deleted file mode 100644
index a27788d25b5cfec51cec51ff3f7ea5b76b1dd486..0000000000000000000000000000000000000000
--- a/.gitconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-[merge]
-tool = unityyamlmerge
-
-[mergetool "unityyamlmerge"]
-trustExitCode = false
-cmd = 'C:\Program Files\Unity\Hub\Editor\2021.3.21f1\Editor\Data\Tools\UnityYAMLMerge.exe' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index e648af28f65b8690afa2420ead046dace7a44c34..4bb6e6658d490621578d8e86e373aaa321766502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,4 +75,7 @@ crashlytics-build.properties
# Mac Only
*.DS_Store
*/.DS_Store
-*/.DS_Store?
\ No newline at end of file
+*/.DS_Store?
+
+# Gitconfig
+.gitconfig
\ No newline at end of file
diff --git a/Assets/Animation/CJAC.controller b/Assets/Animation/CJAC.controller
index cc8dc44c6cac2b3f5fcbf9c56502610660293d66..d783b0494897de4589a91c661075356c02214c35 100644
--- a/Assets/Animation/CJAC.controller
+++ b/Assets/Animation/CJAC.controller
@@ -51,33 +51,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: -203655887218126122, guid: b535133b824bd4683b12894b866bcc93, type: 3}
- m_Tag:
- m_SpeedParameter:
- m_MirrorParameter:
- m_CycleOffsetParameter:
- m_TimeParameter:
---- !u!1102 &-7912761446644543739
-AnimatorState:
- serializedVersion: 6
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Idle Shoot 0
- m_Speed: 1
- m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
- m_Position: {x: 50, y: 50, z: 0}
- m_IKOnFeet: 0
- m_WriteDefaultValues: 1
- m_Mirror: 0
- m_SpeedParameterActive: 0
- m_MirrorParameterActive: 0
- m_CycleOffsetParameterActive: 0
- m_TimeParameterActive: 0
- m_Motion: {fileID: -203655887218126122, guid: b535133b824bd4683b12894b866bcc93, type: 3}
+ m_Motion: {fileID: -203655887218126122, guid: 6c8e786644ea84c2fa6eccc202cccae7, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -138,9 +112,6 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -6855572511950318631}
m_Position: {x: 330, y: 500, z: 0}
- - serializedVersion: 1
- m_State: {fileID: -7912761446644543739}
- m_Position: {x: 0, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: -4603776484425348338}
diff --git a/Assets/Animation/Firing Rifle.fbx.meta b/Assets/Animation/Firing Rifle.fbx.meta
index fbc81c0f231ab9fa36e0f5cd48e5c9e87a24c293..d3806b8985b620e80475ced6a23198c5f4297fd9 100644
--- a/Assets/Animation/Firing Rifle.fbx.meta
+++ b/Assets/Animation/Firing Rifle.fbx.meta
@@ -105,7 +105,7 @@ ModelImporter:
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
- importAnimation: 1
+ importAnimation: 0
humanDescription:
serializedVersion: 3
human:
diff --git a/Assets/Animation/Rifle Aiming Idle.fbx.meta b/Assets/Animation/Rifle Aiming Idle.fbx.meta
index 2993600155c8eb6e247b08b39cbb1a6e26d2f28f..944ed53a6faea71cd7e498538079d4f1d6746f92 100644
--- a/Assets/Animation/Rifle Aiming Idle.fbx.meta
+++ b/Assets/Animation/Rifle Aiming Idle.fbx.meta
@@ -37,7 +37,7 @@ ModelImporter:
takeName: mixamo.com
internalID: -203655887218126122
firstFrame: 0
- lastFrame: 93
+ lastFrame: 0
wrapMode: 0
orientationOffsetY: 0
level: 0
diff --git a/Assets/Prefabs/Camera Aim.prefab b/Assets/Prefabs/Camera Aim.prefab
index 78b9f8a8b7751aaa880b146162f402b993c1eb5d..7db0b462aac7049ade0f4be269533899cb0aec1c 100644
--- a/Assets/Prefabs/Camera Aim.prefab
+++ b/Assets/Prefabs/Camera Aim.prefab
@@ -177,7 +177,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3886513529329337223}
- m_LocalRotation: {x: 0.021814886, y: 0, z: 0, w: 0.99976206}
+ m_LocalRotation: {x: 0.021814892, y: 0, z: 0, w: 0.999762}
m_LocalPosition: {x: 3.1729503, y: 1.9821141, z: -3.3923614}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -186,7 +186,7 @@ Transform:
- {fileID: 6769630940064437920}
m_Father: {fileID: 0}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: 2.5, y: 0, z: 0}
--- !u!114 &8629872887081222642
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -270,6 +270,7 @@ MonoBehaviour:
animator: {fileID: 0}
aimCanvas: {fileID: 6769630940064437927}
playerInput: {fileID: 0}
+ aimRig: {fileID: 0}
--- !u!1 &6769630940064437924
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Camera Bow Aim.prefab b/Assets/Prefabs/Camera Bow Aim.prefab
index 4e9ea9515843058ff46039b1ef42e3f0da6b58d8..af89999d79c4a3040c5c6b64ea19a6b3dbf3ef40 100644
--- a/Assets/Prefabs/Camera Bow Aim.prefab
+++ b/Assets/Prefabs/Camera Bow Aim.prefab
@@ -93,7 +93,7 @@ MonoBehaviour:
m_TransparentLayers:
serializedVersion: 2
m_Bits: 0
- m_MinimumDistanceFromTarget: 0.01
+ m_MinimumDistanceFromTarget: 0.5
m_AvoidObstacles: 1
m_DistanceLimit: 0
m_MinimumOcclusionTime: 0
@@ -119,6 +119,7 @@ MonoBehaviour:
animator: {fileID: 0}
aimCanvas: {fileID: 8772202551924140006}
playerInput: {fileID: 0}
+ aimRig: {fileID: 0}
--- !u!1 &4433368869457273407
GameObject:
m_ObjectHideFlags: 0
@@ -177,7 +178,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_TrackedObjectOffset: {x: 0.52, y: 0.6, z: 0}
+ m_TrackedObjectOffset: {x: 0.5, y: 0.7, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
@@ -185,9 +186,9 @@ MonoBehaviour:
m_YDamping: 0
m_ZDamping: 0
m_TargetMovementOnly: 1
- m_ScreenX: 0.49
- m_ScreenY: 0.31
- m_CameraDistance: 0.01
+ m_ScreenX: 0.52
+ m_ScreenY: 0.75
+ m_CameraDistance: 0.1
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0.000000027939677
m_DeadZoneDepth: 0
diff --git a/Assets/Prefabs/Camera Normal.prefab b/Assets/Prefabs/Camera Normal.prefab
index d290065ee8364d2e08914be43e4da5fd31cdafe4..72aa10d286c743e156eeb92bc1654be19141c0dd 100644
--- a/Assets/Prefabs/Camera Normal.prefab
+++ b/Assets/Prefabs/Camera Normal.prefab
@@ -195,7 +195,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5358109398903638708}
- m_LocalRotation: {x: 0.034899496, y: 0, z: 0, w: 0.99939084}
+ m_LocalRotation: {x: 0.03489949, y: 0, z: 0, w: 0.99939084}
m_LocalPosition: {x: 2.69, y: 1.8334886, z: -2.543152}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -203,7 +203,7 @@ Transform:
- {fileID: 5358109398572806942}
m_Father: {fileID: 0}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 37.84, y: 6.498, z: -1.753}
+ m_LocalEulerAnglesHint: {x: 4, y: 0, z: 0}
--- !u!114 &5358109398903638711
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index e2ce1be13bd5b8ecf378b38000dec164cfdadbc6..defcaf5755838660cb08341119998a9d9ec07e27 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -1,5 +1,279 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &214956585
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 214956586}
+ - component: {fileID: 214956587}
+ m_Layer: 0
+ m_Name: BodyAimRig
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &214956586
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 214956585}
+ 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: []
+ m_Father: {fileID: 749261033}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &214956587
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 214956585}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e3c430f382484144e925c097c2d33cfe, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Weight: 0.503
+ m_Data:
+ m_ConstrainedObject: {fileID: 184670040919906426}
+ m_SourceObjects:
+ m_Length: 1
+ m_Item0:
+ transform: {fileID: 0}
+ weight: 1
+ m_Item1:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item2:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item3:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item4:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item5:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item6:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item7:
+ transform: {fileID: 0}
+ weight: 0
+ m_Offset: {x: 0, y: 0, z: 0}
+ m_MinLimit: -60
+ m_MaxLimit: 60
+ m_AimAxis: 4
+ m_UpAxis: 2
+ m_WorldUpType: 0
+ m_WorldUpObject: {fileID: 0}
+ m_WorldUpAxis: 2
+ m_MaintainOffset: 0
+ m_ConstrainedAxes:
+ x: 1
+ y: 1
+ z: 1
+--- !u!1 &227278766
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 227278767}
+ - component: {fileID: 227278768}
+ m_Layer: 0
+ m_Name: AimRig
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &227278767
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 227278766}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.014, y: 0, z: -0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 969288974}
+ m_Father: {fileID: 749261033}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &227278768
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 227278766}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e3c430f382484144e925c097c2d33cfe, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Weight: 1
+ m_Data:
+ m_ConstrainedObject: {fileID: 3640176569276755799}
+ m_SourceObjects:
+ m_Length: 1
+ m_Item0:
+ transform: {fileID: 0}
+ weight: 1
+ m_Item1:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item2:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item3:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item4:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item5:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item6:
+ transform: {fileID: 0}
+ weight: 0
+ m_Item7:
+ transform: {fileID: 0}
+ weight: 0
+ m_Offset: {x: 0, y: 0, z: 0}
+ m_MinLimit: -180
+ m_MaxLimit: 180
+ m_AimAxis: 2
+ m_UpAxis: 1
+ m_WorldUpType: 0
+ m_WorldUpObject: {fileID: 0}
+ m_WorldUpAxis: 2
+ m_MaintainOffset: 0
+ m_ConstrainedAxes:
+ x: 1
+ y: 1
+ z: 1
+--- !u!1 &749261032
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 749261033}
+ - component: {fileID: 749261034}
+ - component: {fileID: 749261035}
+ m_Layer: 0
+ m_Name: Rig 1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &749261033
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 749261032}
+ 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: 214956586}
+ - {fileID: 227278767}
+ m_Father: {fileID: 3969839587655876119}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &749261034
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 749261032}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 70b342d8ce5c2fd48b8fa3147d48d1d1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Weight: 1
+ m_Effectors:
+ - m_Transform: {fileID: 969288974}
+ m_Style:
+ shape: {fileID: 4300000, guid: e050c2b16fe384bd994474655a4b4968, type: 2}
+ color: {r: 1, g: 0, b: 0, a: 0.5}
+ size: 0.1
+ position: {x: 0, y: 0, z: 0}
+ rotation: {x: 0, y: 0, z: 0}
+ m_Visible: 1
+--- !u!114 &749261035
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 749261032}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 54754e590bd6126408a2141b25bf29ef, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ aimTarget: {fileID: 969288973}
+--- !u!1 &969288973
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 969288974}
+ m_Layer: 0
+ m_Name: Target
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &969288974
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 969288973}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0.01, y: 0.59, z: 1.046}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 227278767}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &35134934316619870
GameObject:
m_ObjectHideFlags: 0
@@ -971,6 +1245,8 @@ GameObject:
- component: {fileID: 3502970855684404621}
- component: {fileID: 3502970855684404616}
- component: {fileID: 3502970855684404618}
+ - component: {fileID: 5866666021469675367}
+ - component: {fileID: 5866666021469675368}
m_Layer: 0
m_Name: Player
m_TagString: Player
@@ -997,6 +1273,7 @@ Transform:
- {fileID: 4973791437478150138}
- {fileID: 8688261701417011427}
- {fileID: 3502970856577789971}
+ - {fileID: 749261033}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1249,6 +1526,98 @@ MonoBehaviour:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
+--- !u!114 &5866666021469675367
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4349462111621129389}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b2d8418b0b9634b1892b0268dd9c2743, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ boneShape: 1
+ drawBones: 1
+ drawTripods: 0
+ boneSize: 1
+ tripodSize: 1
+ boneColor: {r: 0, g: 0, b: 1, a: 0.5}
+ m_Transforms:
+ - {fileID: 6470868637989590280}
+ - {fileID: 2360809016782812430}
+ - {fileID: 8119577678698539058}
+ - {fileID: 5510562570848353773}
+ - {fileID: 1977896875060011497}
+ - {fileID: 3529713870518338391}
+ - {fileID: 4428133983530274498}
+ - {fileID: 3640176569276755799}
+ - {fileID: 6727868377561533213}
+ - {fileID: 2424082204370305723}
+ - {fileID: 3576508652216636044}
+ - {fileID: 9052133464130589526}
+ - {fileID: 5485593430591339108}
+ - {fileID: 3106526365608126754}
+ - {fileID: 8501889116285953156}
+ - {fileID: 6272207404489900002}
+ - {fileID: 270140141904256004}
+ - {fileID: 2229113454451515730}
+ - {fileID: 1596131159219910058}
+ - {fileID: 7273400761948269607}
+ - {fileID: 6013527598370455346}
+ - {fileID: 476468891943644042}
+ - {fileID: 6877162138520560638}
+ - {fileID: 3716059518164869070}
+ - {fileID: 8334183772873925736}
+ - {fileID: 4180725907271350393}
+ - {fileID: 4968251091276811691}
+ - {fileID: 7580439395009103336}
+ - {fileID: 4357885637157793893}
+ - {fileID: 5045347021211580660}
+ - {fileID: 33688906122987937}
+ - {fileID: 140450133544644240}
+ - {fileID: 811765809070790776}
+ - {fileID: 8688261701417011427}
+ - {fileID: 4069507199416237719}
+ - {fileID: 1616242146238931629}
+ - {fileID: 184670040919906426}
+ - {fileID: 5677293674159142646}
+ - {fileID: 7634160729131461219}
+--- !u!114 &5866666021469675368
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4349462111621129389}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_RigLayers:
+ - m_Rig: {fileID: 0}
+ m_Active: 1
+ - m_Rig: {fileID: 749261034}
+ m_Active: 1
+ m_Effectors:
+ - m_Transform: {fileID: 0}
+ m_Style:
+ shape: {fileID: 4300000, guid: c6793350c150f456688e39a81f97364a, type: 2}
+ color: {r: 1, g: 0, b: 0, a: 0.5}
+ size: 0.1
+ position: {x: 0, y: 0, z: 0}
+ rotation: {x: 0, y: 0, z: 0}
+ m_Visible: 1
+ - m_Transform: {fileID: 0}
+ m_Style:
+ shape: {fileID: 4300000, guid: e050c2b16fe384bd994474655a4b4968, type: 2}
+ color: {r: 1, g: 0, b: 0, a: 0.5}
+ size: 0.1
+ position: {x: 0, y: 0, z: 0}
+ rotation: {x: 0, y: 0, z: 0}
+ m_Visible: 1
--- !u!1 &4428554586142635328
GameObject:
m_ObjectHideFlags: 0
@@ -2177,6 +2546,10 @@ PrefabInstance:
propertyPath: m_Name
value: Golok
objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 5f550350f135ff74899a351f5e0af1b5, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1151388028547126963, guid: 5f550350f135ff74899a351f5e0af1b5, type: 3}
propertyPath: m_LocalScale.x
value: 0.001
@@ -2231,7 +2604,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8164078558771037576, guid: 5f550350f135ff74899a351f5e0af1b5, type: 3}
propertyPath: m_Name
- value: Golok
+ value: GolokModel
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5f550350f135ff74899a351f5e0af1b5, type: 3}
@@ -2302,43 +2675,6 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
---- !u!95 &74674840
-Animator:
- serializedVersion: 5
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2330412599977800600}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: 328263c8bbe1fd040a770d24f3b8fe2b, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_StabilizeFeet: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorStateOnDisable: 0
- m_WriteDefaultValuesOnDisable: 0
---- !u!114 &74674841
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2330412599977800600}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 051667d0b8d97b942b4a82dc9a83e335, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- timeBetweenAttack: 1
- slashEffect: {fileID: 1645009922904612, guid: 5e3170c6ef0f014409bd7423e3bb805a, type: 3}
- playerInput: {fileID: 3502970855684404618}
- playerAnimator: {fileID: 7059278920872305773}
--- !u!82 &1889099551
AudioSource:
m_ObjectHideFlags: 0
@@ -2435,6 +2771,43 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
+--- !u!95 &74674840
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2330412599977800600}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 328263c8bbe1fd040a770d24f3b8fe2b, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &74674841
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2330412599977800600}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 051667d0b8d97b942b4a82dc9a83e335, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ timeBetweenAttack: 1
+ slashEffect: {fileID: 1645009922904612, guid: 5e3170c6ef0f014409bd7423e3bb805a, type: 3}
+ playerInput: {fileID: 3502970855684404618}
+ playerAnimator: {fileID: 7059278920872305773}
--- !u!4 &3106526365608126754 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5f550350f135ff74899a351f5e0af1b5, type: 3}
@@ -2447,6 +2820,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 3640176569276755799}
m_Modifications:
+ - target: {fileID: 1720252466977677541, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Name
+ value: ShotgunScaler
+ objectReference: {fileID: 0}
- target: {fileID: 4700204478206050179, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
propertyPath: m_audioClip
value:
@@ -2511,6 +2888,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 8988537546110087808, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Name
+ value: ShotgunModel
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
--- !u!4 &5485593430591339108 stripped
@@ -2580,7 +2961,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 753388013721813621, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 5527864457537079415, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
@@ -2647,6 +3028,10 @@ PrefabInstance:
propertyPath: powerSlider
value:
objectReference: {fileID: 0}
+ - target: {fileID: 4738850939398215171, guid: 73235ad7e7287d4459effe3e88d3fd93, type: 3}
+ propertyPath: m_Name
+ value: BowModel
+ objectReference: {fileID: 0}
- target: {fileID: 5549189021126439216, guid: 73235ad7e7287d4459effe3e88d3fd93, type: 3}
propertyPath: m_Name
value: Bow
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index dbff075bfe36ec446ac20240b3a7fe6a802eec8b..5d049f4ec5e34e78d2698fb86790a047d2b86dc8 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -535,7 +535,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 14
+ m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 230, z: 0}
--- !u!1 &200540902
GameObject:
@@ -640,19 +640,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
propertyPath: m_RootOrder
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalScale.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalScale.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalScale.z
- value: 1
+ value: 11
objectReference: {fileID: 0}
- target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
propertyPath: m_LocalPosition.x
@@ -704,11 +692,6 @@ PrefabInstance:
objectReference: {fileID: 543450653267068186}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
---- !u!1 &261123965 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 4245098976686868534, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- m_PrefabInstance: {fileID: 3502970855580957453}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &272130433
GameObject:
m_ObjectHideFlags: 0
@@ -5829,7 +5812,7 @@ RectTransform:
- {fileID: 866082437}
- {fileID: 1846332529}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -5929,7 +5912,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 15
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &516445062
PrefabInstance:
@@ -6220,11 +6203,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3}
---- !u!1 &596980149 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 9052133464130589527, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- m_PrefabInstance: {fileID: 3502970855580957453}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &644647299
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6238,11 +6216,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4281971572816293780, guid: abee31e5b64d44345952d67c6fcb9a10, type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 7
objectReference: {fileID: 0}
- target: {fileID: 4281971572816293780, guid: abee31e5b64d44345952d67c6fcb9a10, type: 3}
propertyPath: m_LocalPosition.x
- value: 3.5047257
+ value: 3.3511102
objectReference: {fileID: 0}
- target: {fileID: 4281971572816293780, guid: abee31e5b64d44345952d67c6fcb9a10, type: 3}
propertyPath: m_LocalPosition.y
@@ -6280,6 +6258,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6769630941110081584, guid: abee31e5b64d44345952d67c6fcb9a10, type: 3}
+ propertyPath: aimRig
+ value:
+ objectReference: {fileID: 749261034}
- target: {fileID: 6769630941110081584, guid: abee31e5b64d44345952d67c6fcb9a10, type: 3}
propertyPath: animator
value:
@@ -6378,6 +6360,17 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 655138152}
m_CullTransparentMesh: 1
+--- !u!114 &749261034 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 749261034, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
+ m_PrefabInstance: {fileID: 3502970855580957453}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 70b342d8ce5c2fd48b8fa3147d48d1d1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1001 &837011783
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6391,19 +6384,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2243653197400334037, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
propertyPath: m_RootOrder
- value: 8
+ value: 9
objectReference: {fileID: 0}
- target: {fileID: 2243653197400334037, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
propertyPath: m_LocalPosition.x
- value: 3.305284
+ value: 3.2844956
objectReference: {fileID: 0}
- target: {fileID: 2243653197400334037, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
propertyPath: m_LocalPosition.y
- value: 1.6598824
+ value: 1.761645
objectReference: {fileID: 0}
- target: {fileID: 2243653197400334037, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
propertyPath: m_LocalPosition.z
- value: -0.029560003
+ value: -0.031856418
objectReference: {fileID: 0}
- target: {fileID: 2243653197400334037, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
propertyPath: m_LocalRotation.w
@@ -6441,18 +6434,10 @@ PrefabInstance:
propertyPath: m_LookAt
value:
objectReference: {fileID: 543450653267068186}
- - target: {fileID: 6171677765996245422, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
- propertyPath: m_ScreenY
- value: 0.7
- objectReference: {fileID: 0}
- - target: {fileID: 6171677765996245422, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
- propertyPath: m_CameraDistance
- value: 0.1
- objectReference: {fileID: 0}
- - target: {fileID: 6879701757565549419, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
- propertyPath: m_MinimumDistanceFromTarget
- value: 0.5
- objectReference: {fileID: 0}
+ - target: {fileID: 8772202550886820209, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
+ propertyPath: aimRig
+ value:
+ objectReference: {fileID: 749261034}
- target: {fileID: 8772202550886820209, guid: 694c5a50034c94e49a93efd4c0e9261d, type: 3}
propertyPath: animator
value:
@@ -6871,6 +6856,53 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
currentTimeText: {fileID: 1220247291}
+--- !u!1 &1245541025
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1245541027}
+ - component: {fileID: 1245541026}
+ m_Layer: 0
+ m_Name: MouseTarget
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1245541026
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1245541025}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f9859a5fec9c8554ea256938aabefcdb, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ layerMask:
+ serializedVersion: 2
+ m_Bits: 456
+--- !u!4 &1245541027
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1245541025}
+ 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: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1601895371
GameObject:
m_ObjectHideFlags: 0
@@ -7204,7 +7236,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1696507781
GameObject:
@@ -7255,7 +7287,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 11
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1750560707
GameObject:
@@ -12225,11 +12257,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1849667604}
m_CullTransparentMesh: 1
---- !u!1 &1871247292 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 5485593430591339111, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- m_PrefabInstance: {fileID: 3502970855580957453}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1918174533
GameObject:
m_ObjectHideFlags: 0
@@ -12259,7 +12286,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 13
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0}
--- !u!1 &1918974531
GameObject:
@@ -12327,7 +12354,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1933207777
GameObject:
@@ -12358,7 +12385,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 12
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 130, z: 0}
--- !u!1 &1944464825
GameObject:
@@ -13573,46 +13600,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 2330412599977800600, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
+ - target: {fileID: 214956587, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
+ propertyPath: m_Data.m_SourceObjects.m_Item0.transform
+ value:
+ objectReference: {fileID: 1245541027}
+ - target: {fileID: 227278768, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
+ propertyPath: m_Data.m_SourceObjects.m_Item0.transform
+ value:
+ objectReference: {fileID: 1245541027}
- target: {fileID: 3502970855684404595, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
propertyPath: gameOverManager
value:
objectReference: {fileID: 426447404}
- - target: {fileID: 3502970855684404616, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: weaponList.Array.size
- value: 4
- objectReference: {fileID: 0}
- - target: {fileID: 3502970855684404616, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: weaponList.Array.data[0]
- value:
- objectReference: {fileID: 261123965}
- - target: {fileID: 3502970855684404616, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: weaponList.Array.data[1]
- value:
- objectReference: {fileID: 1871247292}
- - target: {fileID: 3502970855684404616, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: weaponList.Array.data[3]
- value:
- objectReference: {fileID: 596980149}
- - target: {fileID: 3502970855684404616, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: isPlayerHaveWeapon.Array.size
- value: 4
- objectReference: {fileID: 0}
- - target: {fileID: 3502970855684404616, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: isPlayerHaveWeapon.Array.data[0]
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3502970855684404616, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: isPlayerHaveWeapon.Array.data[1]
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3502970855684404616, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: isPlayerHaveWeapon.Array.data[3]
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 3502970855684404618, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
propertyPath: m_Camera
value:
@@ -13681,23 +13680,12 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4245098976686868534, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 4349462111621129389, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- - target: {fileID: 5485593430591339111, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 9052133464130589527, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
+ m_RemovedComponents:
+ - {fileID: 749261035, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
--- !u!1 &3536249703508601913
GameObject:
@@ -13917,7 +13905,7 @@ Transform:
- {fileID: 322389884}
- {fileID: 3943293118254761259}
m_Father: {fileID: 0}
- m_RootOrder: 16
+ m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &3635204988679963016
Transform:
diff --git a/Assets/Scripts/Camera/CameraSwitch.cs b/Assets/Scripts/Camera/CameraSwitch.cs
index 77ecc980e1ae78c645c4a67492b6bad53554d042..8606fa373148693ff48a27e175972769ad983d80 100644
--- a/Assets/Scripts/Camera/CameraSwitch.cs
+++ b/Assets/Scripts/Camera/CameraSwitch.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.InputSystem;
using Cinemachine;
+using UnityEngine.Animations.Rigging;
public class CameraSwitch : MonoBehaviour
{
@@ -14,6 +15,8 @@ public class CameraSwitch : MonoBehaviour
private PlayerInput playerInput;
private CinemachineVirtualCamera vcam;
private InputAction aimAction;
+ public Rig aimRig;
+ private float aimRigWeight;
void Awake()
{
@@ -22,6 +25,11 @@ public class CameraSwitch : MonoBehaviour
aimCanvas.enabled = false;
}
+ void Update()
+ {
+ aimRig.weight = Mathf.Lerp(aimRig.weight, aimRigWeight, Time.deltaTime * 20f);
+ }
+
void OnEnable()
{
aimAction.performed += _ => StartAim();
@@ -39,6 +47,7 @@ public class CameraSwitch : MonoBehaviour
vcam.Priority += 10;
aimCanvas.enabled = true;
animator.SetBool("IsShooting", true);
+ aimRigWeight = 1f;
}
private void StopAim()
@@ -46,5 +55,6 @@ public class CameraSwitch : MonoBehaviour
vcam.Priority -= 10;
aimCanvas.enabled = false;
animator.SetBool("IsShooting", false);
+ aimRigWeight = 0f;
}
}
diff --git a/Assets/Scripts/Camera/MouseTarget.cs b/Assets/Scripts/Camera/MouseTarget.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b0eaeda44d38782891140115eff86c732da3b85f
--- /dev/null
+++ b/Assets/Scripts/Camera/MouseTarget.cs
@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MouseTarget : MonoBehaviour
+{
+ Transform cameraTransform;
+ Ray shootRay = new Ray();
+ public LayerMask layerMask;
+ RaycastHit hit;
+ // Update is called once per frame
+ void Update()
+ {
+ cameraTransform = Camera.main.transform;
+ shootRay.origin = cameraTransform.position;
+ shootRay.direction = cameraTransform.forward;
+ Debug.Log("MouseTarget: " + shootRay.origin + " " + shootRay.direction);
+
+ if (Physics.Raycast(shootRay, out hit, 100, layerMask))
+ {
+ transform.position = hit.point;
+ }
+ }
+}
diff --git a/Assets/Scripts/Camera/MouseTarget.cs.meta b/Assets/Scripts/Camera/MouseTarget.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c07e86bcd560f7561c4299a59ee4e75bef4932d6
--- /dev/null
+++ b/Assets/Scripts/Camera/MouseTarget.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f9859a5fec9c8554ea256938aabefcdb
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/manifest.json b/Packages/manifest.json
index cd80b8d1205e1e375799c12a5da7e53e83b699f2..6d198ff2515377bb5ec326eb7a7fe2ed9f3b2ce2 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,5 +1,6 @@
{
"dependencies": {
+ "com.unity.animation.rigging": "1.1.1",
"com.unity.cinemachine": "2.8.9",
"com.unity.collab-proxy": "2.0.1",
"com.unity.feature.development": "1.0.1",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 00704da6552c58dcc8255671a2460ae5abdb381d..3b390b6a90bceab6d969a608ba101d2a0e87b025 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,5 +1,24 @@
{
"dependencies": {
+ "com.unity.animation.rigging": {
+ "version": "1.1.1",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.burst": "1.4.1",
+ "com.unity.test-framework": "1.1.24"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.burst": {
+ "version": "1.6.6",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.mathematics": "1.2.1"
+ },
+ "url": "https://packages.unity.com"
+ },
"com.unity.cinemachine": {
"version": "2.8.9",
"depth": 0,
@@ -78,6 +97,13 @@
},
"url": "https://packages.unity.com"
},
+ "com.unity.mathematics": {
+ "version": "1.2.6",
+ "depth": 2,
+ "source": "registry",
+ "dependencies": {},
+ "url": "https://packages.unity.com"
+ },
"com.unity.performance.profile-analyzer": {
"version": "1.2.2",
"depth": 1,