diff --git a/Assets/Animation/Weapons/Bow.anim b/Assets/Animation/Weapons/Bow.anim
new file mode 100644
index 0000000000000000000000000000000000000000..0e6f43bff3bb71bdcde10cd23dbe8ed782904dd0
--- /dev/null
+++ b/Assets/Animation/Weapons/Bow.anim
@@ -0,0 +1,205 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Bow
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 1, y: 1, z: 1}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.083333336
+ value: {x: 0.907985, y: 1.5520902, z: 1}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.16666667
+ value: {x: 0.907985, y: 1.5520902, z: 1}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: default
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 3814588639
+ attribute: 3
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.16666667
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: 0.907985
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 0.907985
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.x
+ path: default
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: 1.5520902
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 1.5520902
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.y
+ path: default
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.z
+ path: default
+ classID: 4
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Animation/Weapons/Bow.anim.meta b/Assets/Animation/Weapons/Bow.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2d44e5639a3053aa2985b814d2d6064af60f4d22
--- /dev/null
+++ b/Assets/Animation/Weapons/Bow.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dd5e6d17715514f418f9e027d11d0bb5
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animation/Weapons/Bow.controller b/Assets/Animation/Weapons/Bow.controller
new file mode 100644
index 0000000000000000000000000000000000000000..ac08f0e34aed5d67a66f4b9667ff48822c5d66f0
--- /dev/null
+++ b/Assets/Animation/Weapons/Bow.controller
@@ -0,0 +1,101 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-394934983041626736
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Bow
+ 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: 7400000, guid: dd5e6d17715514f418f9e027d11d0bb5, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Bow
+ serializedVersion: 5
+ m_AnimatorParameters: []
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: 1766146710661839604}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1107 &1766146710661839604
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: -394934983041626736}
+ m_Position: {x: 350, y: 60, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 6334705840267997089}
+ m_Position: {x: 347, y: 222, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 6334705840267997089}
+--- !u!1102 &6334705840267997089
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Idle
+ 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: 0}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Animation/Weapons/Bow.controller.meta b/Assets/Animation/Weapons/Bow.controller.meta
new file mode 100644
index 0000000000000000000000000000000000000000..77e147a83b709e9a521147611d907164d22bcdc9
--- /dev/null
+++ b/Assets/Animation/Weapons/Bow.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa2bcab523481a54591b0434cb85fd8a
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Quest.unity b/Assets/Scenes/Quest.unity
index 42f448311b33d5969ae7f1302bb4aedc42db6d76..b3694662dddd939b1256168fa07f62e8a20f310c 100644
--- a/Assets/Scenes/Quest.unity
+++ b/Assets/Scenes/Quest.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.45061505, g: 0.498609, b: 0.56437516, a: 1}
+ m_IndirectSpecularColor: {r: 0.45061475, g: 0.4986083, b: 0.56437457, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -9865,10 +9865,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
petIdx: -1
currency: 0
- cheatOneHitKill: 0
cantShoot: 0
+ cheatOneHitKill: 0
fullHPPet: 0
killPet: 0
+ motherLoadOn: 0
--- !u!4 &1088314968
Transform:
m_ObjectHideFlags: 0
@@ -10444,7 +10445,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fbf16b89f33d9ee4794f27a1454ee5a5, type: 3}
m_Name:
m_EditorClassIdentifier:
- playerHealth: {fileID: 0}
spawnTime: 5
factory: {fileID: 1353045528}
--- !u!114 &1353045528
@@ -11538,6 +11538,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
playerHealth: {fileID: 1902478037}
spawnTime: 3
+ spawnStart: 0
factory: {fileID: 1714906176}
--- !u!4 &1714906175
Transform:
@@ -12640,6 +12641,26 @@ MonoBehaviour:
maxCharge: 3
colorMax: {r: 0, g: 1, b: 0, a: 1}
colorMin: {r: 1, g: 0, b: 0, a: 1}
+--- !u!95 &2056559648
+Animator:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2056559645}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: aa2bcab523481a54591b0434cb85fd8a, 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_KeepAnimatorControllerStateOnDisable: 0
--- !u!4 &2079963337 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3766448033198164798, guid: 80e55f4de317be346be8e7fe0b4694a7, type: 3}
diff --git a/Assets/Scripts/Player/PlayerShotGunning.cs b/Assets/Scripts/Player/PlayerShotGunning.cs
index ef02c547ccf22e0b873a552546a662e6ce860fdf..a90f301caeeabd8f26499f839c3fb365dba0b0d1 100644
--- a/Assets/Scripts/Player/PlayerShotGunning.cs
+++ b/Assets/Scripts/Player/PlayerShotGunning.cs
@@ -4,11 +4,8 @@ using UnityEngine;
public class PlayerShotGunning : MonoBehaviour, WeaponHandler
{
- [SerializeField]
- private float damagePerShot = 30f;
- [SerializeField]
- private float timeBetweenBullets = 1f;
- [SerializeField]
+ private float damagePerShot = 50f;
+ private float timeBetweenBullets = 0.8f;
private float range = 100f;
public GameObject prefabEffect;
diff --git a/Assets/Scripts/Player/PlayerWeapons.cs b/Assets/Scripts/Player/PlayerWeapons.cs
index 797e2064ce292422aff25b54a195a121a059c358..3d48abb5e0190b7cb8f241e446a6eef2b221f26e 100644
--- a/Assets/Scripts/Player/PlayerWeapons.cs
+++ b/Assets/Scripts/Player/PlayerWeapons.cs
@@ -53,12 +53,12 @@ public class PlayerWeapons : MonoBehaviour
}
}
- if (Input.GetAxisRaw("Mouse ScrollWheel") > 0f)
+ if (Input.GetAxisRaw("Mouse ScrollWheel") < 0f)
{
IncrementIdxWeapon();
SelectWeapon(idxWeapon);
}
- else if (Input.GetAxisRaw("Mouse ScrollWheel") < 0f)
+ else if (Input.GetAxisRaw("Mouse ScrollWheel") > 0f)
{
DecrementIdxWeapon();
SelectWeapon(idxWeapon);
diff --git a/Assets/Scripts/Player/Weapons/PlayerBow.cs b/Assets/Scripts/Player/Weapons/PlayerBow.cs
index d6e6d056908eb5940732f515a46453033635daff..02f0a881ecb689dd99c42d84dc198b05de81f70f 100644
--- a/Assets/Scripts/Player/Weapons/PlayerBow.cs
+++ b/Assets/Scripts/Player/Weapons/PlayerBow.cs
@@ -39,11 +39,14 @@ public class PlayerBow : MonoBehaviour, WeaponHandler
}
}
+ private Animator animator;
+
void Awake()
{
ResetCharge();
chargeSlider.gameObject.SetActive(true);
curArrow = Instantiate(playerArrowPrefab, arrowSpawnPoint);
+ animator = GetComponent<Animator>();
}
private void OnEnable()
@@ -103,9 +106,17 @@ public class PlayerBow : MonoBehaviour, WeaponHandler
{
var force = arrowSpawnPoint.TransformDirection(-200 * energy * level * Vector3.forward);
curArrow.Shoot(force);
+ StartCoroutine(ShootAnim());
curArrow = Instantiate(playerArrowPrefab, arrowSpawnPoint);
}
+ IEnumerator ShootAnim()
+ {
+ this.animator.Play("Bow");
+ yield return new WaitForSeconds(1f / 6);
+ this.animator.Play("Idle");
+ }
+
public bool IsReady()
{
return (!isReload && curArrow != null);