Skip to content

Commit a93b8ce

Browse files
fernando-cortezfernando-cortez
authored
Merge pull request #868 from Unity-Technologies/develop
release: Boss Room v2.3.0
2 parents 2787a84 + 2a4903b commit a93b8ce

File tree

50 files changed

+729
-374
lines changed

Some content is hidden

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

50 files changed

+729
-374
lines changed

‎.yamato/project.metafile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ projects:
3030
- name: com.unity.multiplayer.samples.coop
3131
path: Packages/com.unity.multiplayer.samples.coop
3232
test_editors:
33-
- 2022.3.0
33+
- 2022.3

‎Assets/Prefabs/AdditiveSceneLoader.prefab

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ GameObject:
1010
m_Component:
1111
- component: {fileID: 3765979716845461200}
1212
- component: {fileID: 3765979716845461207}
13-
- component: {fileID: 3765979716845461206}
1413
- component: {fileID: 3029178677072641126}
14+
- component: {fileID: 3765979716845461206}
1515
m_Layer: 2
1616
m_Name: AdditiveSceneLoader
1717
m_TagString: Untagged
@@ -26,12 +26,13 @@ Transform:
2626
m_PrefabInstance: {fileID: 0}
2727
m_PrefabAsset: {fileID: 0}
2828
m_GameObject: {fileID: 3765979716845461205}
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}
33+
m_ConstrainProportionsScale: 0
3234
m_Children: []
3335
m_Father: {fileID: 0}
34-
m_RootOrder: 0
3536
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3637
--- !u!65 &3765979716845461207
3738
BoxCollider:
@@ -41,12 +42,20 @@ BoxCollider:
4142
m_PrefabAsset: {fileID: 0}
4243
m_GameObject: {fileID: 3765979716845461205}
4344
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
4452
m_IsTrigger: 1
53+
m_ProvidesContacts: 0
4554
m_Enabled: 1
46-
serializedVersion: 2
55+
serializedVersion: 3
4756
m_Size: {x: 0, y: 0, z: 0}
4857
m_Center: {x: 0, y: 0, z: 0}
49-
--- !u!114 &3765979716845461206
58+
--- !u!114 &3029178677072641126
5059
MonoBehaviour:
5160
m_ObjectHideFlags: 0
5261
m_CorrespondingSourceObject: {fileID: 0}
@@ -55,13 +64,17 @@ MonoBehaviour:
5564
m_GameObject: {fileID: 3765979716845461205}
5665
m_Enabled: 1
5766
m_EditorHideFlags: 0
58-
m_Script: {fileID: 11500000, guid: f4506649f88aac74ea839a52818e3174, type: 3}
67+
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
5968
m_Name:
6069
m_EditorClassIdentifier:
61-
m_DelayBeforeUnload: 5
62-
m_SceneName:
63-
m_PlayerTag: Player
64-
--- !u!114 &3029178677072641126
70+
GlobalObjectIdHash: 951099334
71+
AlwaysReplicateAsRoot: 0
72+
SynchronizeTransform: 1
73+
ActiveSceneSynchronization: 0
74+
SceneMigrationSynchronization: 1
75+
DontDestroyWithOwner: 0
76+
AutoObjectParentSync: 1
77+
--- !u!114 &3765979716845461206
6578
MonoBehaviour:
6679
m_ObjectHideFlags: 0
6780
m_CorrespondingSourceObject: {fileID: 0}
@@ -70,10 +83,9 @@ MonoBehaviour:
7083
m_GameObject: {fileID: 3765979716845461205}
7184
m_Enabled: 1
7285
m_EditorHideFlags: 0
73-
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
86+
m_Script: {fileID: 11500000, guid: f4506649f88aac74ea839a52818e3174, type: 3}
7487
m_Name:
7588
m_EditorClassIdentifier:
76-
GlobalObjectIdHash: 951099334
77-
AlwaysReplicateAsRoot: 0
78-
DontDestroyWithOwner: 0
79-
AutoObjectParentSync: 1
89+
m_DelayBeforeUnload: 5
90+
m_SceneName:
91+
m_PlayerTag: Player

