Skip to content

Commit 6643d1f

Browse files
12joan12joan
authored
Rescale level 2 (#130)
* Rescale 3D door * WIP: Rescale level 2 * Report test results * Report test results on failure * Strip colour from test results for GitHub job summary * Create `edge_colliders_from_svg.rb` script * Fix edge collider vertex * Add table colliders * Adjust cubicle size in top-right room * Adjust background masks * Add gremlins and cutscene * Fix OP#1026 * Linter fix * Add `AwaitHasText` assertion * Add vertical faces * Add vertical face to pile of cans * Add level 2 tests
1 parent 2b4b54d commit 6643d1f

32 files changed

+3882
-3891
lines changed

‎.github/workflows/test.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ jobs:
2727
- name: Install vendor
2828
run: ./install_vendor.sh ${{ secrets.vendor_url }}
2929

30+
- name: Setup Ruby
31+
uses: ruby/setup-ruby@v1
32+
with:
33+
ruby-version: '3.3'
34+
35+
- name: Install Ruby dependencies
36+
run: bundle install
37+
3038
# PulseAudio does not work in Docker container
3139
- name: Patch FMOD to disable sound
3240
run: |
@@ -88,6 +96,12 @@ jobs:
8896
githubToken: ${{ secrets.GITHUB_TOKEN }}
8997
customParameters: -testFilter ${{ steps.get_tests.outputs.tests }}
9098

99+
- name: Report test results
100+
if: always()
101+
run: |
102+
bundle exec ruby report_test_results.rb | tee -a results.txt
103+
cat results.txt | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g' >> $GITHUB_STEP_SUMMARY
104+
91105
- name: Upload Percy screenshots
92106
uses: actions/upload-artifact@v4
93107
with:

‎Assets/Unity/Prefabs/3D Door.prefab‎

Lines changed: 92 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,82 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &1320996421842502308
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 4942694807378081753}
12+
- component: {fileID: 7719802499204391783}
13+
m_Layer: 0
14+
m_Name: Vertical
15+
m_TagString: Vertical Face
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!4 &4942694807378081753
21+
Transform:
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
26+
m_GameObject: {fileID: 1320996421842502308}
27+
serializedVersion: 2
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_ConstrainProportionsScale: 0
32+
m_Children: []
33+
m_Father: {fileID: 1674329641148922448}
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
--- !u!61 &7719802499204391783
36+
BoxCollider2D:
37+
m_ObjectHideFlags: 0
38+
m_CorrespondingSourceObject: {fileID: 0}
39+
m_PrefabInstance: {fileID: 0}
40+
m_PrefabAsset: {fileID: 0}
41+
m_GameObject: {fileID: 1320996421842502308}
42+
m_Enabled: 1
43+
m_Density: 1
44+
m_Material: {fileID: 0}
45+
m_IncludeLayers:
46+
serializedVersion: 2
47+
m_Bits: 0
48+
m_ExcludeLayers:
49+
serializedVersion: 2
50+
m_Bits: 0
51+
m_LayerOverridePriority: 0
52+
m_ForceSendLayers:
53+
serializedVersion: 2
54+
m_Bits: 4294967295
55+
m_ForceReceiveLayers:
56+
serializedVersion: 2
57+
m_Bits: 4294967295
58+
m_ContactCaptureLayers:
59+
serializedVersion: 2
60+
m_Bits: 4294967295
61+
m_CallbackLayers:
62+
serializedVersion: 2
63+
m_Bits: 4294967295
64+
m_IsTrigger: 1
65+
m_UsedByEffector: 0
66+
m_UsedByComposite: 0
67+
m_Offset: {x: 0, y: 0.3}
68+
m_SpriteTilingProperty:
69+
border: {x: 0, y: 0, z: 0, w: 0}
70+
pivot: {x: 0, y: 0}
71+
oldSize: {x: 0, y: 0}
72+
newSize: {x: 0, y: 0}
73+
adaptiveTilingThreshold: 0
74+
drawMode: 0
75+
adaptiveTiling: 0
76+
m_AutoTiling: 0
77+
serializedVersion: 2
78+
m_Size: {x: 2, y: 3.75}
79+
m_EdgeRadius: 0
380
--- !u!1 &4486925136249779396
481
GameObject:
582
m_ObjectHideFlags: 0
@@ -26,7 +103,7 @@ Transform:
26103
m_GameObject: {fileID: 4486925136249779396}
27104
serializedVersion: 2
28105
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29-
m_LocalPosition: {x: 0, y: 1.3, z: 0}
106+
m_LocalPosition: {x: 0, y: 0.825, z: 0}
30107
m_LocalScale: {x: 1, y: 1, z: 1}
31108
m_ConstrainProportionsScale: 0
32109
m_Children: []
@@ -184,12 +261,12 @@ PrefabInstance:
184261
- target: {fileID: 995979039497053848, guid: 74031996f39f441beb8f1bd17a58f744,
185262
type: 3}
186263
propertyPath: m_LocalPosition.x
187-
value: 1
264+
value: 0.8
188265
objectReference: {fileID: 0}
189266
- target: {fileID: 995979039497053848, guid: 74031996f39f441beb8f1bd17a58f744,
190267
type: 3}
191268
propertyPath: m_LocalPosition.y
192-
value: 0.6
269+
value: 0.55
193270
objectReference: {fileID: 0}
194271
- target: {fileID: 2912036534048403733, guid: 74031996f39f441beb8f1bd17a58f744,
195272
type: 3}
@@ -249,17 +326,22 @@ PrefabInstance:
249326
- target: {fileID: 4230310847528117551, guid: 74031996f39f441beb8f1bd17a58f744,
250327
type: 3}
251328
propertyPath: m_Size.x
252-
value: 2.5
329+
value: 2
253330
objectReference: {fileID: 0}
254331
- target: {fileID: 4230310847528117551, guid: 74031996f39f441beb8f1bd17a58f744,
255332
type: 3}
256333
propertyPath: m_Size.y
257-
value: 1.6
334+
value: 0.4
335+
objectReference: {fileID: 0}
336+
- target: {fileID: 4230310847528117551, guid: 74031996f39f441beb8f1bd17a58f744,
337+
type: 3}
338+
propertyPath: m_Offset.y
339+
value: -0.375
258340
objectReference: {fileID: 0}
259341
- target: {fileID: 6079469216948065316, guid: 74031996f39f441beb8f1bd17a58f744,
260342
type: 3}
261343
propertyPath: m_LocalPosition.y
262-
value: -0.25
344+
value: -0.3
263345
objectReference: {fileID: 0}
264346
m_RemovedComponents:
265347
- {fileID: 6865191681412865391, guid: 74031996f39f441beb8f1bd17a58f744, type: 3}
@@ -273,6 +355,10 @@ PrefabInstance:
273355
type: 3}
274356
insertIndex: -1
275357
addedObject: {fileID: 3588353397461142635}
358+
- targetCorrespondingSourceObject: {fileID: 6079469216948065316, guid: 74031996f39f441beb8f1bd17a58f744,
359+
type: 3}
360+
insertIndex: -1
361+
addedObject: {fileID: 4942694807378081753}
276362
m_AddedComponents:
277363
- targetCorrespondingSourceObject: {fileID: 6702193089345284906, guid: 74031996f39f441beb8f1bd17a58f744,
278364
type: 3}

