Update

2026-05-30 09:16:35 +07:00
parent 2f87ce19a7
commit 1c0ee6efb7
4001 changed files with 3363438 additions and 1738 deletions
--- a/Assets/Invector-3rdPersonController/Shooter/Scripts/Weapon/vDrawHideShooterWeapons.cs
+++ b/Assets/Invector-3rdPersonController/Shooter/Scripts/Weapon/vDrawHideShooterWeapons.cs
@@ -0,0 +1,114 @@
+using UnityEngine;
+
+namespace Invector.vShooter
+{
+    using vCharacterController;
+
+    [vClassHeader("Draw/Hide Shooter Melee Weapons", "This component works with vItemManager, vWeaponHolderManager and vShooterMeleeInput", useHelpBox = true)]
+    public class vDrawHideShooterWeapons : vDrawHideMeleeWeapons
+    {
+        public virtual vShooterMeleeInput shooter { get; set; }
+        [vEditorToolbar("Shooter")]
+        [Header("Draw Immediate Conditions")]
+        public bool shoot;
+        public bool aim = true;
+        public bool hipFire = true;
+
+        protected override void Start()
+        {
+            base.Start();
+            shooter = GetComponent<vShooterMeleeInput>();
+        }
+
+        protected override bool CanHideWeapons()
+        {
+            return (shooter && shooter.shooterManager && shooter.shooterManager.CurrentWeapon && (forceHide || (!shooter.IsAiming && !shooter.isReloading)))
+                    || (base.CanHideWeapons() && (forceHide || (!shooter.IsAiming && !shooter.isReloading)));
+        }
+
+        protected override bool CanDrawWeapons()
+        {
+            return (!forceHide && shooter && shooter.shooterManager && shooter.shooterManager.CurrentWeapon && !shooter.shooterManager.CurrentWeapon.gameObject.activeInHierarchy) || base.CanDrawWeapons();
+        }
+
+        protected override GameObject RightWeaponObject(bool checkIsActve = false)
+        {
+            if (shooter && shooter.shooterManager && shooter.shooterManager.rWeapon && (!checkIsActve || shooter.shooterManager.rWeapon.gameObject.activeInHierarchy))
+            {
+                return shooter.shooterManager.rWeapon.gameObject;
+            }
+
+            return base.RightWeaponObject(checkIsActve);
+        }
+
+        protected override GameObject LeftWeaponObject(bool checkIsActve = false)
+        {
+            if (shooter && shooter.shooterManager && shooter.shooterManager.lWeapon && (!checkIsActve || shooter.shooterManager.lWeapon.gameObject.activeInHierarchy))
+            {
+                return shooter.shooterManager.lWeapon.gameObject;
+            }
+
+            return base.LeftWeaponObject(checkIsActve);
+        }
+
+        protected override void DrawRightWeapon(bool immediate = false)
+        {
+            base.DrawRightWeapon(immediate);
+        }
+
+        protected override bool DrawWeaponsImmediateConditions()
+        {
+            if (shooter && shooter.shooterManager && shooter.shooterManager.CurrentWeapon)
+            {
+                return DrawShooterWeaponImmediateConditions();
+            }
+            else
+            {
+                return base.DrawWeaponsImmediateConditions();
+            }
+        }
+
+        protected virtual bool DrawShooterWeaponImmediateConditions()
+        {
+            if (!shooter || !shooter.shooterManager || shooter.cc.customAction || !shooter.shooterManager.CurrentWeapon || shooter.lockInput)
+            {
+                return false;
+            }
+
+            if (shooter.CurrentActiveWeapon == null && ((shooter.aimInput.GetButtonDown() && aim) ||
+                (shooter.shooterManager.hipfireShot && shooter.shotInput.GetButtonDown() && hipFire) || (shooter.shotInput.GetButtonDown() && shoot)))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        protected override void HandleInput()
+        {
+            base.HandleInput();
+            // HandleShooterInput();
+        }
+
+        //protected virtual void HandleShooterInput()
+        //{
+        //    if (!shooter.cc.IsAnimatorTag("IsThrowing") && shooter && shooter.shooterManager && !shooter.cc.customAction &&
+        //        shooter.shooterManager.CurrentWeapon && shooter.CurrentActiveWeapon == null && !shooter._isAiming &&
+        //        !shooter.shooterManager.hipfireShot && !shooter.lockInput && shooter.shotInput.GetButtonDown())
+        //    {
+        //        if (!IsEquipping)
+        //        {
+        //            if (CanHideRightWeapon() || CanHideLeftWeapon())
+        //            {
+        //                HideWeapons();
+        //            }
+        //            //else if (CanDrawRightWeapon() || CanDrawLeftWeapon())
+        //            //{
+        //            //    DrawWeapons();
+        //            //}
+
+        //        }
+        //    }
+        //}
+    }
+}