decentraland · aixaCode · Apr 24, 2024 · Apr 24, 2024 · Apr 24, 2024 · Apr 24, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,7 +12,7 @@ references:
       at: *working_directory
 
   .unity_linux_image: &unity_linux_image
-    - image: unityci/editor:ubuntu-2022.3.6f1-linux-il2cpp-2.0.0
+    - image: unityci/editor:ubuntu-2022.3.25f1-webgl-3.0.1
       environment:
         DCL_OUTPUT_NAME: linux
         PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -23,7 +23,7 @@ references:
         #                                                ~~~~~~~~~~~~~~~~~~~~ <- folder name
 
   .unity_mac_image: &unity_mac_image
-    - image: unityci/editor:ubuntu-2022.3.6f1-mac-mono-2.0.0
+    - image: unityci/editor:ubuntu-2022.3.25f1-mac-mono-3.0.1
       environment:
         DCL_OUTPUT_NAME: mac
         PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -34,7 +34,7 @@ references:
         #                                                ~~~~~~~~~~~~~~~~~~ <- folder name
 
   .unity_windows_image: &unity_windows_image
-    - image: unityci/editor:ubuntu-2022.3.6f1-windows-mono-2.0.0
+    - image: unityci/editor:ubuntu-2022.3.25f1-windows-mono-3.0.1
       environment:
         DCL_OUTPUT_NAME: windows
         PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -45,7 +45,7 @@ references:
         #                                                ~~~~~~~~~~~~~~~~~~~~~~ <- folder name
 
   .unity_webgl_image: &unity_webgl_image
-    - image: unityci/editor:2022.3.6f1-webgl-2.0.0
+    - image: unityci/editor:2022.3.25f1-webgl-3.0.1
       environment:
         DCL_OUTPUT_NAME: webgl
         PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -116,13 +116,13 @@ commands:
             echo $DCL_OUTPUT_NAME > /tmp/target
       - restore_cache: &RESTORE_BUILD_CACHE
           keys:
-            - build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}-2022.3.6f1
-            - build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-dev-2022.3.6f1
+            - build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}-2022.3.25f1
+            - build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-dev-2022.3.25f1
       - restore_cache: &RESTORE_LIBRARY_CACHE
           name: Restore library if exists
           keys:
-            - library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}-2022.3.6f1
-            - library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-dev-2022.3.6f1
+            - library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}-2022.3.25f1
+            - library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-dev-2022.3.25f1
       - run:
           name: Build Unity Project
           no_output_timeout: 45m
@@ -141,11 +141,11 @@ commands:
 
       - save_cache: &SAVE_BUILD_CACHE
           name: Store build cache
-          key: build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}-2022.3.6f1
+          key: build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}-2022.3.25f1
           paths: *CACHED_PATHS
       - save_cache: &SAVE_LIBRARY_CACHE
           name: Store library
-          key: library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}-2022.3.6f1
+          key: library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}-2022.3.25f1
           paths:
             - ./unity-renderer/Library
       - run:

diff --git a/browser-interface/scripts/copyBuiltFiles.ts b/browser-interface/scripts/copyBuiltFiles.ts
@@ -50,4 +50,3 @@ main().catch((err) => {
     console.error(err)
     process.exit(1)
 })
-
diff --git a/browser-interface/scripts/utils.ts b/browser-interface/scripts/utils.ts
@@ -41,7 +41,6 @@ export function ensureEqualFiles(first: string, second: string) {
     if (contentsFirst[i] !== contentsSecond[i])
       throw new Error(`Files ${first} and ${second} are different, on line ${line}, char ${i}`)
   }
-
   return true
 }
 

diff --git a/browser-interface/static/unity.loader.js b/browser-interface/static/unity.loader.js
@@ -17,7 +17,8 @@
         "GUID:59748378707bc664aa6cebca2ebf461b",
         "GUID:4bd423f6dceb67540b5c246ca8cf789b",
         "GUID:3c7b57a14671040bd8c549056adc04f5",
-        "GUID:9cccce9925d3495d8a5e4fa5b25f54a5"
+        "GUID:9cccce9925d3495d8a5e4fa5b25f54a5",
+        "GUID:3b80b0b562b1cbc489513f09fc1b8f69"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

