Skip to content

Commit 0cd402e

Browse files
fernando-cortezfernando-cortez
authored
Merge pull request #851 from Unity-Technologies/develop
release: v2.2.0 [MTT-5643]
2 parents 02b9bba + b9feeb0 commit 0cd402e

File tree

199 files changed

+8355
-476
lines changed

Some content is hidden

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

199 files changed

+8355
-476
lines changed

‎.yamato/mobile-build-and-run.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
99
name: build {{ project.name }} - {{ editor }} on iOS
1010
agent:
1111
type: Unity::VM::osx
12-
image: mobile/macos-10.15-testing:stable
12+
image: package-ci/macos-12:v4
1313
flavor: b1.large
1414

1515
commands:
1616
- pip install unity-downloader-cli==1.2.0 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
17-
- unity-downloader-cli -c Editor -c iOS -u 2021.3.15f1 --fast --wait
17+
- unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait
1818
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
1919
- chmod +x ./utr
2020
- ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.BossRoom.Tests.Runtime
@@ -70,7 +70,7 @@ mobile_test_ios_{{ project.name }}_{{ editor }}:
7070
name: {{ project.name }} mobile project tests - {{ editor }} on iOS
7171
agent:
7272
type: Unity::mobile::iPhone
73-
image: mobile/macos-10.15-testing:latest
73+
image: package-ci/macos-12:v4
7474
flavor: b1.medium
7575

7676
# Skip repository cloning

‎.yamato/project-standards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ standards_{{ projects.first.name }}:
55
agent:
66
type: Unity::VM
77
image: desktop/logging-testing-linux:v0.1.2-926285
8-
flavor: b1.medium
8+
flavor: b1.large
99
commands:
1010
- dotnet --version
1111
- dotnet format --version

‎.yamato/project.metafile

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
validation_editor: 2020.3
2-
3-
# Platforms that will be tested. The first entry in this array will also
4-
# be used for validation
1+
# Platforms that will be tested.
52
test_platforms:
63
- name: win
74
type: Unity::VM
8-
image: package-ci/win10:stable
5+
image: package-ci/win10:v4
96
flavor: b1.large
107
editorpath: .Editor\Unity.exe
118
utr: .\utr.bat
129
- name: mac
1310
type: Unity::VM::osx
14-
image: package-ci/mac:stable
11+
image: package-ci/macos-12:v4
1512
flavor: b1.large
1613
editorpath: .Editor/Unity.app/Contents/MacOS/Unity
1714
utr: ./utr
1815
- name: ubuntu
1916
type: Unity::VM
20-
image: package-ci/ubuntu:stable
17+
image: package-ci/ubuntu-18.04:v4
2118
flavor: b1.large
2219
editorpath: .Editor/Unity
2320
utr: ./utr
@@ -33,4 +30,4 @@ projects:
3330
- name: com.unity.multiplayer.samples.coop
3431
path: Packages/com.unity.multiplayer.samples.coop
3532
test_editors:
36-
- 2021.3
33+
- 2022.3.0

‎Assets/Material/Characters/Character_Shadow.mat

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,21 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Character_Shadow
1111
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _SURFACE_TYPE_TRANSPARENT
1416
m_InvalidKeywords: []
1517
m_LightmapFlags: 4
1618
m_EnableInstancingVariants: 0
1719
m_DoubleSidedGI: 0
18-
m_CustomRenderQueue: -1
20+
m_CustomRenderQueue: 3000
1921
stringTagMap:
2022
RenderType: Transparent
2123
disabledShaderPasses:
2224
- SHADOWCASTER
2325
- DepthOnly
26+
m_LockedProperties:
2427
m_SavedProperties:
2528
serializedVersion: 3
2629
m_TexEnvs:
@@ -87,6 +90,7 @@ Material:
8790
m_Ints: []
8891
m_Floats:
8992
- _AlphaClip: 0
93+
- _AlphaToMask: 0
9094
- _Blend: 0
9195
- _BlendOp: 0
9296
- _BumpScale: 1
@@ -140,4 +144,4 @@ MonoBehaviour:
140144
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
141145
m_Name:
142146
m_EditorClassIdentifier:
143-
version: 5
147+
version: 7

