Skip to content

Commit 46076cc

Browse files
Elfi0KuhndorfElfi0Kuhndorf
committed
Merge branch 'UTIK_suggestions' into feat_boss_room_PostGameUI_settingsPanel
2 parents 5fbb0f9 + 0fdffa8 commit 46076cc

File tree

12 files changed

+337
-239
lines changed

12 files changed

+337
-239
lines changed

‎Assets/Prefabs/State/BossRoomState.prefab‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Transform:
2626
m_PrefabInstance: {fileID: 0}
2727
m_PrefabAsset: {fileID: 0}
2828
m_GameObject: {fileID: 297185343939699586}
29+
serializedVersion: 2
2930
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3031
m_LocalPosition: {x: 0, y: 0, z: 0}
3132
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -40,7 +41,6 @@ Transform:
4041
- {fileID: 8725901042666772653}
4142
- {fileID: 7239491272522478247}
4243
m_Father: {fileID: 0}
43-
m_RootOrder: 0
4444
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4545
--- !u!114 &3608714310874968837
4646
MonoBehaviour:
@@ -54,13 +54,19 @@ MonoBehaviour:
5454
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
5555
m_Name:
5656
m_EditorClassIdentifier:
57-
GlobalObjectIdHash: 951099334
57+
GlobalObjectIdHash: 3855040645
58+
InScenePlacedSourceGlobalObjectIdHash: 0
59+
DeferredDespawnTick: 0
60+
Ownership: 1
5861
AlwaysReplicateAsRoot: 0
5962
SynchronizeTransform: 0
6063
ActiveSceneSynchronization: 0
6164
SceneMigrationSynchronization: 1
65+
SpawnWithObservers: 1
6266
DontDestroyWithOwner: 0
6367
AutoObjectParentSync: 1
68+
SyncOwnerTransformWhenParented: 1
69+
AllowOwnerToParent: 0
6470
--- !u!114 &5762482089640033414
6571
MonoBehaviour:
6672
m_ObjectHideFlags: 0
@@ -76,7 +82,10 @@ MonoBehaviour:
7682
parentReference:
7783
TypeName: Unity.BossRoom.ApplicationLifecycle.ApplicationController
7884
autoRun: 1
79-
autoInjectGameObjects: []
85+
autoInjectGameObjects:
86+
- {fileID: 0}
87+
- {fileID: 0}
88+
- {fileID: 0}
8089
m_NetcodeHooks: {fileID: 1290852967062359934}
8190
m_PlayerPrefab: {fileID: 6009713983291384767, guid: 8237adf32a9b6de4892e6febe6b4bdef, type: 3}
8291
m_PlayerSpawnPoints:
@@ -100,6 +109,7 @@ MonoBehaviour:
100109
m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
101110
m_Name:
102111
m_EditorClassIdentifier:
112+
ShowTopMostFoldoutHeaderGroup: 1
103113
--- !u!1 &1088799320945899822
104114
GameObject:
105115
m_ObjectHideFlags: 0
@@ -123,13 +133,13 @@ Transform:
123133
m_PrefabInstance: {fileID: 0}
124134
m_PrefabAsset: {fileID: 0}
125135
m_GameObject: {fileID: 1088799320945899822}
136+
serializedVersion: 2
126137
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
127138
m_LocalPosition: {x: -1, y: 0, z: 2}
128139
m_LocalScale: {x: 1, y: 1, z: 1}
129140
m_ConstrainProportionsScale: 0
130141
m_Children: []
131142
m_Father: {fileID: 5655447013084909147}
132-
m_RootOrder: 4
133143
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
134144
--- !u!1 &1514641935926907818
135145
GameObject:
@@ -154,13 +164,13 @@ Transform:
154164
m_PrefabInstance: {fileID: 0}
155165
m_PrefabAsset: {fileID: 0}
156166
m_GameObject: {fileID: 1514641935926907818}
167+
serializedVersion: 2
157168
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
158169
m_LocalPosition: {x: 8, y: 0, z: 2}
159170
m_LocalScale: {x: 1, y: 1, z: 1}
160171
m_ConstrainProportionsScale: 0
161172
m_Children: []
162173
m_Father: {fileID: 5655447013084909147}
163-
m_RootOrder: 7
164174
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
165175
--- !u!1 &1963938774227499709
166176
GameObject:
@@ -185,13 +195,13 @@ Transform:
185195
m_PrefabInstance: {fileID: 0}
186196
m_PrefabAsset: {fileID: 0}
187197
m_GameObject: {fileID: 1963938774227499709}
198+
serializedVersion: 2
188199
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
189200
m_LocalPosition: {x: 4, y: 0, z: 4}
190201
m_LocalScale: {x: 1, y: 1, z: 1}
191202
m_ConstrainProportionsScale: 0
192203
m_Children: []
193204
m_Father: {fileID: 5655447013084909147}
194-
m_RootOrder: 2
195205
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
196206
--- !u!1 &4557113922522348671
197207
GameObject:
@@ -216,13 +226,13 @@ Transform:
216226
m_PrefabInstance: {fileID: 0}
217227
m_PrefabAsset: {fileID: 0}
218228
m_GameObject: {fileID: 4557113922522348671}
229+
serializedVersion: 2
219230
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
220231
m_LocalPosition: {x: 7, y: 0, z: 4}
221232
m_LocalScale: {x: 1, y: 1, z: 1}
222233
m_ConstrainProportionsScale: 0
223234
m_Children: []
224235
m_Father: {fileID: 5655447013084909147}
225-
m_RootOrder: 3
226236
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
227237
--- !u!1 &6672739281842085047
228238
GameObject:
@@ -247,13 +257,13 @@ Transform:
247257
m_PrefabInstance: {fileID: 0}
248258
m_PrefabAsset: {fileID: 0}
249259
m_GameObject: {fileID: 6672739281842085047}
260+
serializedVersion: 2
250261
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
251262
m_LocalPosition: {x: -2, y: 0, z: 4}
252263
m_LocalScale: {x: 1, y: 1, z: 1}
253264
m_ConstrainProportionsScale: 0
254265
m_Children: []
255266
m_Father: {fileID: 5655447013084909147}
256-
m_RootOrder: 0
257267
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
258268
--- !u!1 &7050848846150978064
259269
GameObject:
@@ -278,13 +288,13 @@ Transform:
278288
m_PrefabInstance: {fileID: 0}
279289
m_PrefabAsset: {fileID: 0}
280290
m_GameObject: {fileID: 7050848846150978064}
291+
serializedVersion: 2
281292
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
282293
m_LocalPosition: {x: 5, y: 0, z: 2}
283294
m_LocalScale: {x: 1, y: 1, z: 1}
284295
m_ConstrainProportionsScale: 0
285296
m_Children: []
286297
m_Father: {fileID: 5655447013084909147}
287-
m_RootOrder: 6
288298
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
289299
--- !u!1 &7682807672526693023
290300
GameObject:
@@ -309,13 +319,13 @@ Transform:
309319
m_PrefabInstance: {fileID: 0}
310320
m_PrefabAsset: {fileID: 0}
311321
m_GameObject: {fileID: 7682807672526693023}
322+
serializedVersion: 2
312323
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
313324
m_LocalPosition: {x: 1, y: 0, z: 4}
314325
m_LocalScale: {x: 1, y: 1, z: 1}
315326
m_ConstrainProportionsScale: 0
316327
m_Children: []
317328
m_Father: {fileID: 5655447013084909147}
318-
m_RootOrder: 1
319329
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
320330
--- !u!1 &9086465339882682673
321331
GameObject:
@@ -340,11 +350,11 @@ Transform:
340350
m_PrefabInstance: {fileID: 0}
341351
m_PrefabAsset: {fileID: 0}
342352
m_GameObject: {fileID: 9086465339882682673}
353+
serializedVersion: 2
343354
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
344355
m_LocalPosition: {x: 2, y: 0, z: 2}
345356
m_LocalScale: {x: 1, y: 1, z: 1}
346357
m_ConstrainProportionsScale: 0
347358
m_Children: []
348359
m_Father: {fileID: 5655447013084909147}
349-
m_RootOrder: 5
350360
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}