@@ -20,7 +20,8 @@
         "GUID:ac62e852826a4b36aeb22931dad73edb",
         "GUID:80f579cff5cf4136aa8969bf6fa1098c",
         "GUID:dfe945c84f5740b79615bed3c57f6118",
-        "GUID:7eb48a6a47db4795bdee44a726fa8338"
+        "GUID:7eb48a6a47db4795bdee44a726fa8338",
+        "GUID:1dd0780aa6be12b428c8005d0bee46b8"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

@@ -18,7 +18,8 @@
         "GUID:ac62e852826a4b36aeb22931dad73edb",
         "GUID:1e10040ab6604cbe8ad0921047d49e65",
         "GUID:37d2c04574c1d480d8c817e2a7c578e7",
-        "GUID:7eb48a6a47db4795bdee44a726fa8338"
+        "GUID:7eb48a6a47db4795bdee44a726fa8338",
+        "GUID:1dd0780aa6be12b428c8005d0bee46b8"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/...enderer/Assets/DCLServices/ScreencaptureCamera/UI/Textures/InWorldCameraAtlas.spriteatlas b/...enderer/Assets/DCLServices/ScreencaptureCamera/UI/Textures/InWorldCameraAtlas.spriteatlas
@@ -36,6 +36,12 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
+    packedSpriteRenderDataKeys:
+    - 4f17c4c0f7b1c414f8c8113a665a1cae: 21300000
+    - 9400c5d3cfd556444a0754ee1caaf7c5: 21300000
+    - 842fd51cf401e4651a850e7cb508ca88: 21300000
+    - 4182681c6cdabf94eaa4d78d69628883: 21300000
+    - a08c897d9ace246a9bd29b9e89b04c70: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: 4f17c4c0f7b1c414f8c8113a665a1cae, type: 3}

diff --git a/unity-renderer/Assets/Desktop/Textures/UIAtlas.spriteatlas b/unity-renderer/Assets/Desktop/Textures/UIAtlas.spriteatlas
@@ -36,6 +36,9 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
+    packedSpriteRenderDataKeys:
+    - 972b63b8178f3744b902130e9b94f77f: 21300000
+    - b321db59c97fecb4596ff940b50ffca8: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: 972b63b8178f3744b902130e9b94f77f, type: 3}

diff --git a/...rer/Assets/Scripts/MainScripts/DCL/Components/AvatarAttach/Tests/AvatarAttachTests.asmdef b/...rer/Assets/Scripts/MainScripts/DCL/Components/AvatarAttach/Tests/AvatarAttachTests.asmdef
@@ -14,7 +14,8 @@
         "GUID:1de3566cccb280f4a982c59ad0d08c96",
         "GUID:cc6bfabbfe87b7949aa248893f89ce37",
         "GUID:9857fe4bae4e30441bc3a577c5de790a",
-        "GUID:59748378707bc664aa6cebca2ebf461b"
+        "GUID:59748378707bc664aa6cebca2ebf461b",
+        "GUID:3b80b0b562b1cbc489513f09fc1b8f69"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/...ts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Textures/AvatarEditorAtlas.spriteatlas b/...ts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Textures/AvatarEditorAtlas.spriteatlas
@@ -31,6 +31,7 @@ SpriteAtlas:
       m_CrunchedCompression: 0
       m_AllowsAlphaSplitting: 0
       m_Overridden: 1
+      m_IgnorePlatformSupport: 0
       m_AndroidETC2FallbackOverride: 0
       m_ForceMaximumCompressionQuality_BC6H_BC7: 0
     packingSettings:
