Skip to content

Commit 761c691

Browse files
SamuelBellomoSamuelBellomo
committed
Merge branch 'release/GDC2022' into sam/fix/adding-transport-RTT-to-UI-stats
* release/GDC2022: added IP button to main menu (#535) fix: postgame menu button (#523) chore: adding leak detect (#492) Cherry pick: lobby blue banner fix, mainmenu.unity scene merge conflict resolved with unity merge tool (#534) Filled in some holes in the floor (#527) (#533) fix: populate lobby room name if creation room input field is empty (#522) lobby fix: Adding instructions when we get a service error on conflicting joins (#511) feat: auto reconnect (#513)
2 parents 69fa623 + b956e5d commit 761c691

Some content is hidden

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

42 files changed

+1443
-874
lines changed

‎.github/workflows/leak_detect.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Detect Project ID leak
2+
3+
# Controls when the workflow will run
4+
on:
5+
# Triggers the workflow on push or pull request events but only for the main branch
6+
push:
7+
8+
# Allows you to run this workflow manually from the Actions tab
9+
workflow_dispatch:
10+
11+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
12+
jobs:
13+
# This workflow contains a single job called "build"
14+
check:
15+
# The type of runner that the job will run on
16+
runs-on: ubuntu-latest
17+
18+
# Steps represent a sequence of tasks that will be executed as part of the job
19+
steps:
20+
- name: Checkout github repo (+ download lfs dependencies)
21+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
22+
uses: actions/checkout@v2
23+
with:
24+
lfs: true
25+
- name: Checkout LFS objects # needs to be done as a second step, lfs:true above just sets references, but doesn't actually dereference them...
26+
run: git lfs checkout
27+
# Find in project settings if there's any value in between "cloudProjectId: " and end of line. This exits 1 and fails the step if there's text there.
28+
- name: Run a one-line script
29+
run: python3 -c "import re; import sys;content=open('ProjectSettings/ProjectSettings.asset').read();res = re.search(r'.*cloudProjectId:.*\w+\s*\n', content)!=None;status = 1 if res else 0; print('status '+str(status)); sys.exit(res)"
30+
- name: Post to slack on failure
31+
if: ${{ failure() }}
32+
uses: slackapi/[email protected]
33+
with:
34+
# Slack channel id, channel name, or user id to post message.
35+
# See also: https://api.slack.com/methods/chat.postMessage#channels
36+
channel-id: 'G01H7JP4AP2' # private channel
37+
# For posting a simple plain text message
38+
slack-message: "Project ID LEAK DETECTED: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
39+
env:
40+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} # can be found in https://api.slack.com/apps/

‎Assets/BossRoom/Prefabs/Dungeon/BossRoom.prefab

