Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addressables and Clean up #24

Draft
wants to merge 25 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
312facd
installed addressables package
ddiaz-0 May 26, 2024
e3642ec
configured addressables load from build
ddiaz-0 May 28, 2024
d5d7014
tweaks addressables
ddiaz-0 May 28, 2024
d5ac0bc
example asset spawn script for addressables
ddiaz-0 May 28, 2024
125d5d9
Merge branch 'main' into addressable-assets
ddiaz-0 May 31, 2024
f7be5b3
leftovers from halid merge
ddiaz-0 May 31, 2024
a4692d4
gitignore prep for downloaded/created asset bundles
ddiaz-0 May 31, 2024
9622bad
removed addressables framework, will do it with assetbundle api
ddiaz-0 May 31, 2024
23b73da
include asset bundle dir cause we need the empty folder to be versioned
ddiaz-0 May 31, 2024
1cd5a00
revert last commit
ddiaz-0 May 31, 2024
857cbda
added UserAssets Folder with Example Model (Chair), marked as asset b…
ddiaz-0 May 31, 2024
39b50c6
added streaming assets folder for asset bundle loading
ddiaz-0 May 31, 2024
bfff800
added asset bundle build script for user assets + csharp method for it
ddiaz-0 May 31, 2024
3d7d237
renamed a dev loading test script
ddiaz-0 May 31, 2024
26126cf
multiple asset loading concept
ddiaz-0 May 31, 2024
5e4fcc9
lil cleanup and moving of new obstacles to objects
ddiaz-0 May 31, 2024
551eded
PedController cleanup
ddiaz-0 May 31, 2024
efe592c
moved light out of resources
ddiaz-0 Jun 1, 2024
0a1a735
added Addressables back
ddiaz-0 Jun 11, 2024
be40710
modified concept script for addressables
ddiaz-0 Jun 11, 2024
1792fa7
addressable spawning working?
ddiaz-0 Jun 12, 2024
38dc246
enhanced dev loading script for better understanding
ddiaz-0 Jun 12, 2024
9c0408c
tweaks
ddiaz-0 Jun 12, 2024
c71f733
performance tweaks for asset loading
ddiaz-0 Jun 30, 2024
748a102
more assetbundle examples + basic preview generator script
ddiaz-0 Aug 20, 2024
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
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ crashlytics-build.properties
# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

.vscode/extensions.json
.vscode/launch.json
.vscode/settings.json

# vscode editor settings
.vscode/

.fake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

