Skip to content

Commit 34cf591

Browse files
Russell-Sng-Unity3DRussell-Sng-Unity3D
committed
Added new Hat and Scene options for RC
1 parent 303b304 commit 34cf591

33 files changed

Lines changed: 427 additions & 61 deletions

‎Assets/AddressableAssetsData/AddressableAssetSettings.asset‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ MonoBehaviour:
2424
m_IgnoreUnsupportedFilesInBuild: 0
2525
m_UniqueBundleIds: 0
2626
m_NonRecursiveBuilding: 1
27+
m_CCDEnabled: 1
2728
m_maxConcurrentWebRequests: 500
2829
m_ContiguousBundles: 0
30+
m_StripUnityVersionFromBundleBuild: 0
31+
m_DisableVisibleSubAssetRepresentations: 0
2932
m_ShaderBundleNaming: 0
3033
m_ShaderBundleCustomNaming:
3134
m_MonoScriptBundleNaming: 0
@@ -35,6 +38,7 @@ MonoBehaviour:
3538
m_RemoteCatalogLoadPath:
3639
m_Id:
3740
m_ContentStateBuildPath:
41+
m_BuildAddressablesWithPlayerBuild: 2
3842
m_overridePlayerVersion:
3943
m_GroupAssets:
4044
- {fileID: 11400000, guid: d24f858948dc291438a038da81a078f1, type: 2}
@@ -44,6 +48,7 @@ MonoBehaviour:
4448
- {fileID: 11400000, guid: 19ba1b756f6b5934c8630d510169c7ed, type: 2}
4549
- {fileID: 11400000, guid: c786bd9d6355bfe428406afe3af5aa7a, type: 2}
4650
- {fileID: 11400000, guid: 1df0e3d8f53088f48b7375ffaa8ae6c2, type: 2}
51+
- {fileID: 11400000, guid: 476d29fefb897be489ddf27c20cf9f13, type: 2}
4752
m_BuildSettings:
4853
m_CompileScriptsInVirtualMode: 0
4954
m_CleanupStreamingAssetsAfterBuilds: 1

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,14 @@ MonoBehaviour:
2121
m_Address: LoadingScene
2222
m_ReadOnly: 0
2323
m_SerializedLabels: []
24-
m_MainAsset: {fileID: 0}
25-
m_TargetAsset: {fileID: 0}
2624
- m_GUID: 0394d87db3df9354f8b37fc762233e0d
2725
m_Address: MainMenu
2826
m_ReadOnly: 0
2927
m_SerializedLabels: []
30-
m_MainAsset: {fileID: 0}
31-
m_TargetAsset: {fileID: 0}
3228
- m_GUID: 917ae24daebbd8749bd2e0e6d25e873c
3329
m_Address: Store
3430
m_ReadOnly: 0
3531
m_SerializedLabels: []
36-
m_MainAsset: {fileID: 102900000, guid: 917ae24daebbd8749bd2e0e6d25e873c, type: 3}
37-
m_TargetAsset: {fileID: 102900000, guid: 917ae24daebbd8749bd2e0e6d25e873c, type: 3}
3832
m_ReadOnly: 0
3933
m_Settings: {fileID: 11400000, guid: 661d48ea9271a404cae43a9e2517e23a, type: 2}
4034
m_SchemaSet:

‎Assets/AddressableAssetsData/AssetGroups/Hats.asset‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,26 @@ MonoBehaviour:
2121
m_Address: Hat00
2222
m_ReadOnly: 0
2323
m_SerializedLabels: []
24-
m_MainAsset: {fileID: 0}
25-
m_TargetAsset: {fileID: 0}
2624
- m_GUID: 6e65281e8a345ff4ea1b73f2a1578a6d
2725
m_Address: Hat01
2826
m_ReadOnly: 0
2927
m_SerializedLabels: []
30-
m_MainAsset: {fileID: 0}
31-
m_TargetAsset: {fileID: 0}
3228
- m_GUID: 6c93cb6413eaf5f46bbe190dbbad2651
3329
m_Address: Hat02
3430
m_ReadOnly: 0
3531
m_SerializedLabels: []
36-
m_MainAsset: {fileID: 0}
37-
m_TargetAsset: {fileID: 0}
3832
- m_GUID: 434c1413ad6a76842a3a98e6a21aefa5
3933
m_Address: Hat03
4034
m_ReadOnly: 0
4135
m_SerializedLabels: []
42-
m_MainAsset: {fileID: 6774698051306351897, guid: 434c1413ad6a76842a3a98e6a21aefa5,
43-
type: 3}
44-
m_TargetAsset: {fileID: 6774698051306351897, guid: 434c1413ad6a76842a3a98e6a21aefa5,
45-
type: 3}
36+
- m_GUID: 173ee4c7d80755d47aa3339f970e8ade
37+
m_Address: Hat05
38+
m_ReadOnly: 0
39+
m_SerializedLabels: []
40+
- m_GUID: dc8eb9039a6936749b8aad319953ab89
41+
m_Address: Hat04
42+
m_ReadOnly: 0
43+
m_SerializedLabels: []
4644
m_ReadOnly: 0
4745
m_Settings: {fileID: 11400000, guid: 661d48ea9271a404cae43a9e2517e23a, type: 2}
4846
m_SchemaSet:

‎Assets/AddressableAssetsData/AssetGroups/Level 04.asset‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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: Level 04
14+
m_EditorClassIdentifier:
15+
m_GroupName: Level 04
16+
m_Data:
17+
m_SerializedData: []
18+
m_GUID: 62d6da6befdcbab41981b72a5bfd7828
19+
m_SerializeEntries:
20+
- m_GUID: 03d0fe3f4c117ad4ba958794ccfc3ac6
21+
m_Address: Level_04
22+
m_ReadOnly: 0
23+
m_SerializedLabels: []
24+
m_ReadOnly: 0
25+
m_Settings: {fileID: 11400000, guid: 661d48ea9271a404cae43a9e2517e23a, type: 2}
26+
m_SchemaSet:
27+
m_Schemas:
28+
- {fileID: 11400000, guid: dd4290e05f7deb847ababc77e9ce5dca, type: 2}
29+
- {fileID: 11400000, guid: 70d397709bde2ae43a5c2f8869ce8612, type: 2}

