Merge pull request #121 from cooloon/cooloon/stop-prefab-inactivation

Restore prefab state after instantiation
hadashiA · Feb 12, 2021 · c72a6be · c72a6be
2 parents 7e7f229 + 8927468
commit c72a6be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Unity/ComponentRegistration.cs b/VContainer/Assets/VContainer/Runtime/Unity/ComponentRegistration.cs
@@ -114,6 +114,7 @@ Component FindComponent(IObjectResolver resolver)
         Component InstantiatePrefab(IObjectResolver resolver)
         {
             var parent = destination.GetParent();
+            var wasActive = destination.Prefab.gameObject.activeSelf;
             if (destination.Prefab.gameObject.activeSelf)
             {
                 destination.Prefab.gameObject.SetActive(false);
@@ -123,6 +124,7 @@ Component InstantiatePrefab(IObjectResolver resolver)
                 ? UnityEngine.Object.Instantiate(destination.Prefab, parent)
                 : UnityEngine.Object.Instantiate(destination.Prefab);
 
+            destination.Prefab.gameObject.SetActive(wasActive);
             injector.Inject(component, resolver, Parameters);
             component.gameObject.SetActive(true);
             return component;

diff --git a/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.cs b/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.cs
@@ -203,12 +203,14 @@ public LifetimeScope CreateChild(Action<IContainerBuilder> installation)
 
         public LifetimeScope CreateChildFromPrefab(LifetimeScope prefab, IInstaller installer = null)
         {
+            var wasActive = prefab.gameObject.activeSelf;
             if (prefab.gameObject.activeSelf && prefab.autoRun)
             {
                 prefab.gameObject.SetActive(false);
             }
 
             var child = Instantiate(prefab, transform, false);
+            prefab.gameObject.SetActive(wasActive);
             if (installer != null)
             {
                 child.extraInstallers.Add(installer);