‎Assets/Unity/Prefabs/Background Mask Room.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ GameObject:
234234
- component: {fileID: 7291030096136109244}
235235
- component: {fileID: 7645368134328433685}
236236
m_Layer: 0
237-
m_Name: Image
237+
m_Name: Main
238238
m_TagString: Untagged
239239
m_Icon: {fileID: 0}
240240
m_NavMeshLayer: 0

‎Assets/Unity/Prefabs/Openable 2D Door.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ PrefabInstance:
7171
- target: {fileID: 4228075908343664518, guid: 112f3be9fb6a648428690f654df1bdf9,
7272
type: 3}
7373
propertyPath: m_Size.y
74-
value: 4
74+
value: 3
7575
objectReference: {fileID: 0}
7676
- target: {fileID: 6858972519745772156, guid: 112f3be9fb6a648428690f654df1bdf9,
7777
type: 3}

‎Assets/Unity/Prefabs/Openable 3D Door.prefab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ PrefabInstance:
6666
- target: {fileID: 4228075908343664518, guid: 112f3be9fb6a648428690f654df1bdf9,
6767
type: 3}
6868
propertyPath: m_Size.x
69-
value: 2.5
69+
value: 2
7070
objectReference: {fileID: 0}
7171
- target: {fileID: 4228075908343664518, guid: 112f3be9fb6a648428690f654df1bdf9,
7272
type: 3}
7373
propertyPath: m_Size.y
74-
value: 4.7
74+
value: 3.75
7575
objectReference: {fileID: 0}
7676
- target: {fileID: 4228075908343664518, guid: 112f3be9fb6a648428690f654df1bdf9,
7777
type: 3}

‎Assets/Unity/Prefabs/Pile of Cans.prefab‎

