Skip to content

Commit 9d20175

Browse files
duycaduyca
authored
Merge pull request #1 from WolffunGame/Update-Pool
Update pool
2 parents d447ff7 + ef5aa10 commit 9d20175

File tree

95 files changed

+1414
-792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1414
-792
lines changed

‎Assets/AddressableAssetsData/AddressableAssetSettings.asset‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ MonoBehaviour:
1313
m_Name: AddressableAssetSettings
1414
m_EditorClassIdentifier:
1515
m_DefaultGroup: d9910c93167875b4c99382800fc0d05e
16-
m_CachedHash:
16+
m_currentHash:
1717
serializedVersion: 2
18-
Hash: 00000000000000000000000000000000
18+
Hash: ea828a1e0a97826edfd1bfbc46e81fe7
1919
m_OptimizeCatalogSize: 0
2020
m_BuildRemoteCatalog: 0
2121
m_BundleLocalCatalog: 0
@@ -32,17 +32,22 @@ MonoBehaviour:
3232
m_ShaderBundleNaming: 0
3333
m_ShaderBundleCustomNaming:
3434
m_MonoScriptBundleNaming: 0
35+
m_CheckForContentUpdateRestrictionsOption: 0
3536
m_MonoScriptBundleCustomNaming:
3637
m_RemoteCatalogBuildPath:
3738
m_Id:
3839
m_RemoteCatalogLoadPath:
3940
m_Id:
41+
m_ContentStateBuildPathProfileVariableName:
42+
m_CustomContentStateBuildPath:
4043
m_ContentStateBuildPath:
4144
m_BuildAddressablesWithPlayerBuild: 0
4245
m_overridePlayerVersion:
4346
m_GroupAssets:
4447
- {fileID: 11400000, guid: 85a41e37c6a6c344ba1b70e8e15b138f, type: 2}
4548
- {fileID: 11400000, guid: 4fa3a4f3857831f46b32fd15146ddb84, type: 2}
49+
- {fileID: 11400000, guid: c1bd4023bac138c499ab6bc166a011cc, type: 2}
50+
- {fileID: 11400000, guid: cbaf0f25751d5e943910fa9062905860, type: 2}
4651
m_BuildSettings:
4752
m_CompileScriptsInVirtualMode: 0
4853
m_CleanupStreamingAssetsAfterBuilds: 1
@@ -103,3 +108,4 @@ MonoBehaviour:
103108
m_Settings: {fileID: 11400000}
104109
m_NextInstanceId: 0
105110
m_RegisteredServiceTypeRefs: []
111+
m_PingTimeoutInMilliseconds: 5000

‎Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ MonoBehaviour:
2121
m_Address: Character_P01
2222
m_ReadOnly: 0
2323
m_SerializedLabels: []
24-
- m_GUID: 1c14710c0d49c480497e5be810eb4fc4
25-
m_Address: Character_AddressPool_P01
26-
m_ReadOnly: 0
27-
m_SerializedLabels: []
28-
- m_GUID: 5fa68afe6708644fda728daf092224b3
29-
m_Address: Character_AddressPool_P02
24+
FlaggedDuringContentUpdateRestriction: 0
25+
- m_GUID: d0d1d00d6013742259b0519a178bae7e
26+
m_Address: AddressGameObjectPool_2
3027
m_ReadOnly: 0
3128
m_SerializedLabels: []
29+
FlaggedDuringContentUpdateRestriction: 0
3230
m_ReadOnly: 0
3331
m_Settings: {fileID: 11400000, guid: e0f6fa325fd1a464cbecb4e3b9f30872, type: 2}
3432
m_SchemaSet:

