add some extra assets FX and SFX

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionButtonActivator.cs.meta

@@ -12,7 +12,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionButtonActivator.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionContent.cs

@@ -27,6 +27,10 @@ public class sharedActionContent : MonoBehaviour
 
     public bool alignMainSharedActionGameObjectToBothCharacters;
 
+    [Space]
+
+    public bool resumeAnyCharacterIfActionFinished;
+
     [Space]
     [Header ("Probability Settings")]
     [Space]

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionContent.cs.meta

@@ -12,7 +12,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionContent.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionSystem.cs

@@ -97,6 +97,9 @@ public class sharedActionSystem : MonoBehaviour
     public playerStatsSystem mainPlayerStatsSystem;
 
 
+    List<sharedActionTemporalInfo> sharedActionTemporalInfoList = new List<sharedActionTemporalInfo> ();
+
+
     sharedActionSystemInfo currentActionInfo;
 
     sharedActionContent currentSharedActionContent;
@@ -120,6 +123,8 @@ public class sharedActionSystem : MonoBehaviour
     bool ignoreExtraSharedActionActive = false;
     bool ignoreAlternativeSharedActionActive = false;
 
+    float lastTimeSharedActionActive = 0;
+
     public void setExternalCharacter (GameObject newCharacter)
     {
         currentExternalCharacter = newCharacter;
@@ -272,6 +277,45 @@ public class sharedActionSystem : MonoBehaviour
                     return;
                 }
 
+                bool checkMinWaitTimeToPlaySharedActionResult = false;
+
+                if (currentActionInfo.checkMinWaitTimeToPlaySharedAction) {
+                    float checkMinWaitTimeToPlaySharedAction = currentActionInfo.minWaitTimeToPlaySharedAction;
+
+                    int sharedActionTemporalIndex = sharedActionTemporalInfoList.FindIndex (s => s.Name.Equals (actionName));
+
+                    if (sharedActionTemporalIndex > -1) {
+                        sharedActionTemporalInfo currentSharedActionTemporalInfo = sharedActionTemporalInfoList [sharedActionTemporalIndex];
+
+                        if (currentSharedActionTemporalInfo.lastTimeActionPlayed < lastTimeSharedActionActive && lastTimeSharedActionActive > 0) {
+                            checkMinWaitTimeToPlaySharedActionResult = true;
+                        } else {
+                            currentSharedActionTemporalInfo.lastTimeActionPlayed = lastTimeSharedActionActive;
+                        }
+                    } else {
+                        sharedActionTemporalInfo newSharedActionTemporalInfo = new sharedActionTemporalInfo ();
+
+                        newSharedActionTemporalInfo.Name = actionName;
+                        newSharedActionTemporalInfo.lastTimeActionPlayed = lastTimeSharedActionActive;
+
+                        sharedActionTemporalInfoList.Add (newSharedActionTemporalInfo);
+                    }
+                }
+
+                if (checkMinWaitTimeToPlaySharedActionResult) {
+                    if (showDebugPrint) {
+                        print ("min wait time to play this action not reached, cancelling " + actionName);
+                    }
+
+                    if (!usingSharedActionZoneResult) {
+                        sharedActionGameObject.SetActive (false);
+                    }
+
+                    checkEventOnSharedActionResult (false, actionName);
+
+                    return;
+                }
+
                 if (!usingSharedActionZoneResult) {
                     bool checkCharacterOrientationResult = true;
 
@@ -337,6 +381,23 @@ public class sharedActionSystem : MonoBehaviour
                 bool canPlaySharedActionResult = true;
 
                 //check distance and angle of characters
+                if (currentSharedActionContent.useMinDistanceToActivateAction) {
+                    float charactersDistance = GKC_Utils.distance (firstCharacter.transform.position, secondCharacter.transform.position);
+
+                    if (charactersDistance > currentSharedActionContent.minDistanceToActivateAction) {
+                        if (showDebugPrint) {
+                            print ("conditions not achieved from distance between characters " + actionName);
+                        }
+
+                        if (!usingSharedActionZoneResult) {
+                            sharedActionGameObject.SetActive (false);
+                        }
+
+                        checkEventOnSharedActionResult (false, actionName);
+
+                        return;
+                    }
+                }
 
                 //check stats on this character
                 if (currentSharedActionContent.checkCharacterStats && !ignoreStatsCheckEnabled) {
@@ -405,7 +466,7 @@ public class sharedActionSystem : MonoBehaviour
 
                 if (currentSharedActionContent.checkWeaponsOnFirstCharacter) {
                     if (currentSharedActionContent.checkWeaponNameOnFirstCharacter) {
-                        canPlaySharedActionResult = 
+                        canPlaySharedActionResult =
                             GKC_Utils.isCharacterUsingMeleeWeapons (firstCharacter, currentSharedActionContent.weaponNameOnFirstCharacter) ||
                             GKC_Utils.isCharacterUsingFireWeapons (firstCharacter, currentSharedActionContent.weaponNameOnFirstCharacter);
 
@@ -422,7 +483,7 @@ public class sharedActionSystem : MonoBehaviour
 
                 if (currentSharedActionContent.checkWeaponsOnSecondCharacter) {
                     if (currentSharedActionContent.checkWeaponNameOnSecondCharacter) {
-                        canPlaySharedActionResult = 
+                        canPlaySharedActionResult =
                             GKC_Utils.isCharacterUsingMeleeWeapons (secondCharacter, currentSharedActionContent.weaponNameOnSecondCharacter) ||
                             GKC_Utils.isCharacterUsingFireWeapons (secondCharacter, currentSharedActionContent.weaponNameOnSecondCharacter);
 
@@ -699,6 +760,8 @@ public class sharedActionSystem : MonoBehaviour
         }
 
         GKC_Utils.disableCurrentAttackInProcess (firstCharacter);
+
+        GKC_Utils.stopMatchPlayerToTargetMovementIfActive (firstCharacter);
     }
 
     void checkStopSecondCharacterActions ()
@@ -712,7 +775,10 @@ public class sharedActionSystem : MonoBehaviour
         }
 
         GKC_Utils.disableCurrentAttackInProcess (secondCharacter);
+
+        GKC_Utils.stopMatchPlayerToTargetMovementIfActive (secondCharacter);
     }
+
     IEnumerator updateSystemCoroutine ()
     {
         sharedActionActive = true;
@@ -858,13 +924,25 @@ public class sharedActionSystem : MonoBehaviour
 
         bool sharedActionsFinished = false;
 
-        float lastTimeSharedActionActive = Time.time;
+        lastTimeSharedActionActive = Time.time;
 
         float sharedActionDuration = (firstCharacterPlayerActionSystem.getCurrentActionDuration () +
             secondCharacterPlayerActionSystem.getCurrentActionDuration ()) / 1.5f;
 
+
+        bool resumeAnyCharacterIfActionFinished = currentSharedActionContent.resumeAnyCharacterIfActionFinished;
+
+        bool firstCharacterResumed = false;
+
+        bool secondCharacterResumed = false;
+
+
         while (!sharedActionsFinished) {
-            if (!firstCharacterPlayerActionSystem.isActionActive () && !secondCharacterPlayerActionSystem.isActionActive ()) {
+            bool firstCharacterIsActionActive = firstCharacterPlayerActionSystem.isActionActive ();
+
+            bool secondCharacterIsActionActive = secondCharacterPlayerActionSystem.isActionActive ();
+
+            if (!firstCharacterIsActionActive && !secondCharacterIsActionActive) {
                 sharedActionsFinished = true;
             }
 
@@ -872,6 +950,26 @@ public class sharedActionSystem : MonoBehaviour
                 sharedActionsFinished = true;
             }
 
+            if (resumeAnyCharacterIfActionFinished) {
+                if (Time.time > 0.2f + lastTimeSharedActionActive) {
+                    if (!firstCharacterIsActionActive) {
+                        if (!firstCharacterResumed) {
+                            currentSharedActionContent.firstCharacterActionSystem.setPlayerActionDeactivate (firstCharacter);
+
+                            firstCharacterResumed = true;
+                        }
+                    }
+
+                    if (!secondCharacterIsActionActive) {
+                        if (!secondCharacterResumed) {
+                            currentSharedActionContent.secondCharacterActionSystem.setPlayerActionDeactivate (secondCharacter);
+
+                            secondCharacterResumed = true;
+                        }
+                    }
+                }
+            }
+
             yield return null;
         }
 
@@ -881,9 +979,13 @@ public class sharedActionSystem : MonoBehaviour
             sharedActionGameObject.SetActive (false);
         }
 
-        currentSharedActionContent.firstCharacterActionSystem.setPlayerActionDeactivate (firstCharacter);
+        if (!firstCharacterResumed) {
+            currentSharedActionContent.firstCharacterActionSystem.setPlayerActionDeactivate (firstCharacter);
+        }
 
-        currentSharedActionContent.secondCharacterActionSystem.setPlayerActionDeactivate (secondCharacter);
+        if (!secondCharacterResumed) {
+            currentSharedActionContent.secondCharacterActionSystem.setPlayerActionDeactivate (secondCharacter);
+        }
 
         stopCheckCharacterStatusCoroutine ();
 
@@ -1337,6 +1439,11 @@ public class sharedActionSystem : MonoBehaviour
 
         public bool setThisCharacterAsFirstCharacter;
 
+        [Space]
+
+        public bool checkMinWaitTimeToPlaySharedAction;
+        public float minWaitTimeToPlaySharedAction;
+
         [Space]
         [Header ("Probability Settings")]
         [Space]
@@ -1344,7 +1451,6 @@ public class sharedActionSystem : MonoBehaviour
         public bool useProbabilityToUseAction;
         [Range (0, 100)] public float probabilityToUseAction;
 
-
         [Space]
         [Header ("Shared Action Zones Settings")]
         [Space]
@@ -1397,4 +1503,11 @@ public class sharedActionSystem : MonoBehaviour
 
         public List<string> randomSharedActionNameList;
     }
+
+    [System.Serializable]
+    public class sharedActionTemporalInfo
+    {
+        public string Name;
+        public float lastTimeActionPlayed;
+    }
 }

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionSystem.cs.meta

