Skip to content

Commit 7a92722

Browse files
pravusjifpravusjif
authored
revert: unity version update to unity2022.3.6f1 (#5661)
Revert "chore: update unity project version to unity2022.3.6f1 (#5529)" This reverts commit e0095ef.
1 parent e0095ef commit 7a92722

File tree

86 files changed

+252
-723
lines changed

Some content is hidden

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

86 files changed

+252
-723
lines changed

‎.circleci/config.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ references:
1212
at: *working_directory
1313

1414
.unity_linux_image: &unity_linux_image
15-
- image: unityci/editor:ubuntu-2022.3.6f1-linux-il2cpp-2.0.0
15+
- image: unityci/editor:ubuntu-2021.3.22f1-linux-il2cpp-1.0.1
1616
environment:
1717
DCL_OUTPUT_NAME: linux
1818
PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -23,7 +23,7 @@ references:
2323
# ~~~~~~~~~~~~~~~~~~~~ <- folder name
2424

2525
.unity_mac_image: &unity_mac_image
26-
- image: unityci/editor:ubuntu-2022.3.6f1-mac-mono-2.0.0
26+
- image: unityci/editor:ubuntu-2021.3.22f1-mac-mono-1.0.1
2727
environment:
2828
DCL_OUTPUT_NAME: mac
2929
PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -34,7 +34,7 @@ references:
3434
# ~~~~~~~~~~~~~~~~~~ <- folder name
3535

3636
.unity_windows_image: &unity_windows_image
37-
- image: unityci/editor:ubuntu-2022.3.6f1-windows-mono-2.0.0
37+
- image: unityci/editor:ubuntu-2021.3.22f1-windows-mono-1.0.1
3838
environment:
3939
DCL_OUTPUT_NAME: windows
4040
PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -45,7 +45,7 @@ references:
4545
# ~~~~~~~~~~~~~~~~~~~~~~ <- folder name
4646

4747
.unity_webgl_image: &unity_webgl_image
48-
- image: unityci/editor:2022.3.6f1-webgl-2.0.0
48+
- image: unityci/editor:2021.3.22f1-webgl-1
4949
environment:
5050
DCL_OUTPUT_NAME: webgl
5151
PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -116,13 +116,13 @@ commands:
116116
echo $DCL_OUTPUT_NAME > /tmp/target
117117
- restore_cache:
118118
keys:
119-
- build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}-2022.3.6f1
120-
- build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-dev-2022.3.6f1
119+
- build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}
120+
- build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-dev
121121
- restore_cache: &RESTORE_LIBRARY_CACHE
122122
name: Restore library if exists
123123
keys:
124-
- library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}-2022.3.6f1
125-
- library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-dev-2022.3.6f1
124+
- library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}
125+
- library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-dev
126126
- run:
127127
name: Build Unity Project
128128
no_output_timeout: 45m
@@ -141,11 +141,11 @@ commands:
141141

