Skip to content

Commit c1a348b

Browse files
jilfranco-unityjilfranco-unity
committed
Merge branch 'develop' into feature/vandal-imp-tossed-attack-art
2 parents e3d5b5e + cae91fa commit c1a348b

File tree

114 files changed

+2107
-2087
lines changed

Some content is hidden

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

114 files changed

+2107
-2087
lines changed

‎Assets/Prefabs/GameNetPortal.prefab

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 5062837533140207352}
12-
- component: {fileID: 5062837533140207350}
13-
- component: {fileID: 5062837533140207353}
14-
- component: {fileID: 5062837533140207351}
12+
- component: {fileID: 1984353324962460586}
1513
m_Layer: 0
1614
m_Name: GameNetPortal
1715
m_TagString: GameNetPortal
@@ -29,11 +27,12 @@ Transform:
2927
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3028
m_LocalPosition: {x: 0, y: 0, z: 0}
3129
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_ConstrainProportionsScale: 0
3231
m_Children: []
3332
m_Father: {fileID: 0}
3433
m_RootOrder: 0
3534
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36-
--- !u!114 &5062837533140207350
35+
--- !u!114 &1984353324962460586
3736
MonoBehaviour:
3837
m_ObjectHideFlags: 0
3938
m_CorrespondingSourceObject: {fileID: 0}
@@ -42,34 +41,9 @@ MonoBehaviour:
4241
m_GameObject: {fileID: 5062837533140207349}
4342
m_Enabled: 1
4443
m_EditorHideFlags: 0
45-
m_Script: {fileID: 11500000, guid: 7ba4a1d598313d94a81a08ceae147b57, type: 3}
44+
m_Script: {fileID: 11500000, guid: bf51ea31bbc84cc3aa883cc5f1caae06, type: 3}
4645
m_Name:
4746
m_EditorClassIdentifier:
4847
m_NetworkManager: {fileID: 0}
4948
m_AvatarRegistry: {fileID: 11400000, guid: 48d17d764bff6c643a3dc035fb71c979, type: 2}
50-
PlayerName:
51-
--- !u!114 &5062837533140207353
52-
MonoBehaviour:
53-
m_ObjectHideFlags: 0
54-
m_CorrespondingSourceObject: {fileID: 0}
55-
m_PrefabInstance: {fileID: 0}
56-
m_PrefabAsset: {fileID: 0}
57-
m_GameObject: {fileID: 5062837533140207349}
58-
m_Enabled: 1
59-
m_EditorHideFlags: 0
60-
m_Script: {fileID: 11500000, guid: 5bd31edc1b1fd1342b3bf8193a5a03b2, type: 3}
61-
m_Name:
62-
m_EditorClassIdentifier:
63-
--- !u!114 &5062837533140207351
64-
MonoBehaviour:
65-
m_ObjectHideFlags: 0
66-
m_CorrespondingSourceObject: {fileID: 0}
67-
m_PrefabInstance: {fileID: 0}
68-
m_PrefabAsset: {fileID: 0}
69-
m_GameObject: {fileID: 5062837533140207349}
70-
m_Enabled: 1
71-
m_EditorHideFlags: 0
72-
m_Script: {fileID: 11500000, guid: 54b0859a1da930541adf0b2d1bb8d977, type: 3}
73-
m_Name:
74-
m_EditorClassIdentifier:
7549
m_GameState: {fileID: 7151198093957655792, guid: 3af96a32a84bcf74d9538fa7af973c97, type: 3}