Lines changed: 93 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,82 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &5987733302245369492
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 8677311591215949554}
12+
- component: {fileID: 3295673469861866340}
13+
m_Layer: 0
14+
m_Name: Vertical
15+
m_TagString: Vertical Face
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!4 &8677311591215949554
21+
Transform:
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
26+
m_GameObject: {fileID: 5987733302245369492}
27+
serializedVersion: 2
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_ConstrainProportionsScale: 0
32+
m_Children: []
33+
m_Father: {fileID: 481797034475988124}
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
--- !u!61 &3295673469861866340
36+
BoxCollider2D:
37+
m_ObjectHideFlags: 0
38+
m_CorrespondingSourceObject: {fileID: 0}
39+
m_PrefabInstance: {fileID: 0}
40+
m_PrefabAsset: {fileID: 0}
41+
m_GameObject: {fileID: 5987733302245369492}
42+
m_Enabled: 1
43+
m_Density: 1
44+
m_Material: {fileID: 0}
45+
m_IncludeLayers:
46+
serializedVersion: 2
47+
m_Bits: 0
48+
m_ExcludeLayers:
49+
serializedVersion: 2
50+
m_Bits: 0
51+
m_LayerOverridePriority: 0
52+
m_ForceSendLayers:
53+
serializedVersion: 2
54+
m_Bits: 4294967295
55+
m_ForceReceiveLayers:
56+
serializedVersion: 2
57+
m_Bits: 4294967295
58+
m_ContactCaptureLayers:
59+
serializedVersion: 2
60+
m_Bits: 4294967295
61+
m_CallbackLayers:
62+
serializedVersion: 2
63+
m_Bits: 4294967295
64+
m_IsTrigger: 1
65+
m_UsedByEffector: 0
66+
m_UsedByComposite: 0
67+
m_Offset: {x: 0, y: 0}
68+
m_SpriteTilingProperty:
69+
border: {x: 0, y: 0, z: 0, w: 0}
70+
pivot: {x: 0, y: 0}
71+
oldSize: {x: 0, y: 0}
72+
newSize: {x: 0, y: 0}
73+
adaptiveTilingThreshold: 0
74+
drawMode: 0
75+
adaptiveTiling: 0
76+
m_AutoTiling: 0
77+
serializedVersion: 2
78+
m_Size: {x: 1.9, y: 3.11}
79+
m_EdgeRadius: 0
380
--- !u!1001 &8143959938397740006
481
PrefabInstance:
582
m_ObjectHideFlags: 0
@@ -16,12 +93,12 @@ PrefabInstance:
1693
- target: {fileID: 8622853643666898804, guid: d80182c28737a49da8eb864c460fc8fc,
1794
type: 3}
1895
propertyPath: m_Size.x
19-
value: 4
96+
value: 1.9
2097
objectReference: {fileID: 0}
2198
- target: {fileID: 8622853643666898804, guid: d80182c28737a49da8eb864c460fc8fc,
2299
type: 3}
23100
propertyPath: m_Size.y
24-
value: 5.5
101+
value: 1.76
25102
objectReference: {fileID: 0}
26103
- target: {fileID: 8622853643666898804, guid: d80182c28737a49da8eb864c460fc8fc,
27104
type: 3}
@@ -31,7 +108,7 @@ PrefabInstance:
31108
- target: {fileID: 8622853643666898804, guid: d80182c28737a49da8eb864c460fc8fc,
32109
type: 3}
33110
propertyPath: m_Offset.y
34-
value: 0.5
111+
value: 0.675
35112
objectReference: {fileID: 0}
36113
- target: {fileID: 8622853643666898804, guid: d80182c28737a49da8eb864c460fc8fc,
37114
type: 3}
@@ -46,12 +123,12 @@ PrefabInstance:
46123
- target: {fileID: 8622853643666898804, guid: d80182c28737a49da8eb864c460fc8fc,
47124
type: 3}
48125
propertyPath: m_SpriteTilingProperty.oldSize.x
49-
value: 3.8
126+
value: 1.9
50127
objectReference: {fileID: 0}
51128
- target: {fileID: 8622853643666898804, guid: d80182c28737a49da8eb864c460fc8fc,
52129
type: 3}
53130
propertyPath: m_SpriteTilingProperty.oldSize.y
54-
value: 6.22
131+
value: 3.11
55132
objectReference: {fileID: 0}
56133
- target: {fileID: 8622853643666898805, guid: d80182c28737a49da8eb864c460fc8fc,
57134
type: 3}
@@ -274,7 +351,11 @@ PrefabInstance:
274351
objectReference: {fileID: 0}
275352
m_RemovedComponents: []
276353
m_RemovedGameObjects: []
277-
m_AddedGameObjects: []
354+
m_AddedGameObjects:
355+
- targetCorrespondingSourceObject: {fileID: 8622853643666898810, guid: d80182c28737a49da8eb864c460fc8fc,
356+
type: 3}
357+
insertIndex: -1
358+
addedObject: {fileID: 8677311591215949554}
278359
m_AddedComponents: []
279360
m_SourcePrefab: {fileID: 100100000, guid: d80182c28737a49da8eb864c460fc8fc, type: 3}
280361
--- !u!61 &481797034475988114 stripped
@@ -301,3 +382,9 @@ MonoBehaviour:
301382
m_Script: {fileID: 11500000, guid: a50985e4c8f8f49ffad4106720405d80, type: 3}
302383
m_Name:
303384
m_EditorClassIdentifier:
385+
--- !u!4 &481797034475988124 stripped
386+
Transform:
387+
m_CorrespondingSourceObject: {fileID: 8622853643666898810, guid: d80182c28737a49da8eb864c460fc8fc,
388+
type: 3}
389+
m_PrefabInstance: {fileID: 8143959938397740006}
390+
m_PrefabAsset: {fileID: 0}

0 commit comments

Comments
 (0)