diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/Equipment.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/Equipment.cs index af1c302e..2dee2835 100644 --- a/Assets/Scripts/Studio/TwinObject/StaticObject/Equipment.cs +++ b/Assets/Scripts/Studio/TwinObject/StaticObject/Equipment.cs @@ -61,7 +61,10 @@ namespace Studio private void OnDisable() { - ManagerHub.instance.Get().onRun -= OnPlayStart; + RunManager runManager = ManagerHub.instance.Get(); + if (runManager == null) + return; + runManager.onRun -= OnPlayStart; if (curType == null) return; StudioService.instance.RemoveTypeIdListener(curType, transform.name); diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/Port.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/Port.cs index b0474f2f..bd065917 100644 --- a/Assets/Scripts/Studio/TwinObject/StaticObject/Port.cs +++ b/Assets/Scripts/Studio/TwinObject/StaticObject/Port.cs @@ -61,9 +61,13 @@ namespace Studio private void OnDisable() { - ManagerHub.instance.Get().onRun -= OnPlayStart; + RunManager runManager = ManagerHub.instance.Get(); + if(runManager == null) + return; + runManager.onRun -= OnPlayStart; if (curType == null) return; + if(StudioService.instance != null) StudioService.instance.RemoveTypeIdListener(curType, transform.name); } } diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/Stacker.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/Stacker.cs index 412e0ae6..40bc5806 100644 --- a/Assets/Scripts/Studio/TwinObject/StaticObject/Stacker.cs +++ b/Assets/Scripts/Studio/TwinObject/StaticObject/Stacker.cs @@ -60,7 +60,10 @@ namespace Studio private void OnDisable() { - ManagerHub.instance.Get().onRun -= OnPlayStart; + RunManager runManager = ManagerHub.instance.Get(); + if (runManager == null) + return; + runManager.onRun -= OnPlayStart; if (curType == null) return; StudioService.instance.RemoveTypeIdListener(curType, transform.name); diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs index 567ba7c2..085a6969 100644 --- a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs +++ b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs @@ -173,7 +173,10 @@ namespace Studio.Staic.STKC private void OnDestroy() { isAnimation = false; - ManagerHub.instance.Get().onRun -= OnPlayStart; + RunManager runManager = ManagerHub.instance.Get(); + if (runManager == null) + return; + runManager.onRun -= OnPlayStart; if (curType == null) return; StudioService.instance.RemoveTypeIdListener(curType, transform.name);