Skip to content

Commit 0e915aa

Browse files
alexandredzialexandredzi
committed
Fixed issue with Background-Image not addressable, reverted dimmed images
1 parent 0c3d47e commit 0e915aa

File tree

68 files changed

+1008
-72
lines changed

Some content is hidden

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

68 files changed

+1008
-72
lines changed

‎Assets/AddressableAssetsData/AddressableAssetSettings.asset‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MonoBehaviour:
1515
m_DefaultGroup: e44b9e080d5ce064aa2fa777858a4f4d
1616
m_currentHash:
1717
serializedVersion: 2
18-
Hash: 26466e120c7b47c0fcfcdd86786b9180
18+
Hash: 56525d59520acb454a65423041453959
1919
m_OptimizeCatalogSize: 0
2020
m_BuildRemoteCatalog: 0
2121
m_CatalogRequestsTimeout: 0
@@ -60,29 +60,37 @@ MonoBehaviour:
6060
m_BuildAddressablesWithPlayerBuild: 0
6161
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
6262
m_GroupAssets:
63+
- {fileID: 11400000, guid: d3e4e2c785073483c86cd9a06692f3c6, type: 2}
64+
- {fileID: 11400000, guid: 8212e995c32ff449e85de4dfe678db4b, type: 2}
65+
- {fileID: 11400000, guid: fdc4e67966ae941b599f8185e4553a13, type: 2}
66+
- {fileID: 11400000, guid: 1d5d364f9b5614dda825698a1a9cacfc, type: 2}
6367
- {fileID: 11400000, guid: 076ecdf1095cf634b9d1ad0e46628cb9, type: 2}
6468
- {fileID: 11400000, guid: 1e8453572c1142e439fefd36fdc32edc, type: 2}
6569
- {fileID: 11400000, guid: 6ed67ed2b9fd82e4ea84b4d172aa92a1, type: 2}
66-
- {fileID: 11400000, guid: 822373f07486e4961ad948a50f72c614, type: 2}
67-
- {fileID: 11400000, guid: 88ac0f98d3c2144109d59527052380dd, type: 2}
68-
- {fileID: 11400000, guid: a66040e7a1f0f492482442d8fe463828, type: 2}
69-
- {fileID: 11400000, guid: 1d5d364f9b5614dda825698a1a9cacfc, type: 2}
70-
- {fileID: 11400000, guid: ef4f88f40627e5f4dbf786b246262c08, type: 2}
70+
- {fileID: 11400000, guid: 0bd5c69caa78b4304a0e8a4d7c0e8899, type: 2}
71+
- {fileID: 11400000, guid: d02e1cb0cd3bc43b3aaec26eba2ba2cf, type: 2}
7172
- {fileID: 11400000, guid: 61a5e655eb50249a58ccac1fd1d57832, type: 2}
73+
- {fileID: 11400000, guid: 632636d5d8f7749f5ae1a36952f924aa, type: 2}
74+
- {fileID: 11400000, guid: ef4f88f40627e5f4dbf786b246262c08, type: 2}
7275
- {fileID: 11400000, guid: 2e6a1ccb6d000534bb7b714e26951e06, type: 2}
73-
- {fileID: 11400000, guid: 5d94c7a0bd4034305bf30b43a02e4291, type: 2}
7476
- {fileID: 11400000, guid: d9d8d49aee1153349a4c13e0c7145ccb, type: 2}
7577
- {fileID: 11400000, guid: f1ce45fc8bef3994cbc2c727f329cafc, type: 2}
78+
- {fileID: 11400000, guid: 5d94c7a0bd4034305bf30b43a02e4291, type: 2}
7679
- {fileID: 11400000, guid: cc2b1da5e78ca6643b743c2e41cde192, type: 2}
80+
- {fileID: 11400000, guid: d0f648b5a1d3347e0ace6b74d037732e, type: 2}
7781
- {fileID: 11400000, guid: e916d8c94acefab45a62ee54e418ec7d, type: 2}
78-
- {fileID: 11400000, guid: a235547bd437e40ba88cfee73fe6afef, type: 2}
7982
- {fileID: 11400000, guid: d086f583b7a0cae428375319aff9253a, type: 2}
8083
- {fileID: 11400000, guid: ae26ffebd88c8b2428add93c4389c8f3, type: 2}
81-
- {fileID: 11400000, guid: 0bd5c69caa78b4304a0e8a4d7c0e8899, type: 2}
84+
- {fileID: 11400000, guid: a66040e7a1f0f492482442d8fe463828, type: 2}
85+
- {fileID: 11400000, guid: 88ac0f98d3c2144109d59527052380dd, type: 2}
8286
- {fileID: 11400000, guid: 4fef78bd155109a48b208e4d8010df17, type: 2}
8387
- {fileID: 11400000, guid: c3c7be9bc48a7134b83d92baf56af267, type: 2}
88+
- {fileID: 11400000, guid: 1c773518c5ef54385a29ab964c7e4b73, type: 2}
89+
- {fileID: 11400000, guid: 822373f07486e4961ad948a50f72c614, type: 2}
90+
- {fileID: 11400000, guid: a235547bd437e40ba88cfee73fe6afef, type: 2}
8491
- {fileID: 11400000, guid: d0f0cb20d7ec1164b95f42151d183027, type: 2}
8592
- {fileID: 11400000, guid: 81731497086aa9b4795b0fb065535a3b, type: 2}
93+
- {fileID: 11400000, guid: de95fc190ea0b44cdb9ae7724f4ef834, type: 2}
8694
m_BuildSettings:
8795
m_LogResourceManagerExceptions: 1
8896
m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles

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

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,47 @@ MonoBehaviour:
1414
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
1515
m_GroupName: Default Local Group
1616
m_GUID: e44b9e080d5ce064aa2fa777858a4f4d
17-
m_SerializeEntries: []
17+
m_SerializeEntries:
18+
- m_GUID: 05c0641c398ac404f84f095c76126bbe
19+
m_Address: Assets/UI/Images/[email protected]
20+
m_ReadOnly: 0
21+
m_SerializedLabels: []
22+
FlaggedDuringContentUpdateRestriction: 0
23+
- m_GUID: 27ec5b3bcd56e46fa8f0c071844e577e
24+
m_Address: Assets/UI/Images/Background-Intro-Eng.png
25+
m_ReadOnly: 0
26+
m_SerializedLabels: []
27+
FlaggedDuringContentUpdateRestriction: 0
28+
- m_GUID: 3697ae0c4beca4d7381ec20cca6e3557
29+
m_Address: Assets/UI/Images/Background-Intro-Ar.png
30+
m_ReadOnly: 0
31+
m_SerializedLabels: []
32+
FlaggedDuringContentUpdateRestriction: 0
33+
- m_GUID: 5c84e66ad6d194d619b566ca01c3d01c
34+
m_Address: Assets/UI/Images/[email protected]
35+
m_ReadOnly: 0
36+
m_SerializedLabels: []
37+
FlaggedDuringContentUpdateRestriction: 0
38+
- m_GUID: 72dcdfe6ffd374b9e8fbe9eae2e99d88
39+
m_Address: Assets/UI/Images/Background-Intro-Es.png
40+
m_ReadOnly: 0
41+
m_SerializedLabels: []
42+
FlaggedDuringContentUpdateRestriction: 0
43+
- m_GUID: 764d8fa759fec4a4fa33b7b2dced6a10
44+
m_Address: Assets/UI/Images/[email protected]
45+
m_ReadOnly: 0
46+
m_SerializedLabels: []
47+
FlaggedDuringContentUpdateRestriction: 0
48+
- m_GUID: afea9e2cbe6a34e92bb592436d89a029
49+
m_Address: Assets/UI/Images/Background-Intro-Ja.png
50+
m_ReadOnly: 0
51+
m_SerializedLabels: []
52+
FlaggedDuringContentUpdateRestriction: 0
53+
- m_GUID: f01952071f470476081f2a3fab0dd4d5
54+
m_Address: Assets/UI/Images/[email protected]
55+
m_ReadOnly: 0
56+
m_SerializedLabels: []
57+
FlaggedDuringContentUpdateRestriction: 0
1858
m_ReadOnly: 0
1959
m_Settings: {fileID: 11400000, guid: 8853dd082fc37f44b87accc772e73c21, type: 2}
2060
m_SchemaSet:

‎Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Arabic (ar).asset‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@ MonoBehaviour:
1414
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
1515
m_GroupName: Localization-Asset-Tables-Arabic (ar)
1616
m_GUID: 99c8733c33be0b24db47cc05db1c7ea8
17-
m_SerializeEntries:
18-
- m_GUID: 66c8fb0d032fd5441a18e333eaaab5e6
19-
m_Address: Game Assets_ar
20-
m_ReadOnly: 1
21-
m_SerializedLabels:
22-
- Locale-ar
23-
FlaggedDuringContentUpdateRestriction: 0
17+
m_SerializeEntries: []
2418
m_ReadOnly: 1
2519
m_Settings: {fileID: 11400000, guid: 8853dd082fc37f44b87accc772e73c21, type: 2}
2620
m_SchemaSet:

‎Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Arabic.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: Localization-Asset-Tables-Arabic
14+
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
15+
m_GroupName: Localization-Asset-Tables-Arabic
16+
m_GUID: d5e7d28d845754693ad8982f66370ace
17+
m_SerializeEntries:
18+
- m_GUID: 66c8fb0d032fd5441a18e333eaaab5e6
19+
m_Address: Game Assets_ar
20+
m_ReadOnly: 1
21+
m_SerializedLabels:
22+
- Locale-ar
23+
FlaggedDuringContentUpdateRestriction: 0
24+
m_ReadOnly: 1
25+
m_Settings: {fileID: 11400000, guid: 8853dd082fc37f44b87accc772e73c21, type: 2}
26+
m_SchemaSet:
27+
m_Schemas:
28+
- {fileID: 11400000, guid: 7c2eaa1ee3a22424faaae27b10c6da97, type: 2}
29+
- {fileID: 11400000, guid: 63697a242aaaf42e48bb55cba64b09de, type: 2}

‎Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Arabic.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/Localization-Asset-Tables-English (en).asset‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@ MonoBehaviour:
1414
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
1515
m_GroupName: Localization-Asset-Tables-English (en)
1616
m_GUID: 7bf11b98d3f590e47a9595eb2083b5e3
17-
m_SerializeEntries:
18-
- m_GUID: c1dbbb091df6d5443ac552ad8960d876
19-
m_Address: Game Assets_en
20-
m_ReadOnly: 1
21-
m_SerializedLabels:
22-
- Locale-en
23-
FlaggedDuringContentUpdateRestriction: 0
17+
m_SerializeEntries: []
2418
m_ReadOnly: 1
2519
m_Settings: {fileID: 11400000, guid: 8853dd082fc37f44b87accc772e73c21, type: 2}
2620
m_SchemaSet:

‎Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-English.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: Localization-Asset-Tables-English
14+
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
15+
m_GroupName: Localization-Asset-Tables-English
16+
m_GUID: 00ebd5c0c5392475694523f82a7c2fea
17+
m_SerializeEntries:
18+
- m_GUID: c1dbbb091df6d5443ac552ad8960d876
19+
m_Address: Game Assets_en
20+
m_ReadOnly: 1
21+
m_SerializedLabels:
22+
- Locale-en
23+
FlaggedDuringContentUpdateRestriction: 0
24+
m_ReadOnly: 1
25+
m_Settings: {fileID: 11400000, guid: 8853dd082fc37f44b87accc772e73c21, type: 2}
26+
m_SchemaSet:
27+
m_Schemas:
28+
- {fileID: 11400000, guid: f410b1430e6d84440998c3714dff8b90, type: 2}
29+
- {fileID: 11400000, guid: 4857e1a032b7a4550b7a9125fbd94fef, type: 2}

‎Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-English.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/Localization-Asset-Tables-Japanese (ja).asset‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@ MonoBehaviour:
1414
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
1515
m_GroupName: Localization-Asset-Tables-Japanese (ja)
1616
m_GUID: 3405ca8850542b44f80d7303213c9cff
17-
m_SerializeEntries:
18-
- m_GUID: 50f014e96ed886b4e87e4ccc558e9e77
19-
m_Address: Game Assets_ja
20-
m_ReadOnly: 1
21-
m_SerializedLabels:
22-
- Locale-ja
23-
FlaggedDuringContentUpdateRestriction: 0
17+
m_SerializeEntries: []
2418
m_ReadOnly: 1
2519
m_Settings: {fileID: 11400000, guid: 8853dd082fc37f44b87accc772e73c21, type: 2}
2620
m_SchemaSet:

‎Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Japanese.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: Localization-Asset-Tables-Japanese
14+
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
15+
m_GroupName: Localization-Asset-Tables-Japanese
16+
m_GUID: 1e92bcbda49f2468383edd3f1fec4090
17+
m_SerializeEntries:
18+
- m_GUID: 50f014e96ed886b4e87e4ccc558e9e77
19+
m_Address: Game Assets_ja
20+
m_ReadOnly: 1
21+
m_SerializedLabels:
22+
- Locale-ja
23+
FlaggedDuringContentUpdateRestriction: 0
24+
m_ReadOnly: 1
25+
m_Settings: {fileID: 11400000, guid: 8853dd082fc37f44b87accc772e73c21, type: 2}
26+
m_SchemaSet:
27+
m_Schemas:
28+
- {fileID: 11400000, guid: 11f2f1c6857444c1bbc0e75a83807589, type: 2}
29+
- {fileID: 11400000, guid: 8a8dd4f1ce1814b5d995dbec00f6c0f3, type: 2}

0 commit comments

Comments
 (0)