[email protected]

## [1.1.5] - 2019-07-15 - Fixed scenario where scene unload destroys instantiated objects in different scenes. - Cleaned up SetDirty logic to remove excessive dirtying of assets.
needle-mirror · Jul 14, 2019 · 20bb7ae · 20bb7ae
1 parent c624c36
commit 20bb7ae
Show file tree

Hide file tree

Showing 18 changed files with 163 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.1.5] - 2019-07-15
+ - Fixed scenario where scene unload destroys instantiated objects in different scenes. 
+ - Cleaned up SetDirty logic to remove excessive dirtying of assets.
+
 ## [1.1.4-preview] - 2019-06-19
  - Fixed an issue where Editor only types were being added to the build.
 

diff --git a/Editor/GUI/AddressableAssetSettingsInspector.cs b/Editor/GUI/AddressableAssetSettingsInspector.cs
@@ -175,7 +175,7 @@ public override void OnInspectorGUI()
                             {
                                 var profile = m_AasTarget.profileSettings.profiles[m_CurrentProfileIndex];
                                 profile.profileName = newName;
-                                m_AasTarget.SetDirty(AddressableAssetSettings.ModificationEvent.ProfileModified, profile.id, true);
+                                m_AasTarget.SetDirty(AddressableAssetSettings.ModificationEvent.ProfileModified, profile.id, true, true);
                             }
                         }
                     }

diff --git a/Editor/GUI/AddressableAssetsSettingsGroupTreeView.cs b/Editor/GUI/AddressableAssetsSettingsGroupTreeView.cs
@@ -852,50 +852,57 @@ protected void RemoveGroup(object context)
             if (EditorUtility.DisplayDialog("Delete selected groups?", "Are you sure you want to delete the selected groups?\n\nYou cannot undo this action.", "Yes", "No"))
             {
                 List<AssetEntryTreeViewItem> selectedNodes = context as List<AssetEntryTreeViewItem>;
-                if (selectedNodes == null)
+                if (selectedNodes == null || selectedNodes.Count < 1)
                     return;
                 var groups = new List<AddressableAssetGroup>();
                 foreach (var item in selectedNodes)
                 {
                     m_Editor.settings.RemoveGroupInternal(item.group, true, false);
                     groups.Add(item.group);
                 }
-                m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.GroupRemoved, groups, true);
+                m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.GroupRemoved, groups, true, true);
             }
         }
 
         protected void SimplifyAddresses(object context)
         {
             List<AssetEntryTreeViewItem> selectedNodes = context as List<AssetEntryTreeViewItem>;
-            if (selectedNodes == null)
+            if (selectedNodes == null || selectedNodes.Count < 1)
                 return;
             var entries = new List<AddressableAssetEntry>();
-
+            HashSet<AddressableAssetGroup> modifiedGroups = new HashSet<AddressableAssetGroup>();
             foreach (var item in selectedNodes)
             {
                 item.entry.SetAddress(Path.GetFileNameWithoutExtension(item.entry.address), false);
                 entries.Add(item.entry);
+                modifiedGroups.Add(item.entry.parentGroup);
             }
-            m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved, entries, true);
+            foreach (var g in modifiedGroups)
+                g.SetDirty(AddressableAssetSettings.ModificationEvent.EntryModified, entries, false, true);
+            m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryModified, entries, true, false);
         }
 
         protected void RemoveEntry(object context)
         {
             if (EditorUtility.DisplayDialog("Delete selected entries?", "Are you sure you want to delete the selected entries?\n\nYou cannot undo this action.", "Yes", "No"))
             {
                 List<AssetEntryTreeViewItem> selectedNodes = context as List<AssetEntryTreeViewItem>;
-                if (selectedNodes == null)
+                if (selectedNodes == null || selectedNodes.Count < 1)
                     return;
                 var entries = new List<AddressableAssetEntry>();
+                HashSet<AddressableAssetGroup> modifiedGroups = new HashSet<AddressableAssetGroup>();
                 foreach (var item in selectedNodes)
                 {
                     if (item.entry != null)
                     {
                         m_Editor.settings.RemoveAssetEntry(item.entry.guid, false);
                         entries.Add(item.entry);
+                        modifiedGroups.Add(item.entry.parentGroup);
                     }
                 }
-                m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryRemoved, entries, true);
+                foreach (var g in modifiedGroups)
+                    g.SetDirty(AddressableAssetSettings.ModificationEvent.EntryModified, entries, false, true);
+                m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryRemoved, entries, true, false);
             }
         }
 
@@ -1036,13 +1043,17 @@ protected override DragAndDropVisualMode HandleDragAndDrop(DragAndDropArgs args)
                         if (canMarkNonResources)
                         {
                             var entries = new List<AddressableAssetEntry>();
+                            var modifiedGroups = new HashSet<AddressableAssetGroup>();
                             foreach (var p in nonResourcePaths)
                             {
-                                entries.Add(m_Editor.settings.CreateOrMoveEntry(AssetDatabase.AssetPathToGUID(p), parent, false, false));
+                                var e = m_Editor.settings.CreateOrMoveEntry(AssetDatabase.AssetPathToGUID(p), parent, false, false);
+                                entries.Add(e);
+                                modifiedGroups.Add(e.parentGroup);
                             }
-                            m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved, entries, true);
+                            foreach (var g in modifiedGroups)
+                                g.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved, entries, false, true);
+                            m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved, entries, true, false);
                         }
-
                     }
                 }
             }
@@ -1072,7 +1083,7 @@ protected override DragAndDropVisualMode HandleDragAndDrop(DragAndDropArgs args)
                             else
                                 m_Editor.settings.groups.Insert(args.insertAtIndex, group);
 
-                            m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.GroupMoved, m_Editor.settings.groups, true);
+                            m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.GroupMoved, m_Editor.settings.groups, true, true);
                             Reload();
                         }
                         else
@@ -1092,11 +1103,16 @@ protected override DragAndDropVisualMode HandleDragAndDrop(DragAndDropArgs args)
                                 else
                                 {
                                     var entries = new List<AddressableAssetEntry>();
+                                    var modifiedGroups = new HashSet<AddressableAssetGroup>();
                                     foreach (var node in draggedNodes)
-                                        entries.Add(m_Editor.settings.CreateOrMoveEntry(node.entry.guid, parent, false,
-                                            false));
-                                    m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved,
-                                        entries, true);
+                                    {
+                                        var e = m_Editor.settings.CreateOrMoveEntry(node.entry.guid, parent, false, false);
+                                        entries.Add(e);
+                                        modifiedGroups.Add(e.parentGroup);
+                                    }
+                                    foreach (var g in modifiedGroups)
+                                        g.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved, entries, false, true);
+                                    m_Editor.settings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved, entries, true, false);
                                 }
                             }
                         }