‎Assets/AddressableAssetsData/AssetGroups/Level 04.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/Level 04_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: Level 04_BundledAssetGroupSchema
14+
m_EditorClassIdentifier:
15+
m_Group: {fileID: 11400000, guid: 476d29fefb897be489ddf27c20cf9f13, 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: 0
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: c152bb92211f3854baed928e47c45883
38+
m_LoadPath:
39+
m_Id: cbf5669a55f1c3a4da2e6b95df63fce9
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: 0
45+
m_AssetLoadMode: 0

‎Assets/AddressableAssetsData/AssetGroups/Schemas/Level 04_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/Level 04_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: Level 04_ContentUpdateGroupSchema
14+
m_EditorClassIdentifier:
15+
m_Group: {fileID: 11400000, guid: 476d29fefb897be489ddf27c20cf9f13, type: 2}
16+
m_StaticContent: 0

‎Assets/AddressableAssetsData/AssetGroups/Schemas/Level 04_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.

‎Assets/Editor/RemoteConfig/Data/RemoteConfigDataStoreAsset.asset‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,29 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 469c24fdb3bd6431b92cc1465bd9166b, type: 3}
1313
m_Name: RemoteConfigDataStoreAsset
1414
m_EditorClassIdentifier:
15-
_rsKeyList: "[\r\n {\r\n \"metadata\": {\r\n \"entityId\": \"58c07200-35c2-4634-bf4f-39146dcc02bf\"\r\n
15+
_rsKeyList: "[\r\n {\r\n \"metadata\": {\r\n \"entityId\": \"c16e1c18-a2df-42e6-b384-5746527d54ac\"\r\n
1616
},\r\n \"rs\": {\r\n \"key\": \"ActiveHat\",\r\n \"type\": \"int\",\r\n
17-
\"value\": 2\r\n }\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\":
18-
\"42f0f0fc-9033-4a15-a568-7233f15888a6\"\r\n },\r\n \"rs\": {\r\n
19-
\"key\": \"Language\",\r\n \"type\": \"string\",\r\n \"value\": \"Spanish\"\r\n
20-
}\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\": \"a7634527-3c54-480b-bd70-ec0688fa7b66\"\r\n
17+
\"value\": 5\r\n }\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\":
18+
\"20cee204-9d92-48be-a5ee-3d48999d323f\"\r\n },\r\n \"rs\": {\r\n
19+
\"key\": \"Language\",\r\n \"type\": \"string\",\r\n \"value\": \"French\"\r\n
20+
}\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\": \"6df60ee2-27ea-4d5c-abae-529caeb2230f\"\r\n
2121
},\r\n \"rs\": {\r\n \"key\": \"CharacterSize\",\r\n \"type\": \"float\",\r\n
2222
\"value\": 1.0\r\n }\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\":
23-
\"2266b4e3-a714-4c7c-90cb-98094147a88b\"\r\n },\r\n \"rs\": {\r\n
23+
\"ec2ce514-7fff-4871-90d4-8c0825b077c1\"\r\n },\r\n \"rs\": {\r\n
2424
\"key\": \"CharacterSpeed\",\r\n \"type\": \"float\",\r\n \"value\":
25-
1.0\r\n }\r\n }\r\n]"
26-
_rsLastCachedKeyList: "[\r\n {\r\n \"metadata\": {\r\n \"entityId\": \"58c07200-35c2-4634-bf4f-39146dcc02bf\"\r\n
25+
3.0\r\n }\r\n }\r\n]"
26+
_rsLastCachedKeyList: "[\r\n {\r\n \"metadata\": {\r\n \"entityId\": \"c16e1c18-a2df-42e6-b384-5746527d54ac\"\r\n
2727
},\r\n \"rs\": {\r\n \"key\": \"ActiveHat\",\r\n \"type\": \"int\",\r\n
28-
\"value\": 2\r\n }\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\":
29-
\"42f0f0fc-9033-4a15-a568-7233f15888a6\"\r\n },\r\n \"rs\": {\r\n
30-
\"key\": \"Language\",\r\n \"type\": \"string\",\r\n \"value\": \"Spanish\"\r\n
31-
}\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\": \"a7634527-3c54-480b-bd70-ec0688fa7b66\"\r\n
28+
\"value\": 5\r\n }\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\":
29+
\"20cee204-9d92-48be-a5ee-3d48999d323f\"\r\n },\r\n \"rs\": {\r\n
30+
\"key\": \"Language\",\r\n \"type\": \"string\",\r\n \"value\": \"French\"\r\n
31+
}\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\": \"6df60ee2-27ea-4d5c-abae-529caeb2230f\"\r\n
3232
},\r\n \"rs\": {\r\n \"key\": \"CharacterSize\",\r\n \"type\": \"float\",\r\n
3333
\"value\": 1.0\r\n }\r\n },\r\n {\r\n \"metadata\": {\r\n \"entityId\":
34-
\"2266b4e3-a714-4c7c-90cb-98094147a88b\"\r\n },\r\n \"rs\": {\r\n
34+
\"ec2ce514-7fff-4871-90d4-8c0825b077c1\"\r\n },\r\n \"rs\": {\r\n
3535
\"key\": \"CharacterSpeed\",\r\n \"type\": \"float\",\r\n \"value\":
36-
1.0\r\n }\r\n }\r\n]"
36+
3.0\r\n }\r\n }\r\n]"
3737
_environments: "[\r\n {\r\n \"projectId\": \"6425f585-dcf3-48ce-9486-732852d3a59e\",\r\n
3838
\"name\": \"production\",\r\n \"id\": \"951304dd-2b96-421c-ace2-a944d56b2948\",\r\n
3939
\"isDefault\": true,\r\n \"createdAt\": \"2021-08-12T18:16:15Z\",\r\n \"updatedAt\":
4040
\"2021-08-12T18:16:15Z\"\r\n }\r\n]"
41-
_rulesList: '[]'
42-
_lastCachedRulesList: '[]'

0 commit comments

Comments
 (0)