Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Analyzer/SQLite/Parsers/Models/BuildLayout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ public class ReferenceData
public ReferenceId[] InternalReferencedOtherAssets;
public string[] Labels;
public int MainAssetType;
public int StreamedSize;
public int SerializedSize;
public long StreamedSize;
public long SerializedSize;
public string Name;
public string CRC;

Expand All @@ -107,11 +107,11 @@ public class ReferenceData
public ReferenceId[] BundleDependencies;
public string Compression;
public ReferenceId[] Dependencies;
public int DependencyFileSize;
public long DependencyFileSize;
public ReferenceId[] DependentBundles;
public ReferenceId[] ExpandedDependencies;
public int ExpandedDependencyFileSize;
public int FileSize;
public long ExpandedDependencyFileSize;
public long FileSize;
public ReferenceId[] Files;
public ReferenceId Group;
public object Hash; // Complex object containing Hash and serializedVersion
Expand All @@ -131,9 +131,9 @@ public class ReferenceData
public BundleObjectInfo BundleObjectInfo; // Object with Size property
public ReferenceId[] ExternalReferences;
public int MonoScriptCount;
public int MonoScriptSize;
public long MonoScriptSize;
public ReferenceId[] OtherAssets;
public int PreloadInfoSize;
public long PreloadInfoSize;
public ReferenceId[] SubFiles;
public string WriteResultFilename;

Expand All @@ -148,7 +148,7 @@ public class ReferenceData

// For BuildLayout/SubFile
public bool IsSerializedFile;
public int Size;
public long Size;
}

public class ReferenceType
Expand All @@ -166,7 +166,7 @@ public class AssetHash

public class BundleObjectInfo
{
public int Size;
public long Size;
}

public class AssetObject
Expand All @@ -175,7 +175,7 @@ public class AssetObject
public string ComponentName;
public long LocalIdentifierInFile;
public string ObjectName;
public int SerializedSize;
public long SerializedSize;
public ObjectReference[] References; // Array of object references
public int StreamedSize;
}
Expand Down
6 changes: 6 additions & 0 deletions Analyzer/SQLite/Writers/AddressablesBuildLayoutSQLWriter.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.Data.Sqlite;
using Newtonsoft.Json;
Expand Down Expand Up @@ -245,11 +246,16 @@ private void WriteBuildLayoutBundle(Reference reference, long buildId, SqliteTra
m_AddressablesBuildBundle.SetValue("result_type", reference.data.ResultType);
m_AddressablesBuildBundle.ExecuteNonQuery();

var visited = new Dictionary<string, bool>();
// Insert bundle dependencies
if (reference.data.BundleDependencies != null)
{
foreach (var dep in reference.data.BundleDependencies)
{
var key = $"{buildId}_{reference.rid}_{dep.rid}";
if (visited.ContainsKey(key))
continue;
visited.Add(key, true);
m_AddressablesBuildBundleDependency.SetTransaction(transaction);
m_AddressablesBuildBundleDependency.SetValue("bundle_id", reference.rid);
m_AddressablesBuildBundleDependency.SetValue("build_id", buildId);
Expand Down
8 changes: 4 additions & 4 deletions UnityDataTool/UnityDataTool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>1.3.0</Version>
<AssemblyVersion>1.3.0.0</AssemblyVersion>
<FileVersion>1.3.0.0</FileVersion>
<InformationalVersion>1.3.0</InformationalVersion>
<Version>1.3.1</Version>
<AssemblyVersion>1.3.1.0</AssemblyVersion>
<FileVersion>1.3.1.0</FileVersion>
<InformationalVersion>1.3.1</InformationalVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand Down