diff --git a/Editor/GUI/AssetInspectorGUI.cs b/Editor/GUI/AssetInspectorGUI.cs
@@ -29,17 +29,21 @@ static void SetAaEntry(AddressableAssetSettings aaSettings, Object[] targets, bo
             //if (create || EditorUtility.DisplayDialog("Remove Addressable Asset Entries", "Do you want to remove Addressable Asset entries for " + targets.Length + " items?", "Yes", "Cancel"))
             {
                 var entriesAdded = new List<AddressableAssetEntry>();
-
+                var modifiedGroups = new HashSet<AddressableAssetGroup>();
                 foreach (var t in targets)
                 {
                     if (AddressableAssetUtility.GetPathAndGUIDFromTarget(t, out path, ref guid))
                     {
                         if (create)
                         {
                             if (AddressableAssetUtility.IsInResources(path))
-                                AddressableAssetUtility.SafeMoveResourcesToGroup(aaSettings, aaSettings.DefaultGroup, new List<string> {path});
+                                AddressableAssetUtility.SafeMoveResourcesToGroup(aaSettings, aaSettings.DefaultGroup, new List<string> { path });
                             else
-                                entriesAdded.Add(aaSettings.CreateOrMoveEntry(guid, aaSettings.DefaultGroup, false, false));
+                            {
+                                var e = aaSettings.CreateOrMoveEntry(guid, aaSettings.DefaultGroup, false, false);
+                                entriesAdded.Add(e);
+                                modifiedGroups.Add(e.parentGroup);
+                            }
                         }
                         else
                             aaSettings.RemoveAssetEntry(guid);
@@ -48,7 +52,9 @@ static void SetAaEntry(AddressableAssetSettings aaSettings, Object[] targets, bo
 
                 if (create)
                 {
-                    aaSettings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved, entriesAdded, true);
+                    foreach (var g in modifiedGroups)
+                        g.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved, entriesAdded, false, true);
+                    aaSettings.SetDirty(AddressableAssetSettings.ModificationEvent.EntryMoved, entriesAdded, true, false);
                 }
             }
         }

diff --git a/Editor/GUI/ContentUpdatePreviewWindow.cs b/Editor/GUI/ContentUpdatePreviewWindow.cs
@@ -10,7 +10,13 @@ namespace UnityEditor.AddressableAssets.GUI
 {
     class ContentUpdatePreviewWindow : EditorWindow
     {
-        internal static bool PrepareForContentUpdate(AddressableAssetSettings settings, string buildPath)
+        /// <summary>
+        /// Opens ContentUpdatePreviewWindow.
+        /// </summary>
+        /// <param name="settings"></param>
+        /// <param name="buildPath"></param>
+        /// <returns>True if successful; false if otherwise (failed to get modified entries).</returns>
+        public static bool PrepareForContentUpdate(AddressableAssetSettings settings, string buildPath)
         {
             var modifiedEntries = ContentUpdateScript.GatherModifiedEntries(settings, buildPath);
             if (modifiedEntries == null)

diff --git a/Editor/HostingServices/HostingServicesManager.cs b/Editor/HostingServices/HostingServicesManager.cs
@@ -233,7 +233,7 @@ public IHostingService AddHostingService(Type serviceType, string name)
             m_Settings.profileSettings.RegisterProfileStringEvaluationFunc(svc.EvaluateProfileString);
 
             m_HostingServiceInfoMap.Add(svc, info);
-            m_Settings.SetDirty(AddressableAssetSettings.ModificationEvent.HostingServicesManagerModified, this, true);
+            m_Settings.SetDirty(AddressableAssetSettings.ModificationEvent.HostingServicesManagerModified, this, true, true);
 
             m_NextInstanceId++;
             return svc;
@@ -252,7 +252,7 @@ public void RemoveHostingService(IHostingService svc)
             svc.StopHostingService();
             m_Settings.profileSettings.UnregisterProfileStringEvaluationFunc(svc.EvaluateProfileString);
             m_HostingServiceInfoMap.Remove(svc);
-            m_Settings.SetDirty(AddressableAssetSettings.ModificationEvent.HostingServicesManagerModified, this, true);
+            m_Settings.SetDirty(AddressableAssetSettings.ModificationEvent.HostingServicesManagerModified, this, true, true);
         }
 
         /// <summary>

diff --git a/Editor/Settings/AddressableAssetBuildSettings.cs b/Editor/Settings/AddressableAssetBuildSettings.cs
@@ -59,7 +59,14 @@ public bool cleanupStreamingAssetsAfterBuilds
         public bool LogResourceManagerExceptions
         {
             get { return m_LogResourceManagerExceptions; }
-            set { m_LogResourceManagerExceptions = value; }
+            set
+            {
+                if (m_LogResourceManagerExceptions != value)
+                {
+                    m_LogResourceManagerExceptions = value;
+                    SetDirty();
+                }
+            }
         }
 
         /// <summary>
@@ -88,7 +95,7 @@ internal void SerializeForHash(BinaryFormatter formatter, Stream stream)
         void SetDirty()
         {
             if (m_Settings != null)
-                m_Settings.SetDirty(AddressableAssetSettings.ModificationEvent.BuildSettingsChanged, this, true);
+                m_Settings.SetDirty(AddressableAssetSettings.ModificationEvent.BuildSettingsChanged, this, true, false);
         }
         internal void OnAfterDeserialize(AddressableAssetSettings settings)
         {

diff --git a/Editor/Settings/AddressableAssetEntry.cs b/Editor/Settings/AddressableAssetEntry.cs
@@ -225,7 +225,7 @@ internal void SerializeForHash(BinaryFormatter formatter, Stream stream)
         internal void SetDirty(AddressableAssetSettings.ModificationEvent e, object o, bool postEvent)
         {
             if (parentGroup != null)
-                parentGroup.SetDirty(e, o, postEvent);
+                parentGroup.SetDirty(e, o, postEvent, true);
         }
 
         /// <summary>

diff --git a/Editor/Settings/AddressableAssetGroup.cs b/Editor/Settings/AddressableAssetGroup.cs
@@ -88,7 +88,7 @@ public virtual string Name
                         //this isn't a valid asset, which means it wasn't persisted, so just set the object name to the desired display name.
                         name = m_GroupName;
                     }
-                    SetDirty(AddressableAssetSettings.ModificationEvent.GroupRenamed, this, true);
+                    SetDirty(AddressableAssetSettings.ModificationEvent.GroupRenamed, this, true, true);
                 }
             }
         }