‎Assets/Prefabs/State/BossRoomState.prefab

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 5655447013084909147}
12-
- component: {fileID: -1764033382396218637}
1312
- component: {fileID: 3608714310874968837}
13+
- component: {fileID: -1764033382396218637}
1414
- component: {fileID: 5762482089640033414}
15+
- component: {fileID: 1290852967062359934}
1516
m_Layer: 0
1617
m_Name: BossRoomState
1718
m_TagString: Untagged
@@ -29,6 +30,7 @@ Transform:
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}
33+
m_ConstrainProportionsScale: 0
3234
m_Children:
3335
- {fileID: 6319832178442273571}
3436
- {fileID: 374135395555381814}
@@ -41,7 +43,7 @@ Transform:
4143
m_Father: {fileID: 0}
4244
m_RootOrder: 0
4345
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
44-
--- !u!114 &-1764033382396218637
46+
--- !u!114 &3608714310874968837
4547
MonoBehaviour:
4648
m_ObjectHideFlags: 0
4749
m_CorrespondingSourceObject: {fileID: 0}
@@ -50,11 +52,14 @@ MonoBehaviour:
5052
m_GameObject: {fileID: 297185343939699586}
5153
m_Enabled: 1
5254
m_EditorHideFlags: 0
53-
m_Script: {fileID: 11500000, guid: 5e631ac38df479741af592cf6a1fb553, type: 3}
55+
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
5456
m_Name:
5557
m_EditorClassIdentifier:
56-
m_GameObjectsThatWillBeInjectedAutomatically: []
57-
--- !u!114 &3608714310874968837
58+
GlobalObjectIdHash: 951099334
59+
AlwaysReplicateAsRoot: 0
60+
DontDestroyWithOwner: 0
61+
AutoObjectParentSync: 1
62+
--- !u!114 &-1764033382396218637
5863
MonoBehaviour:
5964
m_ObjectHideFlags: 0
6065
m_CorrespondingSourceObject: {fileID: 0}
@@ -63,13 +68,13 @@ MonoBehaviour:
6368
m_GameObject: {fileID: 297185343939699586}
6469
m_Enabled: 1
6570
m_EditorHideFlags: 0
66-
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
71+
m_Script: {fileID: 11500000, guid: 5e631ac38df479741af592cf6a1fb553, type: 3}
6772
m_Name:
6873
m_EditorClassIdentifier:
69-
GlobalObjectIdHash: 951099334
70-
AlwaysReplicateAsRoot: 0
71-
DontDestroyWithOwner: 0
72-
AutoObjectParentSync: 1
74+
parentReference:
75+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
76+
autoRun: 1
77+
autoInjectGameObjects: []
7378
--- !u!114 &5762482089640033414
7479
MonoBehaviour:
7580
m_ObjectHideFlags: 0
@@ -82,7 +87,11 @@ MonoBehaviour:
8287
m_Script: {fileID: 11500000, guid: 927521835ae055247b17e4abe805b4ab, type: 3}
8388
m_Name:
8489
m_EditorClassIdentifier:
85-
m_GameObjectsThatWillBeInjectedAutomatically: []
90+
parentReference:
91+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
92+
autoRun: 1
93+
autoInjectGameObjects: []
94+
m_NetcodeHooks: {fileID: 1290852967062359934}
8695
m_NetworkGameStateTransform: {fileID: 11400000, guid: 07bddcdf06738e74cb79d30065ff96af, type: 2}
8796
m_PlayerPrefab: {fileID: 6009713983291384767, guid: 8237adf32a9b6de4892e6febe6b4bdef, type: 3}
8897
m_PlayerSpawnPoints:
@@ -94,6 +103,18 @@ MonoBehaviour:
94103
- {fileID: 6314369147267609336}
95104
- {fileID: 8725901042666772653}
96105
- {fileID: 7239491272522478247}
106+
--- !u!114 &1290852967062359934
107+
MonoBehaviour:
108+
m_ObjectHideFlags: 0
109+
m_CorrespondingSourceObject: {fileID: 0}
110+
m_PrefabInstance: {fileID: 0}
111+
m_PrefabAsset: {fileID: 0}
112+
m_GameObject: {fileID: 297185343939699586}
113+
m_Enabled: 1
114+
m_EditorHideFlags: 0
115+
m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
116+
m_Name:
117+
m_EditorClassIdentifier:
97118
--- !u!1 &1088799320945899822
98119
GameObject:
99120
m_ObjectHideFlags: 0
@@ -120,6 +141,7 @@ Transform:
120141
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
121142
m_LocalPosition: {x: -1, y: 0, z: 2}
122143
m_LocalScale: {x: 1, y: 1, z: 1}
144+
m_ConstrainProportionsScale: 0
123145
m_Children: []
124146
m_Father: {fileID: 5655447013084909147}
125147
m_RootOrder: 4
@@ -150,6 +172,7 @@ Transform:
150172
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
151173
m_LocalPosition: {x: 8, y: 0, z: 2}
152174
m_LocalScale: {x: 1, y: 1, z: 1}
175+
m_ConstrainProportionsScale: 0
153176
m_Children: []
154177
m_Father: {fileID: 5655447013084909147}
155178
m_RootOrder: 7
@@ -180,6 +203,7 @@ Transform:
180203
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
181204
m_LocalPosition: {x: 4, y: 0, z: 4}
182205
m_LocalScale: {x: 1, y: 1, z: 1}
206+
m_ConstrainProportionsScale: 0
183207
m_Children: []
184208
m_Father: {fileID: 5655447013084909147}
185209
m_RootOrder: 2
@@ -210,6 +234,7 @@ Transform:
210234
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
211235
m_LocalPosition: {x: 7, y: 0, z: 4}
212236
m_LocalScale: {x: 1, y: 1, z: 1}
237+
m_ConstrainProportionsScale: 0
213238
m_Children: []
214239
m_Father: {fileID: 5655447013084909147}
215240
m_RootOrder: 3
@@ -240,6 +265,7 @@ Transform:
240265
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
241266
m_LocalPosition: {x: -2, y: 0, z: 4}
242267
m_LocalScale: {x: 1, y: 1, z: 1}
268+
m_ConstrainProportionsScale: 0
243269
m_Children: []
244270
m_Father: {fileID: 5655447013084909147}
245271
m_RootOrder: 0
@@ -270,6 +296,7 @@ Transform:
270296
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
271297
m_LocalPosition: {x: 5, y: 0, z: 2}
272298
m_LocalScale: {x: 1, y: 1, z: 1}
299+
m_ConstrainProportionsScale: 0
273300
m_Children: []
274301
m_Father: {fileID: 5655447013084909147}
275302
m_RootOrder: 6
@@ -300,6 +327,7 @@ Transform:
300327
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
301328
m_LocalPosition: {x: 1, y: 0, z: 4}
302329
m_LocalScale: {x: 1, y: 1, z: 1}
330+
m_ConstrainProportionsScale: 0
303331
m_Children: []
304332
m_Father: {fileID: 5655447013084909147}
305333
m_RootOrder: 1
@@ -330,6 +358,7 @@ Transform:
330358
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
331359
m_LocalPosition: {x: 2, y: 0, z: 2}
332360
m_LocalScale: {x: 1, y: 1, z: 1}
361+
m_ConstrainProportionsScale: 0
333362
m_Children: []
334363
m_Father: {fileID: 5655447013084909147}
335364
m_RootOrder: 5