‎Assets/AddressableAssetsData/AssetGroups/G1.asset‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
13+
m_Name: G1
14+
m_EditorClassIdentifier:
15+
m_GroupName: G1
16+
m_Data:
17+
m_SerializedData: []
18+
m_GUID: 786c82b3da1eddf4e98e44418269eaac
19+
m_SerializeEntries:
20+
- m_GUID: 1c14710c0d49c480497e5be810eb4fc4
21+
m_Address: Character_AddressPool_P01
22+
m_ReadOnly: 0
23+
m_SerializedLabels: []
24+
FlaggedDuringContentUpdateRestriction: 0
25+
m_ReadOnly: 0
26+
m_Settings: {fileID: 11400000, guid: e0f6fa325fd1a464cbecb4e3b9f30872, type: 2}
27+
m_SchemaSet:
28+
m_Schemas:
29+
- {fileID: 11400000, guid: 26f22837dd630d04caec7ddac57d0d95, type: 2}
30+
- {fileID: 11400000, guid: 45d7f078b1b138e4d8b352635c93aec1, type: 2}

‎Assets/AddressableAssetsData/AssetGroups/G1.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/AddressableAssetsData/AssetGroups/G2.asset‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
13+
m_Name: G2
14+
m_EditorClassIdentifier:
15+
m_GroupName: G2
16+
m_Data:
17+
m_SerializedData: []
18+
m_GUID: 0c843a54c48305444b92c07cee920462
19+
m_SerializeEntries:
20+
- m_GUID: 5fa68afe6708644fda728daf092224b3
21+
m_Address: Character_AddressPool_P02
22+
m_ReadOnly: 0
23+
m_SerializedLabels: []
24+
FlaggedDuringContentUpdateRestriction: 0
25+
m_ReadOnly: 0
26+
m_Settings: {fileID: 11400000, guid: e0f6fa325fd1a464cbecb4e3b9f30872, type: 2}
27+
m_SchemaSet:
28+
m_Schemas:
29+
- {fileID: 11400000, guid: b6abdbd3cc0a62c4e8bb71d6d16e7306, type: 2}
30+
- {fileID: 11400000, guid: 28bddb69006143b4f8d9adeff7301fa6, type: 2}

‎Assets/AddressableAssetsData/AssetGroups/G2.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/AddressableAssetsData/AssetGroups/Schemas/G1_BundledAssetGroupSchema.asset‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
13+
m_Name: G1_BundledAssetGroupSchema
14+
m_EditorClassIdentifier:
15+
m_Group: {fileID: 11400000, guid: c1bd4023bac138c499ab6bc166a011cc, type: 2}
16+
m_InternalBundleIdMode: 1
17+
m_Compression: 1
18+
m_IncludeAddressInCatalog: 1
19+
m_IncludeGUIDInCatalog: 1
20+
m_IncludeLabelsInCatalog: 1
21+
m_InternalIdNamingMode: 1
22+
m_CacheClearBehavior: 0
23+
m_IncludeInBuild: 1
24+
m_BundledAssetProviderType:
25+
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
26+
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
27+
m_ForceUniqueProvider: 0
28+
m_UseAssetBundleCache: 1
29+
m_UseAssetBundleCrc: 1
30+
m_UseAssetBundleCrcForCachedBundles: 1
31+
m_UseUWRForLocalBundles: 0
32+
m_Timeout: 0
33+
m_ChunkedTransfer: 0
34+
m_RedirectLimit: -1
35+
m_RetryCount: 0
36+
m_BuildPath:
37+
m_Id: 39f5442237a26e346a93004cc38d7bf0
38+
m_LoadPath:
39+
m_Id: 306e70fc82f4d384eb13742f59b5bf59
40+
m_BundleMode: 0
41+
m_AssetBundleProviderType:
42+
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
43+
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
44+
m_BundleNaming: 1
45+
m_AssetLoadMode: 0

‎Assets/AddressableAssetsData/AssetGroups/Schemas/G1_BundledAssetGroupSchema.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/AddressableAssetsData/AssetGroups/Schemas/G1_ContentUpdateGroupSchema.asset‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
13+
m_Name: G1_ContentUpdateGroupSchema
14+
m_EditorClassIdentifier:
15+
m_Group: {fileID: 11400000, guid: c1bd4023bac138c499ab6bc166a011cc, type: 2}
16+
m_StaticContent: 0

‎Assets/AddressableAssetsData/AssetGroups/Schemas/G1_ContentUpdateGroupSchema.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)