@@ -132,7 +132,7 @@ public AddressableAssetGroupSchema AddSchema(AddressableAssetGroupSchema schema,
             if (added != null)
             {
                 added.Group = this;
-                SetDirty(AddressableAssetSettings.ModificationEvent.GroupSchemaAdded, this, postEvent);
+                SetDirty(AddressableAssetSettings.ModificationEvent.GroupSchemaAdded, this, postEvent, true);
             }
             return added;
         }
@@ -149,7 +149,7 @@ public AddressableAssetGroupSchema AddSchema(Type type, bool postEvent = true)
             if (added != null)
             {
                 added.Group = this;
-                SetDirty(AddressableAssetSettings.ModificationEvent.GroupSchemaAdded, this, postEvent);
+                SetDirty(AddressableAssetSettings.ModificationEvent.GroupSchemaAdded, this, postEvent, true);
             }
             return added;
         }
@@ -176,7 +176,7 @@ public bool RemoveSchema(Type type, bool postEvent = true)
             if (!m_SchemaSet.RemoveSchema(type))
                 return false;
 
-            SetDirty(AddressableAssetSettings.ModificationEvent.GroupSchemaRemoved, this, postEvent);
+            SetDirty(AddressableAssetSettings.ModificationEvent.GroupSchemaRemoved, this, postEvent, true);
             return true;
         }
 
@@ -229,7 +229,7 @@ public bool HasSchema<TSchema>()
         public void ClearSchemas(bool deleteAssets, bool postEvent = true)
         {
             m_SchemaSet.ClearSchemas(deleteAssets);
-            SetDirty(AddressableAssetSettings.ModificationEvent.GroupRemoved, this, postEvent);
+            SetDirty(AddressableAssetSettings.ModificationEvent.GroupRemoved, this, postEvent, true);
         }
 
         /// <summary>
@@ -409,8 +409,8 @@ internal void DedupeEnteries()
                     removeEntries.Add(e);
                 }
             }
-
-            RemoveAssetEntries(removeEntries);
+            if(removeEntries.Count > 0)
+                RemoveAssetEntries(removeEntries);
         }
 
         internal void Initialize(AddressableAssetSettings settings, string groupName, string guid, bool readOnly)