@@ -48,6 +49,59 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
+    packedSpriteRenderDataKeys:
+    - 57f4b3503db7141bea960af5af6aba3f: 21300000
+    - ddce90606ec7d4e5d820390fe246a91b: 21300000
+    - d52b4d70a596143e6a8f84723bfb5d27: 21300000
+    - 9aea7690f97604e91a23067bc1c98693: 21300000
+    - 2de957f05cca04e4aac38646afee2263: 21300000
+    - a62bd54126ace4d309526c08cd177fbe: 21300000
+    - 20f61051b4b2e4e04bbe7ad6d718c376: 21300000
+    - 445c6a51809e44f21a4dbb5e7c36748c: 21300000
+    - 17e4c961a88d74262a222ea008152618: 21300000
+    - b90a97a10e3a7452988bced1ec1aaf84: 21300000
+    - 06cdeba19874e4ee38010ed40544559d: 21300000
+    - 304d49d1f62b94a73958459f29bb51a0: 21300000
+    - c5bb4072100f84d509e4bbefb758d7c0: 21300000
+    - 4a803782af3694d97b17f31e269c04d1: 21300000
+    - 73a448e25759f4f1db4acdf472113ecf: 21300000
+    - 0a7bc003ee72446d8b987131213b19f1: 21300000
+    - 0bfef183260d34c50b8d971b1400499e: 21300000
+    - 8c8891934b1424617b1b798b02fccfc8: 21300000
+    - 29b3c29329eb84defb2412248b12a449: 21300000
+    - 3f256ac367a7f4a9baa188f3fc73dd76: 21300000
+    - 30c54e14722864c70a0e8c28edc2f7e6: 21300000
+    - 77eb5a24a4b4f43abb387ce6a4ee7e81: 21300000
+    - 909704347448b41bbab7203f8a6c12c9: 21300000
+    - 5b3e476476d1b49339a7115d8e55a56d: 21300000
+    - 1a1d2bd47f28a47c28035a04ee136edd: 21300000
+    - d7329df45ca12414f9cc799103d596bf: 21300000
+    - fb5041354a9234cab900dc6cc03446ea: 21300000
+    - 57331f65928794d50a05a8610b3a975b: 21300000
+    - 2dc807c5b399c4301b1732ad95786f55: 21300000
+    - 946f30660ef2f4261b313ca749c4127c: 21300000
+    - 09fd8686734544b9eb4a37d61ec2890c: 21300000
+    - c1bf499699a424df88aa013bd2f32b68: 21300000
+    - 83b23c967c9d94408bbe1479839ea43d: 21300000
+    - 2b4d7ff7848124b81bf757259f34eea4: 21300000
+    - 665a0e081e71c4699b07e587f9578d1d: 21300000
+    - 15c0a1185bb524f0c9d7b118e081501f: 21300000
+    - 4454cae867deb4aea91f4d26c5bc88b1: 21300000
+    - 18cc300911ff74c3c922eb3a9b346f3c: 21300000
+    - f0288429bd10b4d738028837ef4041db: 21300000
+    - a3837a59671b94a699e1f72ece4c8d8d: 21300000
+    - d4ee93e9eb8464972b0fd5598a452f50: 21300000
+    - 2a24a45ae661148d2af4bc9f390fdd66: 21300000
+    - c7f41b8bc4324443a82a0e197610125d: 21300000
+    - 59b6b5bb7ec0348ef9f9d2890faa3efe: 21300000
+    - 84c790cbe3a484378906dc785b6c5995: 21300000
+    - 866efedbbcc38498f9e6136d65695c9c: 21300000
+    - 7df132fb4eb304d619c7dd33841261a1: 21300000
+    - 3a17402d714be4824b651c091e883d42: 21300000
+    - 90e673ad913664a27b245b61ccdf31bf: 21300000
+    - 0d40d3de4e8af4e7c9c5341e930a45e3: 21300000
+    - 15e20e3fa5b554b71889a9975ebd4950: 21300000
+    - 51b361fff7067426a964be4945152c62: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: 57f4b3503db7141bea960af5af6aba3f, type: 3}

diff --git a/...ripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Test/TeleportPromptHUDTest.asmdef b/...ripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Test/TeleportPromptHUDTest.asmdef
@@ -11,7 +11,8 @@
         "GUID:28f74c468a54948bfa9f625c5d428f56",
         "GUID:0e967802b778d404eac1ca5ea340e290",
         "GUID:fd239a454d9a4039b164f90867ea3216",
-        "GUID:97d8897529779cb49bebd400c7f402a6"
+        "GUID:97d8897529779cb49bebd400c7f402a6",
+        "GUID:3b80b0b562b1cbc489513f09fc1b8f69"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/...Assets/Scripts/MainScripts/DCL/Controllers/LoadingScreen/Sprites/LoadingAtlas.spriteatlas b/...Assets/Scripts/MainScripts/DCL/Controllers/LoadingScreen/Sprites/LoadingAtlas.spriteatlas
@@ -31,6 +31,7 @@ SpriteAtlas:
       m_CrunchedCompression: 0
       m_AllowsAlphaSplitting: 0
       m_Overridden: 0
+      m_IgnorePlatformSupport: 0
       m_AndroidETC2FallbackOverride: 0
       m_ForceMaximumCompressionQuality_BC6H_BC7: 0
     - serializedVersion: 3