110 changes: 110 additions & 0 deletions Assets/AddressableAssetsData/AddressableAssetSettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
m_Name: AddressableAssetSettings
m_EditorClassIdentifier:
m_DefaultGroup: bf425411ae16b5fa59ed96c97bdfef94
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 1
m_BundleLocalCatalog: 0
m_CatalogRequestsTimeout: 0
m_DisableCatalogUpdateOnStart: 1
m_IgnoreUnsupportedFilesInBuild: 0
m_UniqueBundleIds: 0
m_NonRecursiveBuilding: 1
m_CCDEnabled: 0
m_maxConcurrentWebRequests: 3
m_ContiguousBundles: 1
m_StripUnityVersionFromBundleBuild: 0
m_DisableVisibleSubAssetRepresentations: 0
m_ShaderBundleNaming: 0
m_ShaderBundleCustomNaming:
m_MonoScriptBundleNaming: 0
m_CheckForContentUpdateRestrictionsOption: 0
m_MonoScriptBundleCustomNaming:
m_RemoteCatalogBuildPath:
m_Id: 0f1e3d4582defc9fd91667c34b0192a2
m_RemoteCatalogLoadPath:
m_Id: 068ae31e2cfbe1765b04be8ec21452a8
m_ContentStateBuildPathProfileVariableName: <default settings path>
m_CustomContentStateBuildPath:
m_ContentStateBuildPath:
m_BuildAddressablesWithPlayerBuild: 1
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
m_GroupAssets:
- {fileID: 11400000, guid: 704822e68551aa04c9ebc3d3ca3d7d6e, type: 2}
- {fileID: 11400000, guid: 9cb46cb30d2cc6e1e9b3e768dc8057ac, type: 2}
- {fileID: 11400000, guid: 5aa7c0b28a06acc6bb8e0e8308e9d26c, type: 2}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1
m_LogResourceManagerExceptions: 1
m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles
m_ProfileSettings:
m_Profiles:
- m_InheritedParent:
m_Id: 9c47ed7040322e8188f4c3f4a92b7cc3
m_ProfileName: Default
m_Values:
- m_Id: 7f1fb48c9f118b1c980435c6bfc710d6
m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
- m_Id: 5ecf25aff8d046bf2ad45cd058e054b6
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Id: cd26d9605ff1e4dd3a7f7caf89ff5b9b
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_Id: 0f1e3d4582defc9fd91667c34b0192a2
m_Value: '[UnityEngine.Application.streamingAssetsPath]/[BuildTarget]'
- m_Id: 068ae31e2cfbe1765b04be8ec21452a8
m_Value: '{UnityEngine.Application.streamingAssetsPath}/[BuildTarget]'
m_ProfileEntryNames:
- m_Id: 7f1fb48c9f118b1c980435c6bfc710d6
m_Name: BuildTarget
m_InlineUsage: 0
- m_Id: 5ecf25aff8d046bf2ad45cd058e054b6
m_Name: Local.BuildPath
m_InlineUsage: 0
- m_Id: cd26d9605ff1e4dd3a7f7caf89ff5b9b
m_Name: Local.LoadPath
m_InlineUsage: 0
- m_Id: 0f1e3d4582defc9fd91667c34b0192a2
m_Name: Remote.BuildPath
m_InlineUsage: 0
- m_Id: 068ae31e2cfbe1765b04be8ec21452a8
m_Name: Remote.LoadPath
m_InlineUsage: 0
m_ProfileVersion: 1
m_LabelTable:
m_LabelNames:
- default
m_SchemaTemplates: []
m_GroupTemplateObjects:
- {fileID: 11400000, guid: 4d40f724f56aad7879bfa2312c6e061b, type: 2}
m_InitializationObjects: []
m_CertificateHandlerType:
m_AssemblyName:
m_ClassName:
m_ActivePlayerDataBuilderIndex: 3
m_DataBuilders:
- {fileID: 11400000, guid: 3fd3b40ff615b6620937fa075add47e1, type: 2}
- {fileID: 11400000, guid: 786acca3d24249bc38d138d8e2b13baa, type: 2}
- {fileID: 11400000, guid: 417902b5ac91081b7977343a3480f2b1, type: 2}
- {fileID: 11400000, guid: c862994e5230e9680abb5c36a7c5b18d, type: 2}
m_ActiveProfileId: 9c47ed7040322e8188f4c3f4a92b7cc3
m_HostingServicesManager:
m_HostingServiceInfos: []
m_Settings: {fileID: 11400000}
m_NextInstanceId: 0
m_RegisteredServiceTypeRefs: []
m_PingTimeoutInMilliseconds: 5000

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3}
m_Name: Packed Assets
m_EditorClassIdentifier:
m_SchemaObjects:
- {fileID: 3670085133040308107}
- {fileID: 1904983004894411297}
m_Description: Pack assets into asset bundles.
m_Settings: {fileID: 11400000, guid: 7672174e4143d7e1fa9a14690cd67eed, type: 2}
--- !u!114 &1904983004894411297
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 0}
m_StaticContent: 0
--- !u!114 &3670085133040308107
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 0}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName:
m_ClassName:
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id:
m_LoadPath:
m_Id:
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName:
m_ClassName:
m_BundleNaming: 0
m_AssetLoadMode: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Built In Data
m_EditorClassIdentifier:
m_GroupName: Built In Data
m_Data:
m_SerializedData: []
m_GUID: b53e2e6975c7b3904ba4b1c4d7cf144e
m_SerializeEntries:
- m_GUID: Resources
m_Address: Resources
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: EditorSceneList
m_Address: EditorSceneList
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 7672174e4143d7e1fa9a14690cd67eed, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 53f2984ba86ab1c59bb77bf6def3572e, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Default Local Group
m_EditorClassIdentifier:
m_GroupName: Default Local Group
m_Data:
m_SerializedData: []
m_GUID: bf425411ae16b5fa59ed96c97bdfef94
m_SerializeEntries: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 7672174e4143d7e1fa9a14690cd67eed, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 433128efcb2167a6aab0c5ea4aca13fb, type: 2}
- {fileID: 11400000, guid: 6eb5ed9f1b95806e694e32c23eb22ebe, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b1487f5d688e4f94f828f879d599dbdc, type: 3}
m_Name: Built In Data_PlayerDataGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 704822e68551aa04c9ebc3d3ca3d7d6e, type: 2}
m_IncludeResourcesFolders: 1
m_IncludeBuildSettingsScenes: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading