Merge pull request #6 from AnnulusGames/v0.1.5

V0.1.5
AnnulusGames · Sep 26, 2023 · 0986e2d · 0986e2d
2 parents a1ddb5c + a25fe31
commit 0986e2d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/MagicTween/Assets/MagicTween/Runtime/Core/TweenLinkTrigger.cs b/MagicTween/Assets/MagicTween/Runtime/Core/TweenLinkTrigger.cs
@@ -23,11 +23,11 @@ void OnEnable()
                 {
                     case LinkBehaviour.PlayOnEnable:
                     case LinkBehaviour.PauseOnDisablePlayOnEnable:
-                        tween.Play();
+                        if (tween.IsActive()) tween.Play();
                         break;
                     case LinkBehaviour.RestartOnEnable:
                     case LinkBehaviour.PauseOnDisableRestartOnEnable:
-                        tween.Restart();
+                        if (tween.IsActive()) tween.Restart();
                         break;
                 }
             }
@@ -46,16 +46,16 @@ void OnDisable()
                     case LinkBehaviour.PauseOnDisable:
                     case LinkBehaviour.PauseOnDisablePlayOnEnable:
                     case LinkBehaviour.PauseOnDisableRestartOnEnable:
-                        tween.Pause();
+                        if (tween.IsActive()) tween.Pause();
                         break;
                     case LinkBehaviour.KillOnDisable:
-                        tween.Kill();
+                        if (tween.IsActive()) tween.Kill();
                         break;
                     case LinkBehaviour.CompleteOnDisable:
-                        tween.Complete();
+                        if (tween.IsActive()) tween.Complete();
                         break;
                     case LinkBehaviour.CompleteAndKillOnDisable:
-                        tween.CompleteAndKill();
+                        if (tween.IsActive()) tween.CompleteAndKill();
                         break;
                 }
             }
@@ -69,7 +69,7 @@ void OnDestroy()
             for (int i = 0; i < items.Count; i++)
             {
                 var (tween, linkBehaviour) = items[i];
-                tween.Kill();
+                if (tween.IsActive()) tween.Kill();
             }
         }
 

diff --git a/MagicTween/Assets/MagicTween/Runtime/ECS/TweenTranslationSystemBase.cs b/MagicTween/Assets/MagicTween/Runtime/ECS/TweenTranslationSystemBase.cs
@@ -102,6 +102,7 @@ public void Execute(in ArchetypeChunk chunk, int unfilteredChunkIndex, bool useE
                     var translator = *(commandComponentPtr + i);
                     var targetEntity = translator.TargetEntity;
                     if (!entityLookup.Exists(targetEntity)) continue;
+                    if (!targetComponentLookup.HasComponent(targetEntity)) continue;
 
                     ref var target = ref targetComponentLookup.GetRefRW(targetEntity).ValueRW;
 

diff --git a/MagicTween/Assets/MagicTween/package.json b/MagicTween/Assets/MagicTween/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.annulusgames.magic-tween",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "displayName": "Magic Tween",
   "description": "Extremely fast tween library implemented in Unity ECS",
   "unity": "2022.1",

diff --git a/MagicTween/ProjectSettings/ProjectSettings.asset b/MagicTween/ProjectSettings/ProjectSettings.asset
@@ -133,7 +133,7 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
-  bundleVersion: 0.1.4
+  bundleVersion: 0.1.5
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0