‎Assets/Prefabs/DebugCheatsManager.prefab

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 2726635115303138402}
12-
- component: {fileID: 7241368247586282332}
1312
- component: {fileID: 6695920927348029111}
13+
- component: {fileID: 7241368247586282332}
1414
m_Layer: 0
1515
m_Name: DebugCheatsManager
1616
m_TagString: Untagged
@@ -25,15 +25,15 @@ Transform:
2525
m_PrefabInstance: {fileID: 0}
2626
m_PrefabAsset: {fileID: 0}
2727
m_GameObject: {fileID: 776943915682426285}
28+
serializedVersion: 2
2829
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2930
m_LocalPosition: {x: 0, y: 0, z: 0}
3031
m_LocalScale: {x: 1, y: 1, z: 1}
3132
m_ConstrainProportionsScale: 0
3233
m_Children: []
3334
m_Father: {fileID: 0}
34-
m_RootOrder: 0
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36-
--- !u!114 &7241368247586282332
36+
--- !u!114 &6695920927348029111
3737
MonoBehaviour:
3838
m_ObjectHideFlags: 0
3939
m_CorrespondingSourceObject: {fileID: 0}
@@ -42,14 +42,17 @@ MonoBehaviour:
4242
m_GameObject: {fileID: 776943915682426285}
4343
m_Enabled: 1
4444
m_EditorHideFlags: 0
45-
m_Script: {fileID: 11500000, guid: ab1e76745edfc434ab8154ad27efc5fd, type: 3}
45+
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
4646
m_Name:
4747
m_EditorClassIdentifier:
48-
m_DebugCheatsPanel: {fileID: 0}
49-
m_EnemyPrefab: {fileID: 3713729372785093435, guid: 6cdd52f1fa2ed34469a487ae6477eded, type: 3}
50-
m_BossPrefab: {fileID: 3688950541947916326, guid: 365e94337fd10fe4ebde1906df413ac7, type: 3}
51-
m_OpenWindowKeyCode: 47
52-
--- !u!114 &6695920927348029111
48+
GlobalObjectIdHash: 951099334
49+
AlwaysReplicateAsRoot: 0
50+
SynchronizeTransform: 0
51+
ActiveSceneSynchronization: 0
52+
SceneMigrationSynchronization: 1
53+
DontDestroyWithOwner: 0
54+
AutoObjectParentSync: 1
55+
--- !u!114 &7241368247586282332
5356
MonoBehaviour:
5457
m_ObjectHideFlags: 0
5558
m_CorrespondingSourceObject: {fileID: 0}
@@ -58,13 +61,10 @@ MonoBehaviour:
5861
m_GameObject: {fileID: 776943915682426285}
5962
m_Enabled: 1
6063
m_EditorHideFlags: 0
61-
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
64+
m_Script: {fileID: 11500000, guid: ab1e76745edfc434ab8154ad27efc5fd, type: 3}
6265
m_Name:
6366
m_EditorClassIdentifier:
64-
GlobalObjectIdHash: 951099334
65-
AlwaysReplicateAsRoot: 0
66-
SynchronizeTransform: 0
67-
ActiveSceneSynchronization: 0
68-
SceneMigrationSynchronization: 1
69-
DontDestroyWithOwner: 0
70-
AutoObjectParentSync: 1
67+
m_DebugCheatsPanel: {fileID: 0}
68+
m_EnemyPrefab: {fileID: 3713729372785093435, guid: 6cdd52f1fa2ed34469a487ae6477eded, type: 3}
69+
m_BossPrefab: {fileID: 3688950541947916326, guid: 365e94337fd10fe4ebde1906df413ac7, type: 3}
70+
m_OpenWindowKeyCode: 47

‎Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_1.prefab

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Transform:
2828
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2929
m_LocalPosition: {x: 0, y: 0, z: 0}
3030
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_ConstrainProportionsScale: 0
3132
m_Children:
3233
- {fileID: 5915529853195630635}
3334
m_Father: {fileID: 0}
@@ -52,6 +53,7 @@ MeshRenderer:
5253
m_CastShadows: 0
5354
m_ReceiveShadows: 1
5455
m_DynamicOccludee: 1
56+
m_StaticShadowCaster: 0
5557
m_MotionVectors: 1
5658
m_LightProbeUsage: 1
5759
m_ReflectionProbeUsage: 1
@@ -106,13 +108,14 @@ Transform:
106108
m_PrefabInstance: {fileID: 0}
107109
m_PrefabAsset: {fileID: 0}
108110
m_GameObject: {fileID: 8750842352150602452}
109-
m_LocalRotation: {x: -0.92387956, y: -0.00000017299969, z: -0.38268343, w: -0.00000007165881}
111+
m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956}
110112
m_LocalPosition: {x: -2.02, y: 1.96, z: -2.01}
111-
m_LocalScale: {x: -1, y: -1, z: -1}
113+
m_LocalScale: {x: 1, y: 1, z: 1}
114+
m_ConstrainProportionsScale: 0
112115
m_Children: []
113116
m_Father: {fileID: 4437348436208465204}
114117
m_RootOrder: 0
115-
m_LocalEulerAnglesHint: {x: -180, y: -45, z: -0.000015258789}
118+
m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0}
116119
--- !u!65 &7898993292670171814
117120
BoxCollider:
118121
m_ObjectHideFlags: 0
@@ -121,8 +124,16 @@ BoxCollider:
121124
m_PrefabAsset: {fileID: 0}
122125
m_GameObject: {fileID: 8750842352150602452}
123126
m_Material: {fileID: 0}
127+
m_IncludeLayers:
128+
serializedVersion: 2
129+
m_Bits: 0
130+
m_ExcludeLayers:
131+
serializedVersion: 2
132+
m_Bits: 0
133+
m_LayerOverridePriority: 0
124134
m_IsTrigger: 0
135+
m_ProvidesContacts: 0
125136
m_Enabled: 1
126-
serializedVersion: 2
137+
serializedVersion: 3
127138
m_Size: {x: 1, y: 4, z: 6}
128139
m_Center: {x: 0, y: 0, z: 0}

‎Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_2.prefab

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Transform:
2828
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2929
m_LocalPosition: {x: 0, y: 0, z: 0}
3030
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_ConstrainProportionsScale: 0
3132
m_Children:
3233
- {fileID: 8193510332667705931}
3334
m_Father: {fileID: 0}
@@ -52,6 +53,7 @@ MeshRenderer:
5253
m_CastShadows: 0
5354
m_ReceiveShadows: 1
5455
m_DynamicOccludee: 1
56+
m_StaticShadowCaster: 0
5557
m_MotionVectors: 1
5658
m_LightProbeUsage: 1
5759
m_ReflectionProbeUsage: 1
@@ -107,8 +109,9 @@ Transform:
107109
m_PrefabAsset: {fileID: 0}
108110
m_GameObject: {fileID: 4914060456935432399}
109111
m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956}
110-
m_LocalPosition: {x: 2.5663843, y: 1.5000002, z: 2.5656066}
112+
m_LocalPosition: {x: -1.83, y: 2.03, z: -2.11}
111113
m_LocalScale: {x: 1, y: 1, z: 1}
114+
m_ConstrainProportionsScale: 0
112115
m_Children: []
113116
m_Father: {fileID: 2698721903467665021}
114117
m_RootOrder: 0
@@ -121,8 +124,16 @@ BoxCollider:
121124
m_PrefabAsset: {fileID: 0}
122125
m_GameObject: {fileID: 4914060456935432399}
123126
m_Material: {fileID: 0}
127+
m_IncludeLayers:
128+
serializedVersion: 2
129+
m_Bits: 0
130+
m_ExcludeLayers:
131+
serializedVersion: 2
132+
m_Bits: 0
133+
m_LayerOverridePriority: 0
124134
m_IsTrigger: 0
135+
m_ProvidesContacts: 0
125136
m_Enabled: 1
126-
serializedVersion: 2
137+
serializedVersion: 3
127138
m_Size: {x: 1, y: 4, z: 6}
128-
m_Center: {x: -6.5, y: 0.5, z: 0}
139+
m_Center: {x: 0, y: 0, z: 0}