@@ -12,7 +12,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionSystem.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionSystemRemoteActivator.cs

@@ -14,6 +14,10 @@ public class sharedActionSystemRemoteActivator : MonoBehaviour
 
     public GameObject characterGameObject;
 
+    [Space]
+
+    public bool setAllSharedActionsActivatorResultAsNotActivated;
+
     [Space]
     [Header ("Target Raycast Detection Settings")]
     [Space]
@@ -285,10 +289,22 @@ public class sharedActionSystemRemoteActivator : MonoBehaviour
             return;
         }
 
+        bool isSharedActionEnabledPreviousValue = false;
+
         mainSharedActionSystem.setExternalCharacter (currentExternalCharacter);
 
+        if (setAllSharedActionsActivatorResultAsNotActivated) {
+            isSharedActionEnabledPreviousValue = mainSharedActionSystem.isSharedActionEnabled ();
+
+            mainSharedActionSystem.setSharedActionEnabledState (false);
+        }
+
         mainSharedActionSystem.activateSharedActionByName (sharedActionName);
 
+        if (setAllSharedActionsActivatorResultAsNotActivated) {
+            mainSharedActionSystem.setSharedActionEnabledState (isSharedActionEnabledPreviousValue);
+        }
+
         if (mainSharedActionSystem.isLastSharedActionFound ()) {
             checkEventOnTargetDetectedResult (true, sharedActionName);
         } else {
@@ -296,6 +312,11 @@ public class sharedActionSystemRemoteActivator : MonoBehaviour
         }
     }
 
+    public void setSetAllSharedActionsActivatorResultAsNotActivatedState (bool state)
+    {
+        setAllSharedActionsActivatorResultAsNotActivated = state;
+    }
+
     public void setRemoteActivatorEnabledState (bool state)
     {
         remoteActivatorEnabled = state;
@@ -307,11 +328,25 @@ public class sharedActionSystemRemoteActivator : MonoBehaviour
         checkSharedActionSystemByExternalDetection (sharedActionName);
     }
 
+    public void setSetAllSharedActionsActivatorResultAsNotActivatedStateFromEditor (bool state)
+    {
+        setSetAllSharedActionsActivatorResultAsNotActivatedState (state);
+
+        updateComponent ();
+    }
+
     public void activateSharedActionByNameFromEditor ()
     {
         activateSharedActionByName ();
     }
 