@@ -440,7 +440,7 @@ internal void AddAssetEntry(AddressableAssetEntry e, bool postEvent = true)
             e.IsSubAsset = false;
             e.parentGroup = this;
             m_EntryMap[e.guid] = e;
-            SetDirty(AddressableAssetSettings.ModificationEvent.EntryAdded, e, postEvent);
+            SetDirty(AddressableAssetSettings.ModificationEvent.EntryAdded, e, postEvent, true);
         }
 
         /// <summary>
@@ -461,13 +461,14 @@ public virtual AddressableAssetEntry GetAssetEntry(string guid)
         /// <param name="modificationEvent">The event type that is changed.</param>
         /// <param name="eventData">The object data that corresponds to the event.</param>
         /// <param name="postEvent">If true, the event is propagated to callbacks.</param>
-        public void SetDirty(AddressableAssetSettings.ModificationEvent modificationEvent, object eventData, bool postEvent)
+        /// <param name="groupModified">If true, the group asset will be marked as dirty.</param>
+        public void SetDirty(AddressableAssetSettings.ModificationEvent modificationEvent, object eventData, bool postEvent, bool groupModified = false)
         {
             if (Settings != null)
             {
-                if (Settings.IsPersisted && this != null)
+                if (groupModified && Settings.IsPersisted && this != null)
                     EditorUtility.SetDirty(this);
-                Settings.SetDirty(modificationEvent, eventData, postEvent);
+                Settings.SetDirty(modificationEvent, eventData, postEvent, false);
             }
         }
 
@@ -480,7 +481,7 @@ public void RemoveAssetEntry(AddressableAssetEntry entry, bool postEvent = true)
         {
             m_EntryMap.Remove(entry.guid);
             entry.parentGroup = null;
-            SetDirty(AddressableAssetSettings.ModificationEvent.EntryRemoved, entry, postEvent);
+            SetDirty(AddressableAssetSettings.ModificationEvent.EntryRemoved, entry, postEvent, true);
         }
 
         internal void RemoveAssetEntries(IEnumerable<AddressableAssetEntry> removeEntries, bool postEvent = true)
@@ -490,8 +491,8 @@ internal void RemoveAssetEntries(IEnumerable<AddressableAssetEntry> removeEntrie
                 m_EntryMap.Remove(entry.guid);
                 entry.parentGroup = null;
             }
-
-            SetDirty(AddressableAssetSettings.ModificationEvent.EntryRemoved, removeEntries.ToArray(), postEvent);
+            if(removeEntries.Count() > 0)
+                SetDirty(AddressableAssetSettings.ModificationEvent.EntryRemoved, removeEntries.ToArray(), postEvent, true);
         }
 
         /// <summary>

diff --git a/Editor/Settings/AddressableAssetGroupSchema.cs b/Editor/Settings/AddressableAssetGroupSchema.cs
@@ -70,7 +70,7 @@ protected void SetDirty(bool postEvent)
                 if (m_Group.Settings != null && m_Group.Settings.IsPersisted)
                     EditorUtility.SetDirty(this);
                 if (m_Group != null)
-                    m_Group.SetDirty(AddressableAssetSettings.ModificationEvent.GroupSchemaModified, this, postEvent);
+                    m_Group.SetDirty(AddressableAssetSettings.ModificationEvent.GroupSchemaModified, this, postEvent, false);
             }
         }
     }

diff --git a/Editor/Settings/AddressableAssetGroupTemplate.cs b/Editor/Settings/AddressableAssetGroupTemplate.cs
@@ -210,7 +210,7 @@ public void SetDirty(AddressableAssetSettings.ModificationEvent modificationEven
             {
                 if (Settings.IsPersisted && this != null)
                     EditorUtility.SetDirty(this);
-                Settings.SetDirty(modificationEvent, eventData, postEvent);
+                Settings.SetDirty(modificationEvent, eventData, postEvent, false);
             }
         }
     }