‎Assets/Prefabs/State/CharSelectState.prefab

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ GameObject:
1313
- component: {fileID: 3565665953789623675}
1414
- component: {fileID: 3565665953789623674}
1515
- component: {fileID: 3565665953789623673}
16+
- component: {fileID: 8494646029522094751}
1617
m_Layer: 0
1718
m_Name: CharSelectState
1819
m_TagString: Untagged
@@ -30,6 +31,7 @@ Transform:
3031
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3132
m_LocalPosition: {x: 0, y: 0, z: 0}
3233
m_LocalScale: {x: 1, y: 1, z: 1}
34+
m_ConstrainProportionsScale: 0
3335
m_Children: []
3436
m_Father: {fileID: 0}
3537
m_RootOrder: 0
@@ -62,6 +64,11 @@ MonoBehaviour:
6264
m_Script: {fileID: 11500000, guid: b4ae93287066a264d92939aa957cf227, type: 3}
6365
m_Name:
6466
m_EditorClassIdentifier:
67+
parentReference:
68+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
69+
autoRun: 1
70+
autoInjectGameObjects: []
71+
m_NetcodeHooks: {fileID: 8494646029522094751}
6572
--- !u!114 &3565665953789623674
6673
MonoBehaviour:
6774
m_ObjectHideFlags: 0
@@ -74,6 +81,11 @@ MonoBehaviour:
7481
m_Script: {fileID: 11500000, guid: eca1f4b442326cc4d9be3975746b8cdb, type: 3}
7582
m_Name:
7683
m_EditorClassIdentifier:
84+
parentReference:
85+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
86+
autoRun: 1
87+
autoInjectGameObjects: []
88+
m_NetcodeHooks: {fileID: 8494646029522094751}
7789
m_AnimationTriggerOnCharSelect: BeginRevive
7890
m_AnimationTriggerOnCharChosen: BeginRevive
7991
m_PlayerSeats:
@@ -103,6 +115,7 @@ MonoBehaviour:
103115
- Indicator: {fileID: 21300000, guid: 5e0531f7cad04b346bf05685f3b9a846, type: 3}
104116
Color: {r: 0.19215687, g: 0.03137255, b: 0.9882353, a: 1}
105117
m_NumPlayersText: {fileID: 0}
118+
m_ReadyButtonText: {fileID: 0}
106119
m_UIElementsForNoSeatChosen:
107120
- {fileID: 0}
108121
- {fileID: 0}
@@ -114,8 +127,6 @@ MonoBehaviour:
114127
m_UIElementsForFatalError:
115128
- {fileID: 0}
116129
m_ClassInfoBox: {fileID: 0}
117-
m_FatalLobbyErrorText: {fileID: 0}
118-
m_FatalErrorLobbyFullMsg: 'Error: lobby is full! You cannot play.'
119130
m_CharacterGraphicsParent: {fileID: 0}
120131
--- !u!114 &3565665953789623673
121132
MonoBehaviour:
@@ -138,3 +149,15 @@ MonoBehaviour:
138149
- {fileID: 11400000, guid: f49fc0646d4e9554f88a31ac496afd19, type: 2}
139150
- {fileID: 11400000, guid: 70d299733c76b0649852336624091fca, type: 2}
140151
- {fileID: 11400000, guid: 9cc69a593b6ff1b4b95bf7330ec5ab46, type: 2}
152+
--- !u!114 &8494646029522094751
153+
MonoBehaviour:
154+
m_ObjectHideFlags: 0
155+
m_CorrespondingSourceObject: {fileID: 0}
156+
m_PrefabInstance: {fileID: 0}
157+
m_PrefabAsset: {fileID: 0}
158+
m_GameObject: {fileID: 3565665953789623672}
159+
m_Enabled: 1
160+
m_EditorHideFlags: 0
161+
m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
162+
m_Name:
163+
m_EditorClassIdentifier:

‎Assets/Prefabs/State/MainMenuState.prefab

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,17 @@ MonoBehaviour:
6969
m_Script: {fileID: 11500000, guid: ab10fd7c6aa7d36438f5ac1c0ebfadbb, type: 3}
7070
m_Name:
7171
m_EditorClassIdentifier:
72-
m_GameObjectsThatWillBeInjectedAutomatically: []
72+
parentReference:
73+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
74+
autoRun: 1
75+
autoInjectGameObjects: []
7376
m_NameGenerationData: {fileID: 11400000, guid: cc0e4025ad893614a8db0d9c10bf7c4f, type: 2}
7477
m_LobbyUIMediator: {fileID: 0}
7578
m_IPUIMediator: {fileID: 0}
7679
m_LobbyButton: {fileID: 0}
7780
m_SignInSpinner: {fileID: 0}
81+
m_UIProfileSelector: {fileID: 0}
82+
m_UGSSetupTooltipDetector: {fileID: 0}
7883
--- !u!223 &2665876610389888237
7984
Canvas:
8085
m_ObjectHideFlags: 0

‎Assets/Prefabs/State/PostGameState.prefab

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 7475764267130300179}
12-
- component: {fileID: 7475764267130300178}
1312
- component: {fileID: -1007214952234040975}
13+
- component: {fileID: 7475764267130300178}
1414
- component: {fileID: 4223400095609434710}
15+
- component: {fileID: 6576822806953781696}
1516
m_Layer: 0
1617
m_Name: PostGameState
1718
m_TagString: Untagged
@@ -29,11 +30,12 @@ Transform:
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}
33+
m_ConstrainProportionsScale: 0
3234
m_Children: []
3335
m_Father: {fileID: 0}
3436
m_RootOrder: 0
3537
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36-
--- !u!114 &7475764267130300178
38+
--- !u!114 &-1007214952234040975
3739
MonoBehaviour:
3840
m_ObjectHideFlags: 0
3941
m_CorrespondingSourceObject: {fileID: 0}
@@ -42,10 +44,14 @@ MonoBehaviour:
4244
m_GameObject: {fileID: 7475764267130300177}
4345
m_Enabled: 1
4446
m_EditorHideFlags: 0
45-
m_Script: {fileID: 11500000, guid: a2a5cf2c4e970b64a9073f4f760322b5, type: 3}
47+
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
4648
m_Name:
4749
m_EditorClassIdentifier:
48-
--- !u!114 &-1007214952234040975
50+
GlobalObjectIdHash: 951099334
51+
AlwaysReplicateAsRoot: 0
52+
DontDestroyWithOwner: 0
53+
AutoObjectParentSync: 1
54+
--- !u!114 &7475764267130300178
4955
MonoBehaviour:
5056
m_ObjectHideFlags: 0
5157
m_CorrespondingSourceObject: {fileID: 0}
@@ -54,13 +60,14 @@ MonoBehaviour:
5460
m_GameObject: {fileID: 7475764267130300177}
5561
m_Enabled: 1
5662
m_EditorHideFlags: 0
57-
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
63+
m_Script: {fileID: 11500000, guid: a2a5cf2c4e970b64a9073f4f760322b5, type: 3}
5864
m_Name:
5965
m_EditorClassIdentifier:
60-
GlobalObjectIdHash: 951099334
61-
AlwaysReplicateAsRoot: 0
62-
DontDestroyWithOwner: 0
63-
AutoObjectParentSync: 1
66+
parentReference:
67+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
68+
autoRun: 1
69+
autoInjectGameObjects: []
70+
m_NetcodeHooks: {fileID: 6576822806953781696}
6471
--- !u!114 &4223400095609434710
6572
MonoBehaviour:
6673
m_ObjectHideFlags: 0
@@ -73,3 +80,19 @@ MonoBehaviour:
7380
m_Script: {fileID: 11500000, guid: 1cb58d1788f410740b05cace1af646d7, type: 3}
7481
m_Name:
7582
m_EditorClassIdentifier:
83+
parentReference:
84+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
85+
autoRun: 1
86+
autoInjectGameObjects: []
87+
--- !u!114 &6576822806953781696
88+
MonoBehaviour:
89+
m_ObjectHideFlags: 0
90+
m_CorrespondingSourceObject: {fileID: 0}
91+
m_PrefabInstance: {fileID: 0}
92+
m_PrefabAsset: {fileID: 0}
93+
m_GameObject: {fileID: 7475764267130300177}
94+
m_Enabled: 1
95+
m_EditorHideFlags: 0
96+
m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
97+
m_Name:
98+
m_EditorClassIdentifier:

0 commit comments

Comments
 (0)