‎Assets/Prefabs/State/CharSelectState.prefab‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ Transform:
2828
m_PrefabInstance: {fileID: 0}
2929
m_PrefabAsset: {fileID: 0}
3030
m_GameObject: {fileID: 3565665953789623672}
31+
serializedVersion: 2
3132
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3233
m_LocalPosition: {x: 0, y: 0, z: 0}
3334
m_LocalScale: {x: 1, y: 1, z: 1}
3435
m_ConstrainProportionsScale: 0
3536
m_Children: []
3637
m_Father: {fileID: 0}
37-
m_RootOrder: 0
3838
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3939
--- !u!114 &1092063945021251778
4040
MonoBehaviour:
@@ -48,13 +48,19 @@ MonoBehaviour:
4848
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
4949
m_Name:
5050
m_EditorClassIdentifier:
51-
GlobalObjectIdHash: 951099334
51+
GlobalObjectIdHash: 2612316768
52+
InScenePlacedSourceGlobalObjectIdHash: 2959094212
53+
DeferredDespawnTick: 0
54+
Ownership: 1
5255
AlwaysReplicateAsRoot: 0
5356
SynchronizeTransform: 0
5457
ActiveSceneSynchronization: 0
5558
SceneMigrationSynchronization: 1
59+
SpawnWithObservers: 1
5660
DontDestroyWithOwner: 0
5761
AutoObjectParentSync: 1
62+
SyncOwnerTransformWhenParented: 1
63+
AllowOwnerToParent: 0
5864
--- !u!114 &3565665953789623675
5965
MonoBehaviour:
6066
m_ObjectHideFlags: 0
@@ -87,7 +93,9 @@ MonoBehaviour:
8793
parentReference:
8894
TypeName: Unity.BossRoom.ApplicationLifecycle.ApplicationController
8995
autoRun: 1
90-
autoInjectGameObjects: []
96+
autoInjectGameObjects:
97+
- {fileID: 0}
98+
- {fileID: 0}
9199
m_NetcodeHooks: {fileID: 8494646029522094751}
92100
m_NetworkCharSelection: {fileID: 3565665953789623673}
93101
m_AnimationTriggerOnCharSelect: BeginRevive
@@ -126,7 +134,7 @@ MonoBehaviour:
126134
m_UIElementsForSeatChosen:
127135
- {fileID: 0}
128136
- {fileID: 0}
129-
m_UIElementsForLobbyEnding:
137+
m_UIElementsForSessionEnding:
130138
- {fileID: 0}
131139
m_UIElementsForFatalError:
132140
- {fileID: 0}
@@ -144,6 +152,7 @@ MonoBehaviour:
144152
m_Script: {fileID: 11500000, guid: 3b117c7cd3ae70e458a5b755a4096609, type: 3}
145153
m_Name:
146154
m_EditorClassIdentifier:
155+
ShowTopMostFoldoutHeaderGroup: 1
147156
AvatarConfiguration:
148157
- {fileID: 11400000, guid: 20beed451a65c364eb413c7ef6ebb8fa, type: 2}
149158
- {fileID: 11400000, guid: 732834deb1e677541bd1c2aef937f608, type: 2}
@@ -165,3 +174,4 @@ MonoBehaviour:
165174
m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
166175
m_Name:
167176
m_EditorClassIdentifier:
177+
ShowTopMostFoldoutHeaderGroup: 1