‎Assets/Material/Characters/Enemy_Eyes_sheet.mat

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,21 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Enemy_Eyes_sheet
1111
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _SURFACE_TYPE_TRANSPARENT
1416
m_InvalidKeywords: []
1517
m_LightmapFlags: 2
1618
m_EnableInstancingVariants: 1
1719
m_DoubleSidedGI: 0
18-
m_CustomRenderQueue: -1
20+
m_CustomRenderQueue: 3000
1921
stringTagMap:
2022
RenderType: Transparent
2123
disabledShaderPasses:
2224
- SHADOWCASTER
2325
- DepthOnly
26+
m_LockedProperties:
2427
m_SavedProperties:
2528
serializedVersion: 3
2629
m_TexEnvs:
@@ -83,6 +86,7 @@ Material:
8386
m_Ints: []
8487
m_Floats:
8588
- _AlphaClip: 0
89+
- _AlphaToMask: 0
8690
- _Blend: 0
8791
- _BumpScale: 1
8892
- _CastShadows: 0
@@ -135,4 +139,4 @@ MonoBehaviour:
135139
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
136140
m_Name:
137141
m_EditorClassIdentifier:
138-
version: 5
142+
version: 7

‎Assets/Material/Characters/Enemy_Mouth_sheet.mat

+6-2
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: 5
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -22,18 +22,21 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Enemy_Mouth_sheet
2424
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
2527
m_ValidKeywords:
2628
- _SURFACE_TYPE_TRANSPARENT
2729
m_InvalidKeywords: []
2830
m_LightmapFlags: 2
2931
m_EnableInstancingVariants: 1
3032
m_DoubleSidedGI: 0
31-
m_CustomRenderQueue: -1
33+
m_CustomRenderQueue: 3000
3234
stringTagMap:
3335
RenderType: Transparent
3436
disabledShaderPasses:
3537
- SHADOWCASTER
3638
- DepthOnly
39+
m_LockedProperties:
3740
m_SavedProperties:
3841
serializedVersion: 3
3942
m_TexEnvs:
@@ -96,6 +99,7 @@ Material:
9699
m_Ints: []
97100
m_Floats:
98101
- _AlphaClip: 0
102+
- _AlphaToMask: 0
99103
- _Blend: 0
100104
- _BumpScale: 1
101105
- _CastShadows: 0

‎Assets/Material/Characters/Hero_Eyes_sheet.mat

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,21 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Hero_Eyes_sheet
1111
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _SURFACE_TYPE_TRANSPARENT
1416
m_InvalidKeywords: []
1517
m_LightmapFlags: 2
1618
m_EnableInstancingVariants: 1
1719
m_DoubleSidedGI: 0
18-
m_CustomRenderQueue: -1
20+
m_CustomRenderQueue: 3000
1921
stringTagMap:
2022
RenderType: Transparent
2123
disabledShaderPasses:
2224
- SHADOWCASTER
2325
- DepthOnly
26+
m_LockedProperties:
2427
m_SavedProperties:
2528
serializedVersion: 3
2629
m_TexEnvs:
@@ -83,6 +86,7 @@ Material:
8386
m_Ints: []
8487
m_Floats:
8588
- _AlphaClip: 0
89+
- _AlphaToMask: 0
8690
- _Blend: 0
8791
- _BumpScale: 1
8892
- _CastShadows: 0
@@ -135,4 +139,4 @@ MonoBehaviour:
135139
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
136140
m_Name:
137141
m_EditorClassIdentifier:
138-
version: 5
142+
version: 7

‎Assets/Material/Characters/Hero_Mouth_sheet.mat

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,21 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Hero_Mouth_sheet
1111
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _SURFACE_TYPE_TRANSPARENT
1416
m_InvalidKeywords: []
1517
m_LightmapFlags: 2
1618
m_EnableInstancingVariants: 1
1719
m_DoubleSidedGI: 0
18-
m_CustomRenderQueue: -1
20+
m_CustomRenderQueue: 3000
1921
stringTagMap:
2022
RenderType: Transparent
2123
disabledShaderPasses:
2224
- SHADOWCASTER
2325
- DepthOnly
26+
m_LockedProperties:
2427
m_SavedProperties:
2528
serializedVersion: 3
2629
m_TexEnvs:
@@ -83,6 +86,7 @@ Material:
8386
m_Ints: []
8487
m_Floats:
8588
- _AlphaClip: 0
89+
- _AlphaToMask: 0
8690
- _Blend: 0
8791
- _BumpScale: 1
8892
- _CastShadows: 0
@@ -140,4 +144,4 @@ MonoBehaviour:
140144
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
141145
m_Name:
142146
m_EditorClassIdentifier:
143-
version: 5
147+
version: 7

