From e802cf475c7fe67cda18eafd6db73d98d772c1d8 Mon Sep 17 00:00:00 2001
From: marcin <marcin.ra.nowak@gmail.com>
Date: Sat, 20 Sep 2025 06:29:18 +0200
Subject: [PATCH] bug fix in combo break

---
 .../iOS/addressables_content_state.bin        | Bin 2517 -> 2517 bytes
 ...nvector@MeleeCombat Player PRO2.controller |  15 +++------------
 .../bMeleeAttackControl.cs                    |  17 ++++++++++++-----
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin
index 36b690b1c3cb9cb2a70713f790763304efa98b7b..1531a70f8d9727497640b42537ff13cda64f3dc2 100644
GIT binary patch
delta 59
zcmV-B0L1^*6V(&2kO2WUvylO#1q5$3+{KeP2gd}QZBMw90|<r$Zoox-lZ^;^1a;3L
R#*+&PdIYe{FF=!t2~4f>7M1`2

delta 59
zcmV-B0L1^*6V(&2kO2WSvylO#1qAAhvm}!^2gd|kMs+Zg0|<r$zw<ewlZ^;^1Q7H~
RSCb0~dIU0;Khcwk2~3;V71#g(

diff --git a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller
index 542d51ed9..53eec6cbd 100644
--- a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller	
+++ b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller	
@@ -750,7 +750,6 @@ MonoBehaviour:
   ignoreDefense: 0
   activeRagdoll: 0
   senselessTime: 0
-  blockInputBeforeTime: 0.5
   unlockRotationTime: 0.5
   lerpPositionTowardsTarget: 1
   maxLerpDistance: 3.5
@@ -2726,8 +2725,7 @@ MonoBehaviour:
   ignoreDefense: 0
   activeRagdoll: 0
   senselessTime: 0
-  blockInputBeforeTime: 0.5
-  unlockRotationTime: 0.7
+  unlockRotationTime: 0.5
   lerpPositionTowardsTarget: 1
   maxLerpDistance: 3.5
   positionLerpSpeed: 2
@@ -5203,8 +5201,7 @@ MonoBehaviour:
   ignoreDefense: 0
   activeRagdoll: 0
   senselessTime: 0
-  blockInputBeforeTime: 0.5
-  unlockRotationTime: 0.7
+  unlockRotationTime: 0.5
   lerpPositionTowardsTarget: 1
   maxLerpDistance: 3.5
   positionLerpSpeed: 2
@@ -5724,7 +5721,6 @@ MonoBehaviour:
   ignoreDefense: 0
   activeRagdoll: 0
   senselessTime: 0
-  blockInputBeforeTime: 0.5
   unlockRotationTime: 0.7
   lerpPositionTowardsTarget: 0
   maxLerpDistance: 3.5
@@ -6496,7 +6492,7 @@ AnimatorController:
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
-    m_DefaultBool: 1
+    m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
   - m_Name: HitDirection
     m_Type: 3
@@ -26516,7 +26512,6 @@ MonoBehaviour:
   ignoreDefense: 1
   activeRagdoll: 0
   senselessTime: 0
-  blockInputBeforeTime: 1
   unlockRotationTime: 0.7
   lerpPositionTowardsTarget: 1
   maxLerpDistance: 3.5
@@ -47865,7 +47860,6 @@ MonoBehaviour:
   ignoreDefense: 0
   activeRagdoll: 0
   senselessTime: 0
-  blockInputBeforeTime: 0.5
   unlockRotationTime: 0.7
   lerpPositionTowardsTarget: 0
   maxLerpDistance: 3.5
@@ -48019,7 +48013,6 @@ MonoBehaviour:
   ignoreDefense: 0
   activeRagdoll: 0
   senselessTime: 0
-  blockInputBeforeTime: 0.5
   unlockRotationTime: 0.7
   lerpPositionTowardsTarget: 0
   maxLerpDistance: 3.5
@@ -48421,7 +48414,6 @@ MonoBehaviour:
   ignoreDefense: 1
   activeRagdoll: 0
   senselessTime: 0
-  blockInputBeforeTime: 0.5
   unlockRotationTime: 0.7
   lerpPositionTowardsTarget: 1
   maxLerpDistance: 3.5
@@ -49309,7 +49301,6 @@ MonoBehaviour:
   ignoreDefense: 1
   activeRagdoll: 0
   senselessTime: 0
-  blockInputBeforeTime: 0.5
   unlockRotationTime: 0.7
   lerpPositionTowardsTarget: 1
   maxLerpDistance: 3.5
diff --git a/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs b/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs
index c5e5621e3..c16492e65 100644
--- a/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs
+++ b/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs
@@ -41,9 +41,9 @@ namespace Invector.vMelee
         [Tooltip("Time to keep Ragdoll active if activeRagdoll is true.")]
         public float senselessTime;
 
-        [Header("Attack Flow")]
-        [Tooltip("Normalized time point to start allowing the next attack input.")]
-        public float blockInputBeforeTime = 0.5f;
+        //[Header("Attack Flow")]
+        //[Tooltip("Normalized time point to start allowing the next attack input.")]
+        //public float blockInputBeforeTime = 0.5f;
         
         [Header("Combo & Movement")]
         [Tooltip("Normalized time to unlock rotation, allowing the player to aim the next attack in a combo. Set to 1 to disable.")]
@@ -248,9 +248,10 @@ namespace Invector.vMelee
             BlockAttack(false);
             // --- END MODIFICATION ---
         }
-        
+
         private void ManageComboLogic(float currentNormalizedTime)
         {
+            /*
             if (blockInputBeforeTime > 0f)
             {
                 if (currentNormalizedTime >= blockInputBeforeTime)
@@ -262,7 +263,8 @@ namespace Invector.vMelee
                     BlockAttack(true); // Block input
                 }
             }
-            
+            */
+
             if (!useComboTimingWindow) return;
 
             bool isInsideWindow = currentNormalizedTime >= comboWindowStartTime;
@@ -273,9 +275,14 @@ namespace Invector.vMelee
                 {
                     _comboWindowEffectTriggered = true;
                     TimeController.Instance.SetTimeScaleForRealTimeSec(comboWindowTimeScale, comboWindowDuration, false);
+                    BlockAttack(false);
                     if (debug) Debug.Log($"({damageType}) COMBO WINDOW OPEN. Accepting input.");
                 }
             }
+            else
+            {
+                BlockAttack(true);
+            }
         }
 
         // --- Other methods remain unchanged ---