+    void updateComponent ()
+    {
+        GKC_Utils.updateComponent (this);
+
+        GKC_Utils.updateDirtyScene ("Update Shared Action Remote Activator " + gameObject.name, gameObject);
+    }
+
     [System.Serializable]
     public class remoteSharedActionSystemInfo
     {

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionSystemRemoteActivator.cs.meta

@@ -12,7 +12,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionSystemRemoteActivator.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionZone.cs.meta

@@ -12,7 +12,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionZone.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionZoneManager.cs.meta

@@ -12,7 +12,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionZoneManager.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionZoneTrigger.cs.meta

@@ -12,7 +12,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/Shared Action System/sharedActionZoneTrigger.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/actionSystem.cs

@@ -977,6 +977,9 @@ public class actionSystem : MonoBehaviour
 
         public bool setHealthOnActionEnd;
 
+        public bool useWaitTimeToChangeHealth;
+        public float waitTimeToChangeHealth;
+
         public bool killCharacter;
         public float delayToKillCharacter;
 

Assets/Game Kit Controller/Scripts/Action System/actionSystem.cs.bak.meta

@@ -9,7 +9,8 @@ DefaultImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/actionSystem.cs.bak
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/actionSystem.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/actionSystem.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/activateActionOnCharactersOnScene.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/activateActionOnCharactersOnScene.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/characterActionSystemChecker.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/characterActionSystemChecker.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/customActionSystemTrigger.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/customActionSystemTrigger.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/playerActionSystem.cs

@@ -79,6 +79,10 @@ public class playerActionSystem : MonoBehaviour
 
     public float maxWaitToResumeIfAnimationTakesLongerDuration = 0.8f;
 
+    [Space]
+
+    public float raycastDistance = 2;
+
     [Space]
     [Header ("Events Settings")]
     [Space]
@@ -889,7 +893,9 @@ public class playerActionSystem : MonoBehaviour
 
                 RaycastHit hit;
 
-                if (Physics.Raycast (currentActionInfo.positionToAdjustPlayer.position + Vector3.up, -Vector3.up, out hit, 2, currentActionInfo.layerForRaycast)) {
+                if (Physics.Raycast (currentActionInfo.positionToAdjustPlayer.position + Vector3.up,
+                    -Vector3.up, out hit, raycastDistance, currentActionInfo.layerForRaycast)) {
+
                     currentActionInfo.positionToAdjustPlayer.position = hit.point + 0.01f * Vector3.up;
                 }
             }
@@ -1030,7 +1036,9 @@ public class playerActionSystem : MonoBehaviour
         if (currentActionInfo.useRaycastToAdjustMatchTransform) {
             RaycastHit hit;
 
-            if (Physics.Raycast (currentActionInfo.matchTargetTransform.position + Vector3.up, -Vector3.up, out hit, 2, currentActionInfo.layerForRaycast)) {
+            if (Physics.Raycast (currentActionInfo.matchTargetTransform.position + Vector3.up, -Vector3.up,
+                out hit, raycastDistance, currentActionInfo.layerForRaycast)) {
+
                 currentActionInfo.matchTargetTransform.position = hit.point + 0.05f * Vector3.up;
             }
         }
@@ -1129,7 +1137,7 @@ public class playerActionSystem : MonoBehaviour
 
             if (Mathf.Abs (currentSurfaceHitAngle) > 1) {
 
-                if (Physics.Raycast (targetPosition, -playerTransform.up, out hit, 3, currentActionInfo.movePlayerOnDirectionLayermask)) {
+                if (Physics.Raycast (targetPosition, -playerTransform.up, out hit, raycastDistance + 1, currentActionInfo.movePlayerOnDirectionLayermask)) {
                     currentSurfaceHitAngle = Vector3.SignedAngle (playerTransform.up, hit.normal, playerTransform.right);
                 }
 
@@ -1282,7 +1290,9 @@ public class playerActionSystem : MonoBehaviour
         if (currentActionInfo.useRaycastToAdjustTargetTransform) {
             RaycastHit hit;
 
-            if (Physics.Raycast (currentActionInfo.playerWalkTarget.position + Vector3.up, -Vector3.up, out hit, 2, currentActionInfo.layerForRaycast)) {
+            if (Physics.Raycast (currentActionInfo.playerWalkTarget.position + Vector3.up, -Vector3.up,
+                out hit, raycastDistance, currentActionInfo.layerForRaycast)) {
+
                 currentActionInfo.playerWalkTarget.position = hit.point + 0.05f * Vector3.up;
             }
         }
@@ -1648,14 +1658,16 @@ public class playerActionSystem : MonoBehaviour
                         } else {
                             resumePlayer ();
 
-                            if (currentActionInfo.resetActionIndexAfterComplete) {
-                                currentActionInfoIndex = 0;
+                            if (currentActionInfo != null) {
+                                if (currentActionInfo.resetActionIndexAfterComplete) {
+                                    currentActionInfoIndex = 0;
 
-                                currentActionInfo = currentActionSystem.actionInfoList [currentActionInfoIndex];
+                                    currentActionInfo = currentActionSystem.actionInfoList [currentActionInfoIndex];
 
-                                currentActionName = currentActionInfo.Name;
+                                    currentActionName = currentActionInfo.Name;
 
-                                currentActionSystem.resetCurrentActionInfoIndex ();
+                                    currentActionSystem.resetCurrentActionInfoIndex ();
+                                }
                             }
 
                             checkDestroyAction ();
@@ -1681,8 +1693,6 @@ public class playerActionSystem : MonoBehaviour
                             }
                         }
                     }
-
-                    //					print ("final");
                 }
             }
         }
