Merge pull request #82 from CyberAgentGameEntertainment/bugfix/infinite-import-loop

shairo · web-flow · commit 6ddce70ec232 · 2025-09-11T17:36:51.000+09:00
無限インポートループの修正
diff --git a/Assets/SmartAddresser/Editor/Core/Tools/Importer/SmartAddresserAssetPostProcessor.cs b/Assets/SmartAddresser/Editor/Core/Tools/Importer/SmartAddresserAssetPostProcessor.cs
@@ -20,6 +20,7 @@ string[] movedFromAssetPaths
         )
         {
             var addressableSettings = AddressableAssetSettingsDefaultObject.Settings;
+            var beforeHash = addressableSettings.currentHash;
 
             // Check this because AddressableAssetSettingsDefaultObject.Settings may be null at this point when the Library folder is deleted.
             if (addressableSettings == null)
@@ -57,16 +58,19 @@ string[] movedFromAssetPaths
             foreach (var importedAssetPath in importedAssetPaths)
             {
                 var guid = AssetDatabase.AssetPathToGUID(importedAssetPath);
-                applyService.Apply(guid, false, true);
+                applyService.Apply(guid, false, false);
             }
 
             foreach (var movedAssetPath in movedAssetPaths)
             {
                 var guid = AssetDatabase.AssetPathToGUID(movedAssetPath);
-                applyService.Apply(guid, false, true);
+                applyService.Apply(guid, false, false);
             }
 
-            applyService.InvokeBatchModificationEvent();
+            if (beforeHash != addressableSettings.currentHash)
+            {
+                applyService.InvokeBatchModificationEvent();
+            }
         }
 
         private static bool ShouldProcess(

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ string[] movedFromAssetPaths`
`20`	`20`	`)`
`21`	`21`	`{`
`22`	`22`	`var addressableSettings = AddressableAssetSettingsDefaultObject.Settings;`
	`23`	`+ var beforeHash = addressableSettings.currentHash;`
`23`	`24`
`24`	`25`	`// Check this because AddressableAssetSettingsDefaultObject.Settings may be null at this point when the Library folder is deleted.`
`25`	`26`	`if (addressableSettings == null)`
`@@ -57,16 +58,19 @@ string[] movedFromAssetPaths`
`57`	`58`	`foreach (var importedAssetPath in importedAssetPaths)`
`58`	`59`	`{`
`59`	`60`	`var guid = AssetDatabase.AssetPathToGUID(importedAssetPath);`
`60`		`- applyService.Apply(guid, false, true);`
	`61`	`+ applyService.Apply(guid, false, false);`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`foreach (var movedAssetPath in movedAssetPaths)`
`64`	`65`	`{`
`65`	`66`	`var guid = AssetDatabase.AssetPathToGUID(movedAssetPath);`
`66`		`- applyService.Apply(guid, false, true);`
	`67`	`+ applyService.Apply(guid, false, false);`
`67`	`68`	`}`
`68`	`69`
`69`		`- applyService.InvokeBatchModificationEvent();`
	`70`	`+ if (beforeHash != addressableSettings.currentHash)`
	`71`	`+ {`
	`72`	`+ applyService.InvokeBatchModificationEvent();`
	`73`	`+ }`
`70`	`74`	`}`
`71`	`75`
`72`	`76`	`private static bool ShouldProcess(`