‎Assets/Prefabs/State/MainMenuState.prefab‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,15 @@ MonoBehaviour:
5454
parentReference:
5555
TypeName: Unity.BossRoom.ApplicationLifecycle.ApplicationController
5656
autoRun: 1
57-
autoInjectGameObjects: []
57+
autoInjectGameObjects:
58+
- {fileID: 0}
59+
- {fileID: 0}
60+
- {fileID: 0}
61+
- {fileID: 0}
5862
m_NameGenerationData: {fileID: 11400000, guid: cc0e4025ad893614a8db0d9c10bf7c4f, type: 2}
59-
m_LobbyUIMediator: {fileID: 0}
63+
m_SessionUIMediator: {fileID: 0}
6064
m_IPUIMediator: {fileID: 0}
61-
m_LobbyButton: {fileID: 0}
65+
m_SessionButton: {fileID: 0}
6266
m_SignInSpinner: {fileID: 0}
6367
m_UIProfileSelector: {fileID: 0}
6468
m_UGSSetupTooltipDetector: {fileID: 0}

‎Assets/Prefabs/UI/UIToolkit/PostGameUICanvasUITK.prefab‎

Lines changed: 4 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ GameObject:
7575
serializedVersion: 6
7676
m_Component:
7777
- component: {fileID: 2100339957089282678}
78-
- component: {fileID: 1286002055205536738}
78+
- component: {fileID: 7623313333782190830}
7979
m_Layer: 5
8080
m_Name: MessageFeed
8181
m_TagString: Untagged
@@ -95,11 +95,10 @@ Transform:
9595
m_LocalPosition: {x: 0, y: 0, z: 0}
9696
m_LocalScale: {x: 1, y: 1, z: 1}
9797
m_ConstrainProportionsScale: 0
98-
m_Children:
99-
- {fileID: 5886284794912537810}
98+
m_Children: []
10099
m_Father: {fileID: 7855837178462082302}
101100
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
102-
--- !u!114 &1286002055205536738
101+
--- !u!114 &7623313333782190830
103102
MonoBehaviour:
104103
m_ObjectHideFlags: 0
105104
m_CorrespondingSourceObject: {fileID: 0}
@@ -108,79 +107,7 @@ MonoBehaviour:
108107
m_GameObject: {fileID: 5550880791410142769}
109108
m_Enabled: 1
110109
m_EditorHideFlags: 0
111-
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
112-
m_Name:
113-
m_EditorClassIdentifier:
114-
m_PanelSettings: {fileID: 11400000, guid: 30704bc49d34869449e8bfdb3ab57841, type: 2}
115-
m_ParentUI: {fileID: 2063287831439623020}
116-
sourceAsset: {fileID: 9197481963319205126, guid: 79e0526232b7b2246a02c77f935c2b2a, type: 3}
117-
m_SortingOrder: 0
118-
m_WorldSpaceSizeMode: 1
119-
m_WorldSpaceWidth: 1920
120-
m_WorldSpaceHeight: 1080
121-
--- !u!1 &8225198564806970540
122-
GameObject:
123-
m_ObjectHideFlags: 0
124-
m_CorrespondingSourceObject: {fileID: 0}
125-
m_PrefabInstance: {fileID: 0}
126-
m_PrefabAsset: {fileID: 0}
127-
serializedVersion: 6
128-
m_Component:
129-
- component: {fileID: 5886284794912537810}
130-
- component: {fileID: 6577115012106585769}
131-
- component: {fileID: 8405269881768119238}
132-
m_Layer: 5
133-
m_Name: MessageItem
134-
m_TagString: Untagged
135-
m_Icon: {fileID: 0}
136-
m_NavMeshLayer: 0
137-
m_StaticEditorFlags: 0
138-
m_IsActive: 1
139-
--- !u!4 &5886284794912537810
140-
Transform:
141-
m_ObjectHideFlags: 0
142-
m_CorrespondingSourceObject: {fileID: 0}
143-
m_PrefabInstance: {fileID: 0}
144-
m_PrefabAsset: {fileID: 0}
145-
m_GameObject: {fileID: 8225198564806970540}
146-
serializedVersion: 2
147-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
148-
m_LocalPosition: {x: 0, y: 0, z: 0}
149-
m_LocalScale: {x: 1, y: 1, z: 1}
150-
m_ConstrainProportionsScale: 0
151-
m_Children: []
152-
m_Father: {fileID: 2100339957089282678}
153-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
154-
--- !u!114 &6577115012106585769
155-
MonoBehaviour:
156-
m_ObjectHideFlags: 0
157-
m_CorrespondingSourceObject: {fileID: 0}
158-
m_PrefabInstance: {fileID: 0}
159-
m_PrefabAsset: {fileID: 0}
160-
m_GameObject: {fileID: 8225198564806970540}
161-
m_Enabled: 1
162-
m_EditorHideFlags: 0
163-
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
164-
m_Name:
165-
m_EditorClassIdentifier:
166-
m_PanelSettings: {fileID: 11400000, guid: 30704bc49d34869449e8bfdb3ab57841, type: 2}
167-
m_ParentUI: {fileID: 2063287831439623020}
168-
sourceAsset: {fileID: 9197481963319205126, guid: 67ec44aea0b0f484c86c6489932cfcad, type: 3}
169-
m_SortingOrder: 0
170-
m_WorldSpaceSizeMode: 1
171-
m_WorldSpaceWidth: 1920
172-
m_WorldSpaceHeight: 1080
173-
--- !u!114 &8405269881768119238
174-
MonoBehaviour:
175-
m_ObjectHideFlags: 0
176-
m_CorrespondingSourceObject: {fileID: 0}
177-
m_PrefabInstance: {fileID: 0}
178-
m_PrefabAsset: {fileID: 0}
179-
m_GameObject: {fileID: 8225198564806970540}
180-
m_Enabled: 1
181-
m_EditorHideFlags: 0
182110
m_Script: {fileID: 11500000, guid: 5972d28314a4d794cbe88ba0120b39c0, type: 3}
183111
m_Name:
184112
m_EditorClassIdentifier:
185-
doc: {fileID: 6577115012106585769}
186-
AddMessage: 0
113+
doc: {fileID: 2063287831439623020}

0 commit comments

Comments
 (0)