@@ -3092,18 +3102,42 @@ public class playerActionSystem : MonoBehaviour
             }
 
             if (!currentActionInfo.setHealthOnActionEnd) {
-                if (currentActionInfo.addHealthAmountOnAction) {
-                    mainHealth.addHealth (currentActionInfo.healthAmountToAdd);
-                }
-
-                if (currentActionInfo.removeHealthAmountOnAction) {
+                if (currentActionInfo.useWaitTimeToChangeHealth) {
                     bool isDamageReactionPaused = mainHealth.isDamageReactionPaused ();
 
-                    mainHealth.setDamageReactionPausedState (true);
+                    float healthAmountToChange = 0;
 
-                    mainHealth.takeHealth (currentActionInfo.healthAmountToRemove);
+                    if (currentActionInfo.addHealthAmountOnAction) {
+                        healthAmountToChange = currentActionInfo.healthAmountToAdd;
+                    }
 
-                    mainHealth.setDamageReactionPausedState (isDamageReactionPaused);
+                    if (currentActionInfo.removeHealthAmountOnAction) {
+                        mainHealth.setDamageReactionPausedState (true);
+
+                        healthAmountToChange = Mathf.Abs (currentActionInfo.healthAmountToRemove) * (-1);
+                    }
+
+                    applyDamage.setDamageOrHealthTargetWithDelay (playerTransform.gameObject, currentActionInfo.waitTimeToChangeHealth, healthAmountToChange, -1);
+
+                    if (currentActionInfo.removeHealthAmountOnAction) {
+                        mainHealth.setDamageReactionPausedState (isDamageReactionPaused);
+                    }
+                } else {
+                    if (currentActionInfo.addHealthAmountOnAction) {
+                        mainHealth.addHealth (currentActionInfo.healthAmountToAdd);
+                    }
+
+                    if (currentActionInfo.removeHealthAmountOnAction) {
+                        bool isDamageReactionPaused = mainHealth.isDamageReactionPaused ();
+
+                        mainHealth.setDamageReactionPausedState (true);
+
+                        float healthAmountToChange = Mathf.Abs (currentActionInfo.healthAmountToRemove);
+
+                        mainHealth.takeHealth (healthAmountToChange);
+
+                        mainHealth.setDamageReactionPausedState (isDamageReactionPaused);
+                    }
                 }
             }
 
@@ -3753,7 +3787,9 @@ public class playerActionSystem : MonoBehaviour
 
                 mainHealth.setDamageReactionPausedState (true);
 
-                mainHealth.takeHealth (currentActionInfo.healthAmountToRemove);
+                float healthAmountToChange = Mathf.Abs (currentActionInfo.healthAmountToRemove);
+
+                mainHealth.takeHealth (healthAmountToChange);
 
                 mainHealth.setDamageReactionPausedState (isDamageReactionPaused);
             }

Assets/Game Kit Controller/Scripts/Action System/playerActionSystem.cs.bak.meta

@@ -9,7 +9,8 @@ DefaultImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/playerActionSystem.cs.bak
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Action System/playerActionSystem.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Action System/playerActionSystem.cs
-  uploadId: 814740
+  uploadId: 889948