‎Assets/Prefabs/LoadingProgressTracker.prefab

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 3106828016798330215}
12-
- component: {fileID: 3106828016798330208}
1312
- component: {fileID: 3106828016798330209}
13+
- component: {fileID: 3106828016798330208}
1414
m_Layer: 0
1515
m_Name: LoadingProgressTracker
1616
m_TagString: Untagged
@@ -25,15 +25,15 @@ Transform:
2525
m_PrefabInstance: {fileID: 0}
2626
m_PrefabAsset: {fileID: 0}
2727
m_GameObject: {fileID: 3106828016798330210}
28+
serializedVersion: 2
2829
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2930
m_LocalPosition: {x: 0, y: 0, z: 0}
3031
m_LocalScale: {x: 1, y: 1, z: 1}
3132
m_ConstrainProportionsScale: 0
3233
m_Children: []
3334
m_Father: {fileID: 0}
34-
m_RootOrder: 0
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36-
--- !u!114 &3106828016798330208
36+
--- !u!114 &3106828016798330209
3737
MonoBehaviour:
3838
m_ObjectHideFlags: 0
3939
m_CorrespondingSourceObject: {fileID: 0}
@@ -42,10 +42,17 @@ MonoBehaviour:
4242
m_GameObject: {fileID: 3106828016798330210}
4343
m_Enabled: 1
4444
m_EditorHideFlags: 0
45-
m_Script: {fileID: 11500000, guid: 8e20ce98a70947b68f7982c1c417f88c, type: 3}
45+
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
4646
m_Name:
4747
m_EditorClassIdentifier:
48-
--- !u!114 &3106828016798330209
48+
GlobalObjectIdHash: 951099334
49+
AlwaysReplicateAsRoot: 0
50+
SynchronizeTransform: 0
51+
ActiveSceneSynchronization: 0
52+
SceneMigrationSynchronization: 1
53+
DontDestroyWithOwner: 0
54+
AutoObjectParentSync: 1
55+
--- !u!114 &3106828016798330208
4956
MonoBehaviour:
5057
m_ObjectHideFlags: 0
5158
m_CorrespondingSourceObject: {fileID: 0}
@@ -54,13 +61,6 @@ MonoBehaviour:
5461
m_GameObject: {fileID: 3106828016798330210}
5562
m_Enabled: 1
5663
m_EditorHideFlags: 0
57-
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
64+
m_Script: {fileID: 11500000, guid: 8e20ce98a70947b68f7982c1c417f88c, type: 3}
5865
m_Name:
5966
m_EditorClassIdentifier:
60-
GlobalObjectIdHash: 951099334
61-
AlwaysReplicateAsRoot: 0
62-
SynchronizeTransform: 0
63-
ActiveSceneSynchronization: 0
64-
SceneMigrationSynchronization: 1
65-
DontDestroyWithOwner: 0
66-
AutoObjectParentSync: 1

‎Assets/Prefabs/NetworkObjectPool.prefab

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 7944773021007068224}
12-
- component: {fileID: 7944773021007068227}
1312
- component: {fileID: 8707830667181757321}
13+
- component: {fileID: 7944773021007068227}
1414
m_Layer: 0
1515
m_Name: NetworkObjectPool
1616
m_TagString: Untagged
@@ -25,14 +25,33 @@ Transform:
2525
m_PrefabInstance: {fileID: 0}
2626
m_PrefabAsset: {fileID: 0}
2727
m_GameObject: {fileID: 7944773021007068226}
28+
serializedVersion: 2
2829
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2930
m_LocalPosition: {x: 0, y: 0, z: 0}
3031
m_LocalScale: {x: 1, y: 1, z: 1}
3132
m_ConstrainProportionsScale: 0
3233
m_Children: []
3334
m_Father: {fileID: 0}
34-
m_RootOrder: 0
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
--- !u!114 &8707830667181757321
37+
MonoBehaviour:
38+
m_ObjectHideFlags: 0
39+
m_CorrespondingSourceObject: {fileID: 0}
40+
m_PrefabInstance: {fileID: 0}
41+
m_PrefabAsset: {fileID: 0}
42+
m_GameObject: {fileID: 7944773021007068226}
43+
m_Enabled: 1
44+
m_EditorHideFlags: 0
45+
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
46+
m_Name:
47+
m_EditorClassIdentifier:
48+
GlobalObjectIdHash: 951099334
49+
AlwaysReplicateAsRoot: 0
50+
SynchronizeTransform: 0
51+
ActiveSceneSynchronization: 0
52+
SceneMigrationSynchronization: 1
53+
DontDestroyWithOwner: 0
54+
AutoObjectParentSync: 1
3655
--- !u!114 &7944773021007068227
3756
MonoBehaviour:
3857
m_ObjectHideFlags: 0
@@ -56,22 +75,3 @@ MonoBehaviour:
5675
PrewarmCount: 5
5776
- Prefab: {fileID: 5473352307376472481, guid: 3e5c32e5766633a4eaf9e7c393418b34, type: 3}
5877
PrewarmCount: 5
59-
--- !u!114 &8707830667181757321
60-
MonoBehaviour:
61-
m_ObjectHideFlags: 0
62-
m_CorrespondingSourceObject: {fileID: 0}
63-
m_PrefabInstance: {fileID: 0}
64-
m_PrefabAsset: {fileID: 0}
65-
m_GameObject: {fileID: 7944773021007068226}
66-
m_Enabled: 1
67-
m_EditorHideFlags: 0
68-
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
69-
m_Name:
70-
m_EditorClassIdentifier:
71-
GlobalObjectIdHash: 951099334
72-
AlwaysReplicateAsRoot: 0
73-
SynchronizeTransform: 0
74-
ActiveSceneSynchronization: 0
75-
SceneMigrationSynchronization: 1
76-
DontDestroyWithOwner: 0
77-
AutoObjectParentSync: 1

0 commit comments

Comments
 (0)