@@ -43,6 +44,7 @@ SpriteAtlas:
       m_CrunchedCompression: 0
       m_AllowsAlphaSplitting: 0
       m_Overridden: 1
+      m_IgnorePlatformSupport: 0
       m_AndroidETC2FallbackOverride: 0
       m_ForceMaximumCompressionQuality_BC6H_BC7: 0
     packingSettings:
@@ -67,6 +69,15 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
+    packedSpriteRenderDataKeys:
+    - c6536212dc1f24674904faa55732f64c: 21300000
+    - c1e81be26094f46b4b00b853ca617eca: 21300000
+    - 8955cba7efb204195bf48ea239760527: 21300000
+    - 7a23dbd753bf44e2fa14e2860cd16083: 21300000
+    - 7df1eef97ae51a8469453831f17ba2b5: 21300000
+    - 7d674afaaca5844098399b4413b743fa: 21300000
+    - dfb614ec29ae64410a9cb17a66431d03: 21300000
+    - 9932402d6a77c484999857fc085618a0: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: c6536212dc1f24674904faa55732f64c, type: 3}

diff --git a/...ripts/MainScripts/DCL/Controllers/LoadingScreen/Teleport/TeleportLoadingAtlas.spriteatlas b/...ripts/MainScripts/DCL/Controllers/LoadingScreen/Teleport/TeleportLoadingAtlas.spriteatlas
@@ -31,6 +31,7 @@ SpriteAtlas:
       m_CrunchedCompression: 0
       m_AllowsAlphaSplitting: 0
       m_Overridden: 1
+      m_IgnorePlatformSupport: 0
       m_AndroidETC2FallbackOverride: 0
       m_ForceMaximumCompressionQuality_BC6H_BC7: 0
     packingSettings:
@@ -55,6 +56,15 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
+    packedSpriteRenderDataKeys:
+    - e1a280e254e7409429de218f8922c52a: 21300000
+    - bf57a37376cda25459d7d5a6e632e50e: 21300000
+    - 1d3b42f3b5fa46446abb348ca49e0ab6: 21300000
+    - 674eb2ea60e168a469c9a4a80983c0c9: 21300000
+    - 5da9e0fb6605d2b49a750f49b0f654fc: 21300000
+    - 68d82b8cf8077f7449f27a2f03121b1a: 21300000
+    - d029dffc293fc7145b4b7cb0a7cd5387: 21300000
+    - e1bc6e0ec2855b34bae8e171c4637416: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: e1a280e254e7409429de218f8922c52a, type: 3}

@@ -8,7 +8,8 @@
         "GUID:ac62e852826a4b36aeb22931dad73edb",
         "GUID:fb8b6086b6e54929b44e5231496950d2",
         "GUID:0a17d39e1dc14c038aa3c6483a185df0",
-        "GUID:9b110c16a6b8f4d54ae0f56af2163334"
+        "GUID:9b110c16a6b8f4d54ae0f56af2163334",
+        "GUID:1dd0780aa6be12b428c8005d0bee46b8"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/...s/DCL/WorldRuntime/SceneResourcesLoadTracker/Tests/SceneResourcesLoadTracker.Tests.asmdef b/...s/DCL/WorldRuntime/SceneResourcesLoadTracker/Tests/SceneResourcesLoadTracker.Tests.asmdef
@@ -22,7 +22,8 @@
         "GUID:9cccce9925d3495d8a5e4fa5b25f54a5",
         "GUID:adeaca5e7e18405da8c4f47917c55649",
         "GUID:a871c50d0a774d2b8594d36cb4766e5e",
-        "GUID:8796c22c84974ce385f8d79b1ae08e1b"
+        "GUID:8796c22c84974ce385f8d79b1ae08e1b",
+        "GUID:3b80b0b562b1cbc489513f09fc1b8f69"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
Original file line number	Diff line number	Diff line change
Expand Up		@@ -50,4 +50,3 @@ main().catch((err) => {
		console.error(err)
		process.exit(1)
		})
-Original file line number
+Diff line change
@@ Expand Up @@
         if (contentsFirst[i] !== contentsSecond[i])
           throw new Error(`Files ${first} and ${second} are different, on line ${line}, char ${i}`)
       }
       return true
     }
@@ Expand Down @@