‎Assets/Material/Characters/Toon/Hair_Archer_Boy.mat

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Hair_Archer_Boy
1111
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords: []
1315
m_InvalidKeywords:
1416
- _EMISSION
@@ -19,6 +21,7 @@ Material:
1921
m_CustomRenderQueue: -1
2022
stringTagMap: {}
2123
disabledShaderPasses: []
24+
m_LockedProperties:
2225
m_SavedProperties:
2326
serializedVersion: 3
2427
m_TexEnvs:
@@ -111,4 +114,4 @@ MonoBehaviour:
111114
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
112115
m_Name:
113116
m_EditorClassIdentifier:
114-
version: 5
117+
version: 7

‎Assets/Material/Characters/Toon/Hair_Archer_Girl.mat

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Hair_Archer_Girl
1111
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords: []
1315
m_InvalidKeywords:
1416
- _EMISSION
@@ -19,6 +21,7 @@ Material:
1921
m_CustomRenderQueue: -1
2022
stringTagMap: {}
2123
disabledShaderPasses: []
24+
m_LockedProperties:
2225
m_SavedProperties:
2326
serializedVersion: 3
2427
m_TexEnvs:
@@ -111,4 +114,4 @@ MonoBehaviour:
111114
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
112115
m_Name:
113116
m_EditorClassIdentifier:
114-
version: 5
117+
version: 7

‎Assets/Material/Characters/Toon/Hair_Mage_Boy.mat

+4-1
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: 5
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -22,6 +22,8 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Hair_Mage_Boy
2424
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
2527
m_ValidKeywords: []
2628
m_InvalidKeywords:
2729
- _EMISSION
@@ -32,6 +34,7 @@ Material:
3234
m_CustomRenderQueue: -1
3335
stringTagMap: {}
3436
disabledShaderPasses: []
37+
m_LockedProperties:
3538
m_SavedProperties:
3639
serializedVersion: 3
3740
m_TexEnvs:

‎Assets/Material/Characters/Toon/Hair_Mage_Girl.mat

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Hair_Mage_Girl
2424
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
2527
m_ValidKeywords: []
2628
m_InvalidKeywords:
2729
- _EMISSION
@@ -32,6 +34,7 @@ Material:
3234
m_CustomRenderQueue: -1
3335
stringTagMap: {}
3436
disabledShaderPasses: []
37+
m_LockedProperties:
3538
m_SavedProperties:
3639
serializedVersion: 3
3740
m_TexEnvs:
@@ -124,4 +127,4 @@ MonoBehaviour:
124127
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125128
m_Name:
126129
m_EditorClassIdentifier:
127-
version: 5
130+
version: 7

‎Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat

+4-1
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: 5
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -22,6 +22,8 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Hair_Rogue_Boy
2424
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
2527
m_ValidKeywords: []
2628
m_InvalidKeywords:
2729
- _EMISSION
@@ -32,6 +34,7 @@ Material:
3234
m_CustomRenderQueue: -1
3335
stringTagMap: {}
3436
disabledShaderPasses: []
37+
m_LockedProperties:
3538
m_SavedProperties:
3639
serializedVersion: 3
3740
m_TexEnvs:

‎Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Hair_Rogue_Girl
1111
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords: []
1315
m_InvalidKeywords:
1416
- _EMISSION
@@ -19,6 +21,7 @@ Material:
1921
m_CustomRenderQueue: -1
2022
stringTagMap: {}
2123
disabledShaderPasses: []
24+
m_LockedProperties:
2225
m_SavedProperties:
2326
serializedVersion: 3
2427
m_TexEnvs:
@@ -111,4 +114,4 @@ MonoBehaviour:
111114
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
112115
m_Name:
113116
m_EditorClassIdentifier:
114-
version: 5
117+
version: 7

0 commit comments

Comments
 (0)