Skip to content

Commit 618d586

Browse files
LPLafontaineBLPLafontaineB
committed
Merge branch 'develop' into feature/popup-panel-stacking
2 parents 3797294 + 56f6bd8 commit 618d586

34 files changed

+1118
-5265
lines changed

‎Assets/BossRoom/Prefabs/Shadow.prefab

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ GameObject:
1111
- component: {fileID: 6303958631329717848}
1212
- component: {fileID: 4454327489340259077}
1313
- component: {fileID: 5333105820170809836}
14-
- component: {fileID: 7909660464306370544}
1514
m_Layer: 0
1615
m_Name: Shadow
1716
m_TagString: Untagged
@@ -26,21 +25,21 @@ Transform:
2625
m_PrefabInstance: {fileID: 0}
2726
m_PrefabAsset: {fileID: 0}
2827
m_GameObject: {fileID: 3978040074736837402}
29-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
28+
m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.7071079}
3029
m_LocalPosition: {x: 0, y: 0.03, z: 0}
31-
m_LocalScale: {x: 0.3209305, y: 0.3209305, z: 0.3209305}
30+
m_LocalScale: {x: 3.2, y: 3.2, z: 3.2}
3231
m_Children: []
3332
m_Father: {fileID: 0}
3433
m_RootOrder: 0
35-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34+
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
3635
--- !u!33 &4454327489340259077
3736
MeshFilter:
3837
m_ObjectHideFlags: 0
3938
m_CorrespondingSourceObject: {fileID: 0}
4039
m_PrefabInstance: {fileID: 0}
4140
m_PrefabAsset: {fileID: 0}
4241
m_GameObject: {fileID: 3978040074736837402}
43-
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
42+
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
4443
--- !u!23 &5333105820170809836
4544
MeshRenderer:
4645
m_ObjectHideFlags: 0
@@ -49,11 +48,11 @@ MeshRenderer:
4948
m_PrefabAsset: {fileID: 0}
5049
m_GameObject: {fileID: 3978040074736837402}
5150
m_Enabled: 1
52-
m_CastShadows: 1
51+
m_CastShadows: 0
5352
m_ReceiveShadows: 1
5453
m_DynamicOccludee: 1
5554
m_MotionVectors: 1
56-
m_LightProbeUsage: 1
55+
m_LightProbeUsage: 0
5756
m_ReflectionProbeUsage: 1
5857
m_RayTracingMode: 2
5958
m_RayTraceProcedural: 0
@@ -82,17 +81,3 @@ MeshRenderer:
8281
m_SortingLayer: 0
8382
m_SortingOrder: 0
8483
m_AdditionalVertexStreams: {fileID: 0}
85-
--- !u!64 &7909660464306370544
86-
MeshCollider:
87-
m_ObjectHideFlags: 0
88-
m_CorrespondingSourceObject: {fileID: 0}
89-
m_PrefabInstance: {fileID: 0}
90-
m_PrefabAsset: {fileID: 0}
91-
m_GameObject: {fileID: 3978040074736837402}
92-
m_Material: {fileID: 0}
93-
m_IsTrigger: 0
94-
m_Enabled: 1
95-
serializedVersion: 4
96-
m_Convex: 0
97-
m_CookingOptions: 30
98-
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}

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

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ MonoBehaviour:
351351
m_EditorClassIdentifier:
352352
m_Material: {fileID: 0}
353353
m_Color: {r: 1, g: 1, b: 1, a: 1}
354-
m_RaycastTarget: 1
354+
m_RaycastTarget: 0
355355
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
356356
m_Maskable: 1
357357
m_OnCullStateChanged:
@@ -1014,7 +1014,7 @@ MonoBehaviour:
10141014
m_EditorClassIdentifier:
10151015
m_Material: {fileID: 0}
10161016
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, a: 1}
1017-
m_RaycastTarget: 1
1017+
m_RaycastTarget: 0
10181018
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
10191019
m_Maskable: 1
10201020
m_OnCullStateChanged:
@@ -1105,7 +1105,7 @@ MonoBehaviour:
11051105
m_EditorClassIdentifier:
11061106
m_Material: {fileID: 0}
11071107
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, a: 1}
1108-
m_RaycastTarget: 1
1108+
m_RaycastTarget: 0
11091109
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
11101110
m_Maskable: 1
11111111
m_OnCullStateChanged:
@@ -1226,7 +1226,6 @@ GameObject:
12261226
- component: {fileID: 2057931095918228162}
12271227
- component: {fileID: 3217480593287788585}
12281228
- component: {fileID: 2242940246583725761}
1229-
- component: {fileID: 5835693888197301866}
12301229
- component: {fileID: 4351232040011826679}
12311230
m_Layer: 5
12321231
m_Name: JoinButton
@@ -1295,21 +1294,6 @@ MonoBehaviour:
12951294
m_FillOrigin: 0
12961295
m_UseSpriteMesh: 0
12971296
m_PixelsPerUnitMultiplier: 1.5
1298-
--- !u!114 &5835693888197301866
1299-
MonoBehaviour:
1300-
m_ObjectHideFlags: 0
1301-
m_CorrespondingSourceObject: {fileID: 0}
1302-
m_PrefabInstance: {fileID: 0}
1303-
m_PrefabAsset: {fileID: 0}
1304-
m_GameObject: {fileID: 3825292631697100053}
1305-
m_Enabled: 1
1306-
m_EditorHideFlags: 0
1307-
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
1308-
m_Name:
1309-
m_EditorClassIdentifier:
1310-
m_TintColors:
1311-
- {r: 1, g: 1, b: 1, a: 1}
1312-
- {r: 1, g: 1, b: 1, a: 1}
13131297
--- !u!114 &4351232040011826679
13141298
MonoBehaviour:
13151299
m_ObjectHideFlags: 0
@@ -2086,7 +2070,7 @@ MonoBehaviour:
20862070
m_EditorClassIdentifier:
20872071
m_Material: {fileID: 0}
20882072
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, a: 1}
2089-
m_RaycastTarget: 1
2073+
m_RaycastTarget: 0
20902074
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
20912075
m_Maskable: 1
20922076
m_OnCullStateChanged:
@@ -2991,10 +2975,8 @@ MonoBehaviour:
29912975
m_PlayerNameLabel: {fileID: 7328528642576607773}
29922976
m_IPJoiningUI: {fileID: 4035387343632270047}
29932977
m_IPHostingUI: {fileID: 6512829474060433337}
2994-
m_JoinTabButtonTinter: {fileID: 5835693888197301866}
29952978
m_JoinTabButtonHighlightTinter: {fileID: 3300828701031786671}
29962979
m_JoinTabButtonTabBlockerTinter: {fileID: 3953053990258396426}
2997-
m_HostTabButtonTinter: {fileID: 8675839305897455978}
29982980
m_HostTabButtonHighlightTinter: {fileID: 1839781279224386958}
29992981
m_HostTabButtonTabBlockerTinter: {fileID: 8260437346995034578}
30002982
m_SignInSpinner: {fileID: 8543714399569277319}
@@ -3057,7 +3039,7 @@ MonoBehaviour:
30573039
m_EditorClassIdentifier:
30583040
m_Material: {fileID: 0}
30593041
m_Color: {r: 1, g: 1, b: 1, a: 1}
3060-
m_RaycastTarget: 1
3042+
m_RaycastTarget: 0
30613043
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
30623044
m_Maskable: 1
30633045
m_OnCullStateChanged:
@@ -3558,7 +3540,7 @@ MonoBehaviour:
35583540
m_EditorClassIdentifier:
35593541
m_Material: {fileID: 0}
35603542
m_Color: {r: 1, g: 1, b: 1, a: 1}
3561-
m_RaycastTarget: 1
3543+
m_RaycastTarget: 0
35623544
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
35633545
m_Maskable: 1
35643546
m_OnCullStateChanged:
@@ -3633,7 +3615,7 @@ MonoBehaviour:
36333615
m_EditorClassIdentifier:
36343616
m_Material: {fileID: 0}
36353617
m_Color: {r: 1, g: 1, b: 1, a: 1}
3636-
m_RaycastTarget: 1
3618+
m_RaycastTarget: 0
36373619
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
36383620
m_Maskable: 1
36393621
m_OnCullStateChanged:
@@ -4029,7 +4011,6 @@ GameObject:
40294011
- component: {fileID: 4258862478995995494}
40304012
- component: {fileID: 1519931548906777285}
40314013
- component: {fileID: 4083683571038336106}
4032-
- component: {fileID: 8675839305897455978}
40334014
- component: {fileID: 996135322976812024}
40344015
m_Layer: 5
40354016
m_Name: CreateButton
@@ -4098,21 +4079,6 @@ MonoBehaviour:
40984079
m_FillOrigin: 0
40994080
m_UseSpriteMesh: 0
41004081
m_PixelsPerUnitMultiplier: 1.5
4101-
--- !u!114 &8675839305897455978
4102-
MonoBehaviour:
4103-
m_ObjectHideFlags: 0
4104-
m_CorrespondingSourceObject: {fileID: 0}
4105-
m_PrefabInstance: {fileID: 0}
4106-
m_PrefabAsset: {fileID: 0}
4107-
m_GameObject: {fileID: 8406754363237041140}
4108-
m_Enabled: 1
4109-
m_EditorHideFlags: 0
4110-
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
4111-
m_Name:
4112-
m_EditorClassIdentifier:
4113-
m_TintColors:
4114-
- {r: 1, g: 1, b: 1, a: 1}
4115-
- {r: 1, g: 1, b: 1, a: 1}
41164082
--- !u!114 &996135322976812024
41174083
MonoBehaviour:
41184084
m_ObjectHideFlags: 0
@@ -4513,7 +4479,7 @@ MonoBehaviour:
45134479
m_EditorClassIdentifier:
45144480
m_Material: {fileID: 0}
45154481
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, a: 1}
4516-
m_RaycastTarget: 1
4482+
m_RaycastTarget: 0
45174483
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
45184484
m_Maskable: 1
45194485
m_OnCullStateChanged:

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

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ MonoBehaviour:
127127
m_EditorClassIdentifier:
128128
m_Material: {fileID: 0}
129129
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, a: 1}
130-
m_RaycastTarget: 1
130+
m_RaycastTarget: 0
131131
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
132132
m_Maskable: 1
133133
m_OnCullStateChanged:
@@ -217,7 +217,7 @@ MonoBehaviour:
217217
m_EditorClassIdentifier:
218218
m_Material: {fileID: 0}
219219
m_Color: {r: 1, g: 1, b: 1, a: 1}
220-
m_RaycastTarget: 1
220+
m_RaycastTarget: 0
221221
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
222222
m_Maskable: 1
223223
m_OnCullStateChanged:
@@ -995,7 +995,6 @@ GameObject:
995995
- component: {fileID: 4996778416574021528}
996996
- component: {fileID: 1242736280487814429}
997997
- component: {fileID: 6028373986916100015}
998-
- component: {fileID: 6915400021973830416}
999998
- component: {fileID: 60699266497995633}
1000999
m_Layer: 5
10011000
m_Name: JoinButton
@@ -1064,21 +1063,6 @@ MonoBehaviour:
10641063
m_FillOrigin: 0
10651064
m_UseSpriteMesh: 0
10661065
m_PixelsPerUnitMultiplier: 1.5
1067-
--- !u!114 &6915400021973830416
1068-
MonoBehaviour:
1069-
m_ObjectHideFlags: 0
1070-
m_CorrespondingSourceObject: {fileID: 0}
1071-
m_PrefabInstance: {fileID: 0}
1072-
m_PrefabAsset: {fileID: 0}
1073-
m_GameObject: {fileID: 2280189352372853816}
1074-
m_Enabled: 1
1075-
m_EditorHideFlags: 0
1076-
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
1077-
m_Name:
1078-
m_EditorClassIdentifier:
1079-
m_TintColors:
1080-
- {r: 1, g: 1, b: 1, a: 1}
1081-
- {r: 1, g: 1, b: 1, a: 1}
10821066
--- !u!114 &60699266497995633
10831067
MonoBehaviour:
10841068
m_ObjectHideFlags: 0
@@ -1465,7 +1449,7 @@ MonoBehaviour:
14651449
m_EditorClassIdentifier:
14661450
m_Material: {fileID: 0}
14671451
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, a: 1}
1468-
m_RaycastTarget: 1
1452+
m_RaycastTarget: 0
14691453
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
14701454
m_Maskable: 1
14711455
m_OnCullStateChanged:
@@ -1664,7 +1648,6 @@ GameObject:
16641648
- component: {fileID: 282255004005152861}
16651649
- component: {fileID: 5754057292363824191}
16661650
- component: {fileID: 6125749772841147739}
1667-
- component: {fileID: 7081295359045549679}
16681651
- component: {fileID: 1477683225176343646}
16691652
m_Layer: 5
16701653
m_Name: CreateButton
@@ -1733,21 +1716,6 @@ MonoBehaviour:
17331716
m_FillOrigin: 0
17341717
m_UseSpriteMesh: 0
17351718
m_PixelsPerUnitMultiplier: 1.5
1736-
--- !u!114 &7081295359045549679
1737-
MonoBehaviour:
1738-
m_ObjectHideFlags: 0
1739-
m_CorrespondingSourceObject: {fileID: 0}
1740-
m_PrefabInstance: {fileID: 0}
1741-
m_PrefabAsset: {fileID: 0}
1742-
m_GameObject: {fileID: 3672577566589301672}
1743-
m_Enabled: 1
1744-
m_EditorHideFlags: 0
1745-
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
1746-
m_Name:
1747-
m_EditorClassIdentifier:
1748-
m_TintColors:
1749-
- {r: 1, g: 1, b: 1, a: 1}
1750-
- {r: 1, g: 1, b: 1, a: 1}
17511719
--- !u!114 &1477683225176343646
17521720
MonoBehaviour:
17531721
m_ObjectHideFlags: 0
@@ -2454,7 +2422,7 @@ MonoBehaviour:
24542422
m_EditorClassIdentifier:
24552423
m_Material: {fileID: 0}
24562424
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, a: 1}
2457-
m_RaycastTarget: 1
2425+
m_RaycastTarget: 0
24582426
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
24592427
m_Maskable: 1
24602428
m_OnCullStateChanged:
@@ -3074,7 +3042,7 @@ MonoBehaviour:
30743042
m_EditorClassIdentifier:
30753043
m_Material: {fileID: 0}
30763044
m_Color: {r: 1, g: 1, b: 1, a: 1}
3077-
m_RaycastTarget: 1
3045+
m_RaycastTarget: 0
30783046
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
30793047
m_Maskable: 1
30803048
m_OnCullStateChanged:
@@ -3149,7 +3117,7 @@ MonoBehaviour:
31493117
m_EditorClassIdentifier:
31503118
m_Material: {fileID: 0}
31513119
m_Color: {r: 1, g: 1, b: 1, a: 1}
3152-
m_RaycastTarget: 1
3120+
m_RaycastTarget: 0
31533121
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
31543122
m_Maskable: 1
31553123
m_OnCullStateChanged:
@@ -3834,7 +3802,7 @@ MonoBehaviour:
38343802
m_EditorClassIdentifier:
38353803
m_Material: {fileID: 0}
38363804
m_Color: {r: 1, g: 1, b: 1, a: 1}
3837-
m_RaycastTarget: 1
3805+
m_RaycastTarget: 0
38383806
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
38393807
m_Maskable: 1
38403808
m_OnCullStateChanged:
@@ -4077,10 +4045,8 @@ MonoBehaviour:
40774045
m_CanvasGroup: {fileID: 6889764071769254414}
40784046
m_LobbyJoiningUI: {fileID: 3432713757992463987}
40794047
m_LobbyCreationUI: {fileID: 5370165130166260100}
4080-
m_JoinToggle: {fileID: 6915400021973830416}
40814048
m_JoinToggleHighlight: {fileID: 6752777071945805011}
40824049
m_JoinToggleTabBlocker: {fileID: 4806072236846957327}
4083-
m_CreateToggle: {fileID: 7081295359045549679}
40844050
m_CreateToggleHighlight: {fileID: 4585101913867269799}
40854051
m_CreateToggleTabBlocker: {fileID: 1276364547110863194}
40864052
m_PlayerNameLabel: {fileID: 7676773602323508701}
@@ -4298,7 +4264,7 @@ MonoBehaviour:
42984264
m_faceColor:
42994265
serializedVersion: 2
43004266
rgba: 4294967295
4301-
m_fontSize: 20.3
4267+
m_fontSize: 33
43024268
m_fontSizeBase: 36
43034269
m_fontWeight: 400
43044270
m_enableAutoSizing: 1
@@ -4460,7 +4426,7 @@ MonoBehaviour:
44604426
m_TargetGraphic: {fileID: 6773627913577560496}
44614427
m_HandleRect: {fileID: 2234904744820987572}
44624428
m_Direction: 2
4463-
m_Value: 0
4429+
m_Value: 1
44644430
m_Size: 1
44654431
m_NumberOfSteps: 0
44664432
m_OnValueChanged:
@@ -5105,7 +5071,7 @@ MonoBehaviour:
51055071
m_faceColor:
51065072
serializedVersion: 2
51075073
rgba: 4294967295
5108-
m_fontSize: 20.3
5074+
m_fontSize: 33
51095075
m_fontSizeBase: 36
51105076
m_fontWeight: 400
51115077
m_enableAutoSizing: 1
@@ -5783,7 +5749,7 @@ MonoBehaviour:
57835749
m_EditorClassIdentifier:
57845750
m_Material: {fileID: 0}
57855751
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, a: 1}
5786-
m_RaycastTarget: 1
5752+
m_RaycastTarget: 0
57875753
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
57885754
m_Maskable: 1
57895755
m_OnCullStateChanged:

0 commit comments

Comments
 (0)