diff --git a/Assets/AddressableAssetsData/AssetGroups/models.asset b/Assets/AddressableAssetsData/AssetGroups/models.asset index 4dbcfab019..f7bb3cfaf0 100644 --- a/Assets/AddressableAssetsData/AssetGroups/models.asset +++ b/Assets/AddressableAssetsData/AssetGroups/models.asset @@ -16,193 +16,193 @@ MonoBehaviour: m_GUID: af2f31e34f6644749bdd552abb39cb07 m_SerializeEntries: - m_GUID: 03e5dab5f51374e55904db72229b775e - m_Address: "models/npcs/npc/2014\u65B0\u79CD\u65CF\u9886\u8896/2014\u65B0\u79CD\u65CF\u9886\u8896/2014\u65B0\u79CD\u65CF\u9886\u8896.prefab" + m_Address: "models/npcs/npc/2014\u65B0\u79CD\u65CF\u9886\u8896/2014\u65B0\u79CD\u65CF\u9886\u8896/2014\u65B0\u79CD\u65CF\u9886\u8896.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 04e8f383637dd42a58a6a23c48c64eb5 - m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u8D27\u90CE/2014\u65B0\u624B\u6751\u8D27\u90CE/2014\u65B0\u624B\u6751\u8D27\u90CE.prefab" + m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u8D27\u90CE/2014\u65B0\u624B\u6751\u8D27\u90CE/2014\u65B0\u624B\u6751\u8D27\u90CE.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 09a50785f77bc43369476f9ab93a9b3a - m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u88C1\u7F1D/2014\u65B0\u624B\u6751\u88C1\u7F1D/2014\u65B0\u624B\u6751\u88C1\u7F1D.prefab" + m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u88C1\u7F1D/2014\u65B0\u624B\u6751\u88C1\u7F1D/2014\u65B0\u624B\u6751\u88C1\u7F1D.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 0fb08f2ce83384471ac95b41dc602ace - m_Address: "models/npcs/\u602A\u7269/2014/\u5251\u80CC\u72FC/\u5251\u80CC\u72FC/\u5251\u80CC\u72FC.prefab" + m_Address: "models/npcs/\u602A\u7269/2014/\u5251\u80CC\u72FC/\u5251\u80CC\u72FC/\u5251\u80CC\u72FC.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 12e232ba9bff147e3bc0cc208f8b78a0 - m_Address: "models/npcs/\u602A\u7269/38\u9972\u517B\u517D/\u5154\u5E7C\u5E74/\u5154\u5E7C\u5E74/\u5154\u5E7C\u5E74.prefab" + m_Address: "models/npcs/\u602A\u7269/38\u9972\u517B\u517D/\u5154\u5E7C\u5E74/\u5154\u5E7C\u5E74/\u5154\u5E7C\u5E74.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 19ef711ad91474765a847a631f5da9ca - m_Address: "models/npcs/npc/2014\u65B0\u79CD\u65CF\u5DE7\u5320/2014\u65B0\u79CD\u65CF\u5DE7\u5320/2014\u65B0\u79CD\u65CF\u5DE7\u5320.prefab" + m_Address: "models/npcs/npc/2014\u65B0\u79CD\u65CF\u5DE7\u5320/2014\u65B0\u79CD\u65CF\u5DE7\u5320/2014\u65B0\u79CD\u65CF\u5DE7\u5320.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 28a9794edd04941a6ba1ab1a6e87bbd4 - m_Address: "models/npcs/npc/2011\u5723\u7075\u4F7F\u8005/\u5723\u7075\u4F7F\u8005/\u5723\u7075\u4F7F\u8005.prefab" + m_Address: "models/npcs/npc/2011\u5723\u7075\u4F7F\u8005/\u5723\u7075\u4F7F\u8005/\u5723\u7075\u4F7F\u8005.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 39e34e0b093c74c65a24bcfa1a655c51 - m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u5546\u57CE\u7BA1\u7406\u5458\u84DD\u8272/2014\u65B0\u624B\u6751\u5546\u57CE\u7BA1\u7406\u5458\u84DD\u8272/2014\u65B0\u624B\u6751\u5546\u57CE\u7BA1\u7406\u5458\u84DD\u8272.prefab" + m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u5546\u57CE\u7BA1\u7406\u5458\u84DD\u8272/2014\u65B0\u624B\u6751\u5546\u57CE\u7BA1\u7406\u5458\u84DD\u8272/2014\u65B0\u624B\u6751\u5546\u57CE\u7BA1\u7406\u5458\u84DD\u8272.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 3e3944509a65042eb8a31cfb74a0edf5 - m_Address: "models/\u573A\u666F\u6D3B\u7269/2017\u79FB\u52A8\u6807\u9776\u8725\u8734/2017\u79FB\u52A8\u6807\u9776\u8725\u8734/2017\u79FB\u52A8\u6807\u9776\u8725\u8734.prefab" + m_Address: "models/\u573A\u666F\u6D3B\u7269/2017\u79FB\u52A8\u6807\u9776\u8725\u8734/2017\u79FB\u52A8\u6807\u9776\u8725\u8734/2017\u79FB\u52A8\u6807\u9776\u8725\u8734.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 46453b542df6540ae817c89b1dfff21e - m_Address: "models/npcs/npc/\u7075\u65CF\u5973\u738B/\u7075\u65CF\u5973\u738B/\u7075\u65CF\u5973\u738B.prefab" + m_Address: "models/npcs/npc/\u7075\u65CF\u5973\u738B/\u7075\u65CF\u5973\u738B/\u7075\u65CF\u5973\u738B.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 47002ca46d55c4938b9315f763d1d66c - m_Address: "models/npcs/npc/npc\u4ED9\u5973/npc\u4ED9\u5973/npc\u7FBD\u7075.prefab" + m_Address: "models/npcs/npc/npc\u4ED9\u5973/npc\u4ED9\u5973/npc\u7FBD\u7075.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 4dcc3634bebc24bebb88a7ba3e23753c - m_Address: "models/npcs/npc/2014\u62FF\u6247\u5B50\u7684\u4EBA/2014\u62FF\u6247\u5B50\u7684\u4EBA/2014\u62FF\u6247\u5B50\u7684\u4EBA.prefab" + m_Address: "models/npcs/npc/2014\u62FF\u6247\u5B50\u7684\u4EBA/2014\u62FF\u6247\u5B50\u7684\u4EBA/2014\u62FF\u6247\u5B50\u7684\u4EBA.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 576e84b3fd877477eb7f0a424f30d5df - m_Address: "models/\u573A\u666F\u6D3B\u7269/\u51E4\u7FBD\u9E7F/\u96C4\u6027\u51E4\u7FBD\u9E7F/\u96CC\u6027\u51E4\u7FBD\u9E7F.prefab" + m_Address: "models/\u573A\u666F\u6D3B\u7269/\u51E4\u7FBD\u9E7F/\u96C4\u6027\u51E4\u7FBD\u9E7F/\u96CC\u6027\u51E4\u7FBD\u9E7F.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 5e76cb69b081a4673a5816fd9da89533 - m_Address: "models/\u573A\u666F\u6D3B\u7269/\u4E09\u4E2A\u8774\u8776/\u4E09\u4E2A\u8774\u8776/\u4E09\u4E2A\u8774\u8776.prefab" + m_Address: "models/\u573A\u666F\u6D3B\u7269/\u4E09\u4E2A\u8774\u8776/\u4E09\u4E2A\u8774\u8776/\u4E09\u4E2A\u8774\u8776.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 62555210fd2944f329f43aa25b44d2c4 - m_Address: "models/npcs/npc/2014\u94B1\u5E84\u8001\u677F/2014\u94B1\u5E84\u8001\u677F/2014\u94B1\u5E84\u8001\u677F.prefab" + m_Address: "models/npcs/npc/2014\u94B1\u5E84\u8001\u677F/2014\u94B1\u5E84\u8001\u677F/2014\u94B1\u5E84\u8001\u677F.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 64b5a0083181a4d30911efb9c3059678 - m_Address: "models/npcs/npc/2011\u725B\u9996\u5996\u738B/\u725B\u9996\u5996\u738B/\u725B\u9996\u5996\u738B.prefab" + m_Address: "models/npcs/npc/2011\u725B\u9996\u5996\u738B/\u725B\u9996\u5996\u738B/\u725B\u9996\u5996\u738B.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 6858c050d424a416a9a6aed20d93a150 - m_Address: "models/npcs/\u602A\u7269/18\u72FC/\u7CBE\u7075\u72FC/a\u8EAB\u9AD8/\u7CBE\u7075\u72FC/\u8352\u539F\u7CBE\u7075\u72FC.prefab" + m_Address: "models/npcs/\u602A\u7269/18\u72FC/\u7CBE\u7075\u72FC/a\u8EAB\u9AD8/\u7CBE\u7075\u72FC/\u8352\u539F\u7CBE\u7075\u72FC.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 6be116f35d3d446c7b8d3d61ca617690 - m_Address: "models/npcs/npc/2014npc\u94C1\u5320/2014npc\u94C1\u5320/2014npc\u94C1\u5320.prefab" + m_Address: "models/npcs/npc/2014npc\u94C1\u5320/2014npc\u94C1\u5320/2014npc\u94C1\u5320.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 70f8fa699f9ed4f88b1c335f2ccbb198 - m_Address: "models/npcs/npc/2011\u6C34\u884C\u8005/\u6C34\u884C\u8005/\u6C34\u884C\u8005.prefab" + m_Address: "models/npcs/npc/2011\u6C34\u884C\u8005/\u6C34\u884C\u8005/\u6C34\u884C\u8005.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 7cc56a2fa301a46db92681b17c10d6b0 - m_Address: "models/npcs/npc/2014\u5439\u7B1B\u5B50\u7684\u4EBA\u7EA2\u8272/2014\u5439\u7B1B\u5B50\u7684\u4EBA\u7EA2\u8272/\u5439\u7B1B\u5B50\u7684\u4EBA\u7EA2\u8272\u8774\u8776.prefab" + m_Address: "models/npcs/npc/2014\u5439\u7B1B\u5B50\u7684\u4EBA\u7EA2\u8272/2014\u5439\u7B1B\u5B50\u7684\u4EBA\u7EA2\u8272/\u5439\u7B1B\u5B50\u7684\u4EBA\u7EA2\u8272\u8774\u8776.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 7daa10b47beb04798927c05cc7148951 - m_Address: "models/\u573A\u666F\u6D3B\u7269/\u677E\u9F20/\u7EA2\u8272\u677E\u9F20/\u7EFF\u8272\u677E\u9F20.prefab" + m_Address: "models/\u573A\u666F\u6D3B\u7269/\u677E\u9F20/\u7EA2\u8272\u677E\u9F20/\u7EFF\u8272\u677E\u9F20.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 91928ba4c1a3643b98bfadeb477ec8af - m_Address: "models/\u573A\u666F\u52A8\u753B\u6A21\u578B/\u65B0\u624B\u6751\u80E7\u65CF\u5EFA\u7B51/\u65B0\u624B\u6751\u80E7\u65CF\u5EFA\u7B51.prefab" + m_Address: "models/\u573A\u666F\u52A8\u753B\u6A21\u578B/\u65B0\u624B\u6751\u80E7\u65CF\u5EFA\u7B51/\u65B0\u624B\u6751\u80E7\u65CF\u5EFA\u7B51.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: a32fc20843e62442ab1494d8a8e48794 - m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u4F20\u9001\u5E08/2014\u65B0\u624B\u6751\u4F20\u9001\u5E08/2014\u65B0\u624B\u6751\u4F20\u9001\u5E08.prefab" + m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u4F20\u9001\u5E08/2014\u65B0\u624B\u6751\u4F20\u9001\u5E08/2014\u65B0\u624B\u6751\u4F20\u9001\u5E08.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: a5922b6b6f63f46e7b047300c07948fa - m_Address: "models/npcs/\u602A\u7269/2014/\u5C0F\u661F\u661F/\u5C0F\u661F\u661F/\u5C0F\u661F\u661F.prefab" + m_Address: "models/npcs/\u602A\u7269/2014/\u5C0F\u661F\u661F/\u5C0F\u661F\u661F/\u5C0F\u661F\u661F.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: b058f8968d5aa4a8f9285fa891b7b9ba - m_Address: "models/npcs/npc/\u5973npc14/\u5973npc14/\u5973npc14.prefab" + m_Address: "models/npcs/npc/\u5973npc14/\u5973npc14/\u5973npc14.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: b2aa264cdbd9d4fb18f8df100175f4c3 - m_Address: "models/npcs/npc/\u7537npc21/\u7537npc21/\u7537npc21.prefab" + m_Address: "models/npcs/npc/\u7537npc21/\u7537npc21/\u7537npc21.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: bc0279413de8f43fb899a8761a22f4f3 - m_Address: "models/npcs/npc/2014\u6559\u4E66\u5148\u751F/2014\u6559\u4E66\u5148\u751F/2014\u6559\u4E66\u5148\u751F.prefab" + m_Address: "models/npcs/npc/2014\u6559\u4E66\u5148\u751F/2014\u6559\u4E66\u5148\u751F/2014\u6559\u4E66\u5148\u751F.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: c9c25f71f361f43f1aa0510d4f96312d - m_Address: "models/\u573A\u666F\u6D3B\u7269/\u957F\u7FCE\u8D64\u7FBD\u9E1F/\u957F\u7FCE\u8D64\u7FBD\u9E1F/\u957F\u7FCE\u8D64\u7FBD\u9E1F.prefab" + m_Address: "models/\u573A\u666F\u6D3B\u7269/\u957F\u7FCE\u8D64\u7FBD\u9E1F/\u957F\u7FCE\u8D64\u7FBD\u9E1F/\u957F\u7FCE\u8D64\u7FBD\u9E1F.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: d14e87db729e843a4b31c7b1065ab677 - m_Address: "models/npcs/npc/2014\u90AE\u7BB1/2014\u90AE\u7BB1/2014\u90AE\u7BB1.prefab" + m_Address: "models/npcs/npc/2014\u90AE\u7BB1/2014\u90AE\u7BB1/2014\u90AE\u7BB1.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: d865ad4bc902a4a299da74aaba68e9eb - m_Address: "models/npcs/npc/2014\u836F\u5E08/2014\u836F\u5E08/2014\u836F\u5E08.prefab" + m_Address: "models/npcs/npc/2014\u836F\u5E08/2014\u836F\u5E08/2014\u836F\u5E08.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: ed84be8c5044746ca895fb75aca9bc66 - m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u5BFB\u5B9D\u4E13\u5458/2014\u65B0\u624B\u6751\u5BFB\u5B9D\u4E13\u5458/2014\u65B0\u624B\u6751\u5BFB\u5B9D\u4E13\u5458.prefab" + m_Address: "models/npcs/npc/2014\u65B0\u624B\u6751\u5BFB\u5B9D\u4E13\u5458/2014\u65B0\u624B\u6751\u5BFB\u5B9D\u4E13\u5458/2014\u65B0\u624B\u6751\u5BFB\u5B9D\u4E13\u5458.ecm" m_ReadOnly: 0 m_SerializedLabels: - models FlaggedDuringContentUpdateRestriction: 0 - m_GUID: fd4b330a3588f40a18d44e22798e3ddc - m_Address: "models/npcs/npc/\u9B45\u7075\u9996\u9886/\u9B45\u7075\u9996\u9886/\u9B45\u7075\u9996\u9886.prefab" + m_Address: "models/npcs/npc/\u9B45\u7075\u9996\u9886/\u9B45\u7075\u9996\u9886/\u9B45\u7075\u9996\u9886.ecm" m_ReadOnly: 0 m_SerializedLabels: - models diff --git a/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs b/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs index 6670ab8fe9..64372d9cd9 100644 --- a/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs +++ b/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs @@ -26,6 +26,7 @@ namespace BrewMonster.Scripts if (handle.Status == AsyncOperationStatus.Succeeded) { _isInitialized = true; + BMLogger.Log($"AddressableManager: Initialized"); } else { diff --git a/Assets/PerfectWorld/Scripts/Utils/Editor/AddressableTools.cs b/Assets/PerfectWorld/Scripts/Utils/Editor/AddressableTools.cs index d33da61689..c672d489d5 100644 --- a/Assets/PerfectWorld/Scripts/Utils/Editor/AddressableTools.cs +++ b/Assets/PerfectWorld/Scripts/Utils/Editor/AddressableTools.cs @@ -63,45 +63,56 @@ namespace BrewMonster EditorUtility.DisplayDialog("Get All Asset Name", $"Printed {totalCount} addressable assets to Console.", "OK"); } - [MenuItem("Tools/Addressable/Remove Prefix")] - public static void RemovePrefixFromAddresses() + [MenuItem("Tools/Addressable/Remove Prefix")] + public static void RemovePrefixFromAddresses() + { + AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings; + if (settings == null) { - AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings; - if (settings == null) - { - Debug.LogWarning("Addressable settings not found."); - return; - } + Debug.LogWarning("Addressable settings not found."); + return; + } - int updatedCount = 0; - foreach (var group in settings.groups) + int updatedCount = 0; + foreach (var group in settings.groups) + { + if (group == null) continue; + var entries = group.entries; + if (entries == null) continue; + foreach (var entry in entries) { - if (group == null) continue; - var entries = group.entries; - if (entries == null) continue; - foreach (var entry in entries) + if (entry == null) continue; + var address = entry.address; + if (string.IsNullOrEmpty(address)) continue; + + string newAddress = address; + + // Remove prefix if present + if (newAddress.StartsWith(_modelPathPrefixToRemove)) { - if (entry == null) continue; - var address = entry.address; - if (string.IsNullOrEmpty(address)) continue; - if (address.StartsWith(_modelPathPrefixToRemove)) - { - string newAddress = address.Substring(_modelPathPrefixToRemove.Length); - if (newAddress.StartsWith("/")) newAddress = newAddress.Substring(1); - if (newAddress != address) - { - entry.SetAddress(newAddress); - updatedCount++; - } - } + newAddress = newAddress.Substring(_modelPathPrefixToRemove.Length); + if (newAddress.StartsWith("/")) newAddress = newAddress.Substring(1); + } + + // Change suffix from .prefab to .ecm if applicable + if (newAddress.EndsWith(".prefab")) + { + newAddress = newAddress.Substring(0, newAddress.Length - ".prefab".Length) + ".ecm"; + } + + if (newAddress != address) + { + entry.SetAddress(newAddress); + updatedCount++; } } + } - if (updatedCount > 0) - { - EditorUtility.SetDirty(settings); - AssetDatabase.SaveAssets(); - } + if (updatedCount > 0) + { + EditorUtility.SetDirty(settings); + AssetDatabase.SaveAssets(); + } Debug.Log($"Remove Prefix: Updated {updatedCount} entries."); EditorUtility.DisplayDialog("Remove Prefix", $"Updated {updatedCount} entries.", "OK"); diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 1e8166b799..e14e8ecba1 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -36,7 +36,8 @@ GraphicsSettings: - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} - m_PreloadedShaders: [] + m_PreloadedShaders: + - {fileID: 0} m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2}