Lines changed: 87 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ Transform:
432432
- {fileID: 7867852344355884709}
433433
- {fileID: 4138240087403568044}
434434
- {fileID: 8887438673195068678}
435+
- {fileID: 8289508416153001268}
435436
m_Father: {fileID: 0}
436437
m_RootOrder: 0
437438
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -454,10 +455,6 @@ PrefabInstance:
454455
propertyPath: m_LocalPosition.y
455456
value: -0.0000047645412
456457
objectReference: {fileID: 0}
457-
- target: {fileID: 3325143161705299546, guid: 25ef8f3b7c676ec4994e31f9806fb988, type: 3}
458-
propertyPath: m_LocalPosition.z
459-
value: 108.99998
460-
objectReference: {fileID: 0}
461458
- target: {fileID: 3325143161705299546, guid: 25ef8f3b7c676ec4994e31f9806fb988, type: 3}
462459
propertyPath: m_LocalRotation.w
463460
value: 1
@@ -6748,31 +6745,31 @@ PrefabInstance:
67486745
objectReference: {fileID: 0}
67496746
m_RemovedComponents: []
67506747
m_SourcePrefab: {fileID: 100100000, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
6751-
--- !u!108 &630916705848015862 stripped
6752-
Light:
6753-
m_CorrespondingSourceObject: {fileID: 1616884588323289830, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
6748+
--- !u!4 &8074448873891158056 stripped
6749+
Transform:
6750+
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
67546751
m_PrefabInstance: {fileID: 2211589100949864720}
67556752
m_PrefabAsset: {fileID: 0}
6756-
--- !u!108 &1247694266230675825 stripped
6753+
--- !u!108 &630916705848015862 stripped
67576754
Light:
6758-
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
6755+
m_CorrespondingSourceObject: {fileID: 1616884588323289830, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
67596756
m_PrefabInstance: {fileID: 2211589100949864720}
67606757
m_PrefabAsset: {fileID: 0}
67616758
--- !u!1 &602357202979843451 stripped
67626759
GameObject:
67636760
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
67646761
m_PrefabInstance: {fileID: 2211589100949864720}
67656762
m_PrefabAsset: {fileID: 0}
6766-
--- !u!4 &8074448873891158056 stripped
6767-
Transform:
6768-
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
6769-
m_PrefabInstance: {fileID: 2211589100949864720}
6770-
m_PrefabAsset: {fileID: 0}
67716763
--- !u!1 &8632535556475219616 stripped
67726764
GameObject:
67736765
m_CorrespondingSourceObject: {fileID: 7601453607532916656, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
67746766
m_PrefabInstance: {fileID: 2211589100949864720}
67756767
m_PrefabAsset: {fileID: 0}
6768+
--- !u!108 &1247694266230675825 stripped
6769+
Light:
6770+
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
6771+
m_PrefabInstance: {fileID: 2211589100949864720}
6772+
m_PrefabAsset: {fileID: 0}
67766773
--- !u!114 &5119945755969724262
67776774
MonoBehaviour:
67786775
m_ObjectHideFlags: 0
@@ -11349,6 +11346,72 @@ Transform:
1134911346
m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
1135011347
m_PrefabInstance: {fileID: 3512188034804301127}
1135111348
m_PrefabAsset: {fileID: 0}
11349+
--- !u!1001 &3534104906077248521
11350+
PrefabInstance:
11351+
m_ObjectHideFlags: 0
11352+
serializedVersion: 2
11353+
m_Modification:
11354+
m_TransformParent: {fileID: 7243886634180294756}
11355+
m_Modifications:
11356+
- target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11357+
propertyPath: m_Enabled
11358+
value: 1
11359+
objectReference: {fileID: 0}
11360+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11361+
propertyPath: m_RootOrder
11362+
value: 405
11363+
objectReference: {fileID: 0}
11364+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11365+
propertyPath: m_LocalPosition.x
11366+
value: 76
11367+
objectReference: {fileID: 0}
11368+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11369+
propertyPath: m_LocalPosition.y
11370+
value: 0.000007693204
11371+
objectReference: {fileID: 0}
11372+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11373+
propertyPath: m_LocalPosition.z
11374+
value: 15.99998
11375+
objectReference: {fileID: 0}
11376+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11377+
propertyPath: m_LocalRotation.w
11378+
value: 1
11379+
objectReference: {fileID: 0}
11380+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11381+
propertyPath: m_LocalRotation.x
11382+
value: 0.000000043711378
11383+
objectReference: {fileID: 0}
11384+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11385+
propertyPath: m_LocalRotation.y
11386+
value: 0.00000011920929
11387+
objectReference: {fileID: 0}
11388+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11389+
propertyPath: m_LocalRotation.z
11390+
value: -0.00000008742278
11391+
objectReference: {fileID: 0}
11392+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11393+
propertyPath: m_LocalEulerAnglesHint.x
11394+
value: 0
11395+
objectReference: {fileID: 0}
11396+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11397+
propertyPath: m_LocalEulerAnglesHint.y
11398+
value: 0
11399+
objectReference: {fileID: 0}
11400+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11401+
propertyPath: m_LocalEulerAnglesHint.z
11402+
value: 0
11403+
objectReference: {fileID: 0}
11404+
- target: {fileID: 6858229082375244730, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11405+
propertyPath: m_Name
11406+
value: env_floor1 (10)
11407+
objectReference: {fileID: 0}
11408+
m_RemovedComponents: []
11409+
m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11410+
--- !u!4 &8289508416153001268 stripped
11411+
Transform:
11412+
m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
11413+
m_PrefabInstance: {fileID: 3534104906077248521}
11414+
m_PrefabAsset: {fileID: 0}
1135211415
--- !u!1001 &3562497777173869688
1135311416
PrefabInstance:
1135411417
m_ObjectHideFlags: 0
@@ -15542,21 +15605,11 @@ PrefabInstance:
1554215605
objectReference: {fileID: 0}
1554315606
m_RemovedComponents: []
1554415607
m_SourcePrefab: {fileID: 100100000, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
15545-
--- !u!1 &6158980800265356021 stripped
15546-
GameObject:
15547-
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
15548-
m_PrefabInstance: {fileID: 4869583451704553118}
15549-
m_PrefabAsset: {fileID: 0}
1555015608
--- !u!1 &3092272623483355438 stripped
1555115609
GameObject:
1555215610
m_CorrespondingSourceObject: {fileID: 7601453607532916656, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
1555315611
m_PrefabInstance: {fileID: 4869583451704553118}
1555415612
m_PrefabAsset: {fileID: 0}
15555-
--- !u!4 &3254744293496305574 stripped
15556-
Transform:
15557-
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
15558-
m_PrefabInstance: {fileID: 4869583451704553118}
15559-
m_PrefabAsset: {fileID: 0}
1556015613
--- !u!108 &6189194581216089208 stripped
1556115614
Light:
1556215615
m_CorrespondingSourceObject: {fileID: 1616884588323289830, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
@@ -15567,6 +15620,16 @@ Light:
1556715620
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
1556815621
m_PrefabInstance: {fileID: 4869583451704553118}
1556915622
m_PrefabAsset: {fileID: 0}
15623+
--- !u!1 &6158980800265356021 stripped
15624+
GameObject:
15625+
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
15626+
m_PrefabInstance: {fileID: 4869583451704553118}
15627+
m_PrefabAsset: {fileID: 0}
15628+
--- !u!4 &3254744293496305574 stripped
15629+
Transform:
15630+
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
15631+
m_PrefabInstance: {fileID: 4869583451704553118}
15632+
m_PrefabAsset: {fileID: 0}
1557015633
--- !u!114 &3127095706194231339
1557115634
MonoBehaviour:
1557215635
m_ObjectHideFlags: 0

‎Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_floor6.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Transform:
2828
m_PrefabAsset: {fileID: 0}
2929
m_GameObject: {fileID: 4371491365999748502}
3030
m_LocalRotation: {x: 0.000000021855694, y: 0.00000011920929, z: -2.6054018e-15, w: 1}
31-
m_LocalPosition: {x: 0, y: 0, z: 0}
31+
m_LocalPosition: {x: 0, y: 0, z: 107.99998}
3232
m_LocalScale: {x: 1, y: 1, z: 1}
3333
m_Children: []
3434
m_Father: {fileID: 0}

‎Assets/BossRoom/Prefabs/Dungeon/Entrance.prefab

Lines changed: 78 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ Transform:
248248
- {fileID: 738705630915668208}
249249
- {fileID: 8998074154055278213}
250250
- {fileID: 8843797310243302815}
251+
- {fileID: 5044464642502902394}
251252
m_Father: {fileID: 0}
252253
m_RootOrder: 0
253254
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -623,6 +624,72 @@ Transform:
623624
m_CorrespondingSourceObject: {fileID: 6923725348669878280, guid: 2e8b2f19951d26e45920350db546ec1b, type: 3}
624625
m_PrefabInstance: {fileID: 212319315871566379}
625626
m_PrefabAsset: {fileID: 0}
627+
--- !u!1001 &288265086009426759
628+
PrefabInstance:
629+
m_ObjectHideFlags: 0
630+
serializedVersion: 2
631+
m_Modification:
632+
m_TransformParent: {fileID: 1143081499798261330}
633+
m_Modifications:
634+
- target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
635+
propertyPath: m_Enabled
636+
value: 1
637+
objectReference: {fileID: 0}
638+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
639+
propertyPath: m_RootOrder
640+
value: 221
641+
objectReference: {fileID: 0}
642+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
643+
propertyPath: m_LocalPosition.x
644+
value: 12
645+
objectReference: {fileID: 0}
646+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
647+
propertyPath: m_LocalPosition.y
648+
value: 0
649+
objectReference: {fileID: 0}
650+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
651+
propertyPath: m_LocalPosition.z
652+
value: -8
653+
objectReference: {fileID: 0}
654+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
655+
propertyPath: m_LocalRotation.w
656+
value: 1
657+
objectReference: {fileID: 0}
658+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
659+
propertyPath: m_LocalRotation.x
660+
value: 0.000000043711378
661+
objectReference: {fileID: 0}
662+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
663+
propertyPath: m_LocalRotation.y
664+
value: 0.00000011920929
665+
objectReference: {fileID: 0}
666+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
667+
propertyPath: m_LocalRotation.z
668+
value: -0.00000008742278
669+
objectReference: {fileID: 0}
670+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
671+
propertyPath: m_LocalEulerAnglesHint.x
672+
value: 0
673+
objectReference: {fileID: 0}
674+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
675+
propertyPath: m_LocalEulerAnglesHint.y
676+
value: 0
677+
objectReference: {fileID: 0}
678+
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
679+
propertyPath: m_LocalEulerAnglesHint.z
680+
value: 0
681+
objectReference: {fileID: 0}
682+
- target: {fileID: 6858229082375244730, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
683+
propertyPath: m_Name
684+
value: env_floor1 (5)
685+
objectReference: {fileID: 0}
686+
m_RemovedComponents: []
687+
m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
688+
--- !u!4 &5044464642502902394 stripped
689+
Transform:
690+
m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
691+
m_PrefabInstance: {fileID: 288265086009426759}
692+
m_PrefabAsset: {fileID: 0}
626693
--- !u!1001 &330771298698531092
627694
PrefabInstance:
628695
m_ObjectHideFlags: 0
@@ -1438,31 +1505,31 @@ PrefabInstance:
14381505
objectReference: {fileID: 0}
14391506
m_RemovedComponents: []
14401507
m_SourcePrefab: {fileID: 100100000, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
1441-
--- !u!108 &304716794938965296 stripped
1442-
Light:
1443-
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
1508+
--- !u!1 &7108593661045394145 stripped
1509+
GameObject:
1510+
m_CorrespondingSourceObject: {fileID: 7601453607532916656, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
1511+
m_PrefabInstance: {fileID: 854282660529841489}
1512+
m_PrefabAsset: {fileID: 0}
1513+
--- !u!1 &2104906929298262330 stripped
1514+
GameObject:
1515+
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
14441516
m_PrefabInstance: {fileID: 854282660529841489}
14451517
m_PrefabAsset: {fileID: 0}
14461518
--- !u!108 &2137897533852622775 stripped
14471519
Light:
14481520
m_CorrespondingSourceObject: {fileID: 1616884588323289830, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
14491521
m_PrefabInstance: {fileID: 854282660529841489}
14501522
m_PrefabAsset: {fileID: 0}
1451-
--- !u!1 &7108593661045394145 stripped
1452-
GameObject:
1453-
m_CorrespondingSourceObject: {fileID: 7601453607532916656, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
1523+
--- !u!108 &304716794938965296 stripped
1524+
Light:
1525+
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
14541526
m_PrefabInstance: {fileID: 854282660529841489}
14551527
m_PrefabAsset: {fileID: 0}
14561528
--- !u!4 &7305988015225306217 stripped
14571529
Transform:
14581530
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
14591531
m_PrefabInstance: {fileID: 854282660529841489}
14601532
m_PrefabAsset: {fileID: 0}
1461-
--- !u!1 &2104906929298262330 stripped
1462-
GameObject:
1463-
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
1464-
m_PrefabInstance: {fileID: 854282660529841489}
1465-
m_PrefabAsset: {fileID: 0}
14661533
--- !u!114 &1977884657892176400
14671534
MonoBehaviour:
14681535
m_ObjectHideFlags: 0

‎Assets/BossRoom/Prefabs/UI/IPPopup.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ RectTransform:
702702
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
703703
m_AnchorMin: {x: 0, y: 0}
704704
m_AnchorMax: {x: 1, y: 1}
705-
m_AnchoredPosition: {x: 0, y: 22.255005}
705+
m_AnchoredPosition: {x: 0, y: 22.25586}
706706
m_SizeDelta: {x: -56.80005, y: -183.4901}
707707
m_Pivot: {x: 0.5, y: 0.5}
708708
--- !u!1 &2274408371027572952
@@ -3753,7 +3753,7 @@ RectTransform:
37533753
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37543754
m_AnchorMin: {x: 0, y: 0}
37553755
m_AnchorMax: {x: 1, y: 0}
3756-
m_AnchoredPosition: {x: 0, y: 19.489996}
3756+
m_AnchoredPosition: {x: 0, y: 19.490234}
37573757
m_SizeDelta: {x: -56.80005, y: 93.6504}
37583758
m_Pivot: {x: 0.5, y: 0}
37593759
--- !u!114 &1813113455366746254

0 commit comments

Comments
 (0)