142142
- save_cache:
143143
name: Store build cache
144-
key: build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}-2022.3.6f1
144+
key: build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}
145145
paths: *CACHED_PATHS
146146
- save_cache:
147147
name: Store library
148-
key: library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}-2022.3.6f1
148+
key: library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}
149149
paths:
150150
- ./unity-renderer/Library
151151
- run:

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ This repository contains the reference implementation of the [decentraland explo
1414
git lfs install
1515
git lfs pull
1616

17-
* The [Unity](https://unity.com) engine and IDE, currently using version 2022.3.6f1
17+
* The [Unity](https://unity.com) engine and IDE, currently using version 2021.3.14f1
1818
* [node.js](https://nodejs.com), version 16 or later
1919

2020
### Steps
2121

2222
Check: [Multiplatform in Editor](docs/multiplatform-in-editor.md)
2323

24-
1. Download and install Unity 2022.3.6f1
24+
1. Download and install Unity 2021.3.14f1
2525
2. Open the scene named `InitialScene`
2626
3. Within the scene, select the `DebugConfig` GameObject.
2727
4. On `DebugConfig` inspector, make sure that `Base url mode` is set to `Custom`

‎browser-interface/static/unity.loader.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unity-renderer/Assets/AddressableAssetsData/WebGL/addressables_content_state.bin‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:e38b011f6feaac6f848faa6f6e087635b6532e9f110ae846587d02a0efa5b2fa
3-
size 164631
2+
oid sha256:41d052728f63be880ddac4793acb4f6a04cc5da97b8c3639bba5b66d7a641e4c
3+
size 1728

‎unity-renderer/Assets/DCLPlugins/ECS7/Systems/UiPointerEvents/Tests/UiPointerEventsSystemShould.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ void UpdateSystem()
272272
{
273273
components = { 1 }
274274
};
275-
uiDocumentInstance.rootVisualElement.Add(internalUiComponent.rootElement);
276275

277276
internalComponents.uiContainerComponent.PutFor(scene, entity, internalUiComponent);
278277

‎unity-renderer/Assets/Materials/GizmosMaterialInWorld.mat‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 7
15+
version: 5
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -22,8 +22,6 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: GizmosMaterialInWorld
2424
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
25-
m_Parent: {fileID: 0}
26-
m_ModifiedSerializedProperties: 0
2725
m_ValidKeywords: []
2826
m_InvalidKeywords: []
2927
m_LightmapFlags: 4
@@ -33,7 +31,6 @@ Material:
3331
stringTagMap:
3432
RenderType: Opaque
3533
disabledShaderPasses: []
36-
m_LockedProperties:
3734
m_SavedProperties:
3835
serializedVersion: 3
3936
m_TexEnvs:
@@ -96,7 +93,6 @@ Material:
9693
m_Ints: []
9794
m_Floats:
9895
- _AlphaClip: 0
99-
- _AlphaToMask: 0
10096
- _BaseMapUVs: 0
10197
- _Blend: 0
10298
- _BlendOp: 0
@@ -106,7 +102,6 @@ Material:
106102
- _CullYPlane: 0.5
107103
- _Cutoff: 0.5
108104
- _DstBlend: 0
109-
- _DstBlendAlpha: 0
110105
- _EmissiveMapUVs: 0
111106
- _EnvironmentReflections: 1
112107
- _FadeDirection: 0
@@ -129,7 +124,6 @@ Material:
129124
- _SpecSource: 0
130125
- _SpecularHighlights: 1
131126
- _SrcBlend: 1
132-
- _SrcBlendAlpha: 1
133127
- _Stencil: 0
134128
- _StencilComp: 8
135129
- _StencilOp: 0

‎unity-renderer/Assets/Materials/ParcelMinimapIcon.mat‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: ParcelMinimapIcon
1111
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
12-
m_Parent: {fileID: 0}
13-
m_ModifiedSerializedProperties: 0
1412
m_ValidKeywords: []
1513
m_InvalidKeywords: []
1614
m_LightmapFlags: 4
@@ -20,7 +18,6 @@ Material:
2018
stringTagMap:
2119
RenderType: Opaque
2220
disabledShaderPasses: []
23-
m_LockedProperties:
2421
m_SavedProperties:
2522
serializedVersion: 3
2623
m_TexEnvs:
@@ -55,14 +52,12 @@ Material:
5552
m_Ints: []
5653
m_Floats:
5754
- _AlphaClip: 0
58-
- _AlphaToMask: 0
5955
- _Blend: 0
6056
- _BlendOp: 0
6157
- _BumpScale: 1
6258
- _Cull: 2
6359
- _Cutoff: 0.5
6460
- _DstBlend: 0
65-
- _DstBlendAlpha: 0
6661
- _EnvironmentReflections: 1
6762
- _GlossMapScale: 0
6863
- _Glossiness: 0
@@ -76,7 +71,6 @@ Material:
7671
- _SmoothnessTextureChannel: 0
7772
- _SpecularHighlights: 1
7873
- _SrcBlend: 1
79-
- _SrcBlendAlpha: 1
8074
- _Surface: 0
8175
- _WorkflowMode: 1
8276
- _ZWrite: 1
@@ -98,4 +92,4 @@ MonoBehaviour:
9892
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
9993
m_Name:
10094
m_EditorClassIdentifier:
101-
version: 7
95+
version: 5

‎unity-renderer/Assets/Materials/TileGround.mat‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 7
15+
version: 5
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -22,8 +22,6 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: TileGround
2424
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
25-
m_Parent: {fileID: 0}
26-
m_ModifiedSerializedProperties: 0
2725
m_ValidKeywords: []
2826
m_InvalidKeywords: []
2927
m_LightmapFlags: 4
@@ -33,7 +31,6 @@ Material:
3331
stringTagMap:
3432
RenderType: Opaque
3533
disabledShaderPasses: []
36-
m_LockedProperties:
3734
m_SavedProperties:
3835
serializedVersion: 3
3936
m_TexEnvs:
@@ -96,15 +93,12 @@ Material:
9693
m_Ints: []
9794
m_Floats:
9895
- _AlphaClip: 0
99-
- _AlphaToMask: 0
10096
- _Blend: 0
101-
- _BlendModePreserveSpecular: 1
10297
- _BumpScale: 1
10398
- _Cull: 2
10499
- _Cutoff: 0.5
105100
- _DetailNormalMapScale: 1
106101
- _DstBlend: 0
107-
- _DstBlendAlpha: 0
108102
- _GlossMapScale: 1
109103
- _Glossiness: 0.5
110104
- _GlossinessSource: 0
@@ -122,7 +116,6 @@ Material:
122116
- _SpecSource: 1
123117
- _SpecularHighlights: 1
124118
- _SrcBlend: 1
125-
- _SrcBlendAlpha: 1
126119
- _Surface: 0
127120
- _UVSec: 0
128121
- _ZWrite: 1

‎unity-renderer/Assets/Rendering/Common/ForwardRenderer.asset‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,16 @@ MonoBehaviour:
1313
m_Name: NewScreenSpaceAmbientOcclusion
1414
m_EditorClassIdentifier:
1515
m_Active: 1
16+
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
1617
m_Settings:
17-
AOMethod: 1
1818
Downsample: 0
1919
AfterOpaque: 0
2020
Source: 1
2121
NormalSamples: 2
2222
Intensity: 1.2
2323
DirectLightingStrength: 0.6
2424
Radius: 0.2
25-
Samples: 2
26-
BlurQuality: 0
27-
Falloff: 100
28-
SampleCount: -1
29-
m_BlueNoise256Textures:
30-
- {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
31-
- {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
32-
- {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
33-
- {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
34-
- {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
35-
- {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
36-
- {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
37-
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
25+
SampleCount: 4
3826
--- !u!114 &-5304858544757240251
3927
MonoBehaviour:
4028
m_ObjectHideFlags: 0
@@ -92,13 +80,15 @@ MonoBehaviour:
9280
m_EditorClassIdentifier:
9381
m_Active: 0
9482
settings:
95-
outlineThickness: 0
96-
blurSize: 0
97-
blurSigma: 0
9883
outlineColor: {r: 0, g: 1, b: 1, a: 1}
9984
blurColor: {r: 0, g: 1, b: 1, a: 1}
10085
innerColor: {r: 0, g: 0.85890675, b: 1, a: 0.050980393}
10186
effectFade: 1
87+
outlineThickness: {fileID: 11400000, guid: 3b2a0097ac4974c4dbd22fdfcbd5cfeb, type: 2}
88+
outlineResolutionScale: {fileID: 11400000, guid: 051dce077ac0fe84ebdd212db125cae5,
89+
type: 2}
90+
blurSize: {fileID: 11400000, guid: 71984a406e9d00c4eb55991db791d8d2, type: 2}
91+
blurSigma: {fileID: 11400000, guid: 15aeca967a14da64882661d82afedba4, type: 2}
10292
filterMode: 1
10393
--- !u!114 &-981180908113067146
10494
MonoBehaviour:
@@ -137,7 +127,6 @@ MonoBehaviour:
137127
debugShaders:
138128
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
139129
type: 3}
140-
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
141130
m_RendererFeatures:
142131
- {fileID: -7551554940414059620}
143132
- {fileID: 4650022159256899313}
@@ -155,18 +144,14 @@ MonoBehaviour:
155144
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
156145
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
157146
fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
158-
fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
159147
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
160148
coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
161149
coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b,
162150
type: 3}
163-
blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
164151
cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf,
165152
type: 3}
166153
objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
167154
type: 3}
168-
dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
169-
type: 3}
170155
m_AssetVersion: 2
171156
m_OpaqueLayerMask:
172157
serializedVersion: 2
@@ -186,6 +171,8 @@ MonoBehaviour:
186171
m_DepthPrimingMode: 0
187172
m_CopyDepthMode: 0
188173
m_AccurateGbufferNormals: 0
174+
m_ClusteredRendering: 0
175+
m_TileSize: 32
189176
m_IntermediateTextureMode: 1
190177
--- !u!114 &1990522510072472895
191178
MonoBehaviour:

0 commit comments

Comments
 (0)