Skip to content

Commit 74afaeb

Browse files
fernando-cortezfernando-cortez
authored
Merge pull request #887 from Unity-Technologies/release/2.5.0
release: v2.5.0
2 parents e48babb + a300023 commit 74afaeb

File tree

61 files changed

+1917
-689
lines changed

Some content is hidden

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

61 files changed

+1917
-689
lines changed

‎Assets/Prefabs/Character/PlayerAvatar.prefab

+285-240
Large diffs are not rendered by default.

‎Assets/Prefabs/State/MainMenuState.prefab

+2-21
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 3747962111577947793}
12-
- component: {fileID: 499205456468354965}
1312
- component: {fileID: 8576152884213668000}
1413
- component: {fileID: 2665876610389888237}
1514
- component: {fileID: 7369153188685295691}
@@ -34,32 +33,12 @@ RectTransform:
3433
m_ConstrainProportionsScale: 0
3534
m_Children: []
3635
m_Father: {fileID: 0}
37-
m_RootOrder: 0
3836
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3937
m_AnchorMin: {x: 0, y: 0}
4038
m_AnchorMax: {x: 0, y: 0}
4139
m_AnchoredPosition: {x: 0, y: 0}
4240
m_SizeDelta: {x: 0, y: 0}
4341
m_Pivot: {x: 0, y: 0}
44-
--- !u!114 &499205456468354965
45-
MonoBehaviour:
46-
m_ObjectHideFlags: 0
47-
m_CorrespondingSourceObject: {fileID: 0}
48-
m_PrefabInstance: {fileID: 0}
49-
m_PrefabAsset: {fileID: 0}
50-
m_GameObject: {fileID: 8576152884213668003}
51-
m_Enabled: 1
52-
m_EditorHideFlags: 0
53-
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
54-
m_Name:
55-
m_EditorClassIdentifier:
56-
GlobalObjectIdHash: 951099334
57-
AlwaysReplicateAsRoot: 0
58-
SynchronizeTransform: 0
59-
ActiveSceneSynchronization: 0
60-
SceneMigrationSynchronization: 1
61-
DontDestroyWithOwner: 0
62-
AutoObjectParentSync: 1
6342
--- !u!114 &8576152884213668000
6443
MonoBehaviour:
6544
m_ObjectHideFlags: 0
@@ -100,7 +79,9 @@ Canvas:
10079
m_OverrideSorting: 0
10180
m_OverridePixelPerfect: 0
10281
m_SortingBucketNormalizedSize: 0
82+
m_VertexColorAlwaysGammaSpace: 0
10383
m_AdditionalShaderChannelsFlag: 25
84+
m_UpdateRectTransformForStandalone: 0
10485
m_SortingLayerID: 0
10586
m_SortingOrder: 0
10687
m_TargetDisplay: 0

‎Assets/Prefabs/UI/BossRoomHudCanvas.prefab

+41-19
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ RectTransform:
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.5, z: 1}
31+
m_ConstrainProportionsScale: 0
3132
m_Children: []
3233
m_Father: {fileID: 873334740239139040}
33-
m_RootOrder: 10
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3535
m_AnchorMin: {x: 0.5, y: 0.5}
3636
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -162,9 +162,9 @@ RectTransform:
162162
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
163163
m_LocalPosition: {x: 0, y: 0, z: 0}
164164
m_LocalScale: {x: 1, y: 1, z: 1}
165+
m_ConstrainProportionsScale: 0
165166
m_Children: []
166167
m_Father: {fileID: 873334740239139040}
167-
m_RootOrder: 3
168168
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
169169
m_AnchorMin: {x: 1, y: 1}
170170
m_AnchorMax: {x: 1, y: 1}
@@ -237,9 +237,9 @@ RectTransform:
237237
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
238238
m_LocalPosition: {x: 0, y: 0, z: 0}
239239
m_LocalScale: {x: 1, y: 1, z: 1}
240+
m_ConstrainProportionsScale: 0
240241
m_Children: []
241242
m_Father: {fileID: 873334740239139040}
242-
m_RootOrder: 0
243243
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
244244
m_AnchorMin: {x: 0.16555557, y: 0.79600006}
245245
m_AnchorMax: {x: 0.8277778, y: 1}
@@ -371,6 +371,7 @@ RectTransform:
371371
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
372372
m_LocalPosition: {x: 0, y: 0, z: 0}
373373
m_LocalScale: {x: 1, y: 1, z: 1}
374+
m_ConstrainProportionsScale: 0
374375
m_Children:
375376
- {fileID: 1142675600423431063}
376377
- {fileID: 236614809161763873}
@@ -388,7 +389,6 @@ RectTransform:
388389
- {fileID: 3813561709073635053}
389390
- {fileID: 8097037972272021611}
390391
m_Father: {fileID: 5277713031684110775}
391-
m_RootOrder: 3
392392
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
393393
m_AnchorMin: {x: 0, y: 0}
394394
m_AnchorMax: {x: 1, y: 1}
@@ -461,9 +461,9 @@ RectTransform:
461461
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
462462
m_LocalPosition: {x: 0, y: 0, z: 0}
463463
m_LocalScale: {x: 1, y: 1, z: 1}
464+
m_ConstrainProportionsScale: 0
464465
m_Children: []
465466
m_Father: {fileID: 873334740239139040}
466-
m_RootOrder: 2
467467
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
468468
m_AnchorMin: {x: 0.5, y: 0}
469469
m_AnchorMax: {x: 0.5, y: 1}
@@ -537,10 +537,10 @@ RectTransform:
537537
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
538538
m_LocalPosition: {x: 0, y: 0, z: 0}
539539
m_LocalScale: {x: 1, y: 1, z: 1}
540+
m_ConstrainProportionsScale: 0
540541
m_Children:
541542
- {fileID: 1177926205616708043}
542543
m_Father: {fileID: 873334740239139040}
543-
m_RootOrder: 13
544544
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
545545
m_AnchorMin: {x: 0.404, y: 0}
546546
m_AnchorMax: {x: 0.6007507, y: 0.10055374}
@@ -669,9 +669,9 @@ RectTransform:
669669
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
670670
m_LocalPosition: {x: 0, y: 0, z: 0}
671671
m_LocalScale: {x: 1, y: 1, z: 1}
672+
m_ConstrainProportionsScale: 0
672673
m_Children: []
673674
m_Father: {fileID: 873334740239139040}
674-
m_RootOrder: 5
675675
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
676676
m_AnchorMin: {x: 0.5, y: 0}
677677
m_AnchorMax: {x: 0.5, y: 1}
@@ -744,9 +744,9 @@ RectTransform:
744744
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
745745
m_LocalPosition: {x: 0, y: 0, z: 0}
746746
m_LocalScale: {x: 1, y: 1.5, z: 1}
747+
m_ConstrainProportionsScale: 0
747748
m_Children: []
748749
m_Father: {fileID: 873334740239139040}
749-
m_RootOrder: 8
750750
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
751751
m_AnchorMin: {x: 0.5, y: 0.5}
752752
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -878,9 +878,9 @@ RectTransform:
878878
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
879879
m_LocalPosition: {x: 0, y: 0, z: 0}
880880
m_LocalScale: {x: 1, y: 1.4999999, z: 1}
881+
m_ConstrainProportionsScale: 0
881882
m_Children: []
882883
m_Father: {fileID: 873334740239139040}
883-
m_RootOrder: 11
884884
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
885885
m_AnchorMin: {x: 0.5, y: 0.5}
886886
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1012,9 +1012,9 @@ RectTransform:
10121012
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
10131013
m_LocalPosition: {x: 0, y: 0, z: 0}
10141014
m_LocalScale: {x: 1, y: 1.5, z: 1}
1015+
m_ConstrainProportionsScale: 0
10151016
m_Children: []
10161017
m_Father: {fileID: 873334740239139040}
1017-
m_RootOrder: 14
10181018
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10191019
m_AnchorMin: {x: 0.5, y: 0.5}
10201020
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1146,9 +1146,9 @@ RectTransform:
11461146
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
11471147
m_LocalPosition: {x: 0, y: 0, z: 0}
11481148
m_LocalScale: {x: 1, y: 1.5, z: 1}
1149+
m_ConstrainProportionsScale: 0
11491150
m_Children: []
11501151
m_Father: {fileID: 873334740239139040}
1151-
m_RootOrder: 9
11521152
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11531153
m_AnchorMin: {x: 0.5, y: 0.5}
11541154
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1281,6 +1281,7 @@ RectTransform:
12811281
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
12821282
m_LocalPosition: {x: 0, y: 0, z: 0}
12831283
m_LocalScale: {x: 0, y: 0, z: 0}
1284+
m_ConstrainProportionsScale: 0
12841285
m_Children:
12851286
- {fileID: 103977269980398715}
12861287
- {fileID: 5277713031123338908}
@@ -1289,7 +1290,6 @@ RectTransform:
12891290
- {fileID: 3433386668875250805}
12901291
- {fileID: 9010914333762435528}
12911292
m_Father: {fileID: 0}
1292-
m_RootOrder: 0
12931293
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12941294
m_AnchorMin: {x: 0, y: 0}
12951295
m_AnchorMax: {x: 0, y: 0}
@@ -1313,9 +1313,11 @@ Canvas:
13131313
m_OverrideSorting: 0
13141314
m_OverridePixelPerfect: 0
13151315
m_SortingBucketNormalizedSize: 0
1316+
m_VertexColorAlwaysGammaSpace: 0
13161317
m_AdditionalShaderChannelsFlag: 25
1318+
m_UpdateRectTransformForStandalone: 0
13171319
m_SortingLayerID: 0
1318-
m_SortingOrder: 0
1320+
m_SortingOrder: -3
13191321
m_TargetDisplay: 0
13201322
--- !u!114 &5277713031684110769
13211323
MonoBehaviour:
@@ -1385,9 +1387,9 @@ RectTransform:
13851387
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
13861388
m_LocalPosition: {x: 0, y: 0, z: 0}
13871389
m_LocalScale: {x: 1, y: 1, z: 1}
1390+
m_ConstrainProportionsScale: 0
13881391
m_Children: []
13891392
m_Father: {fileID: 873334740239139040}
1390-
m_RootOrder: 1
13911393
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13921394
m_AnchorMin: {x: 0, y: 1}
13931395
m_AnchorMax: {x: 0, y: 1}
@@ -1460,9 +1462,9 @@ RectTransform:
14601462
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
14611463
m_LocalPosition: {x: 0, y: 0, z: 0}
14621464
m_LocalScale: {x: 1, y: 1, z: 1}
1465+
m_ConstrainProportionsScale: 0
14631466
m_Children: []
14641467
m_Father: {fileID: 873334740239139040}
1465-
m_RootOrder: 4
14661468
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14671469
m_AnchorMin: {x: 0.5, y: 0}
14681470
m_AnchorMax: {x: 0.5, y: 1}
@@ -1536,9 +1538,9 @@ RectTransform:
15361538
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
15371539
m_LocalPosition: {x: 0, y: 0, z: -3}
15381540
m_LocalScale: {x: 1, y: 1, z: 1}
1541+
m_ConstrainProportionsScale: 0
15391542
m_Children: []
15401543
m_Father: {fileID: 873334740239139040}
1541-
m_RootOrder: 12
15421544
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15431545
m_AnchorMin: {x: 1, y: 1}
15441546
m_AnchorMax: {x: 1, y: 1}
@@ -1667,9 +1669,9 @@ RectTransform:
16671669
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
16681670
m_LocalPosition: {x: 0, y: 0, z: 0}
16691671
m_LocalScale: {x: 1, y: 1, z: 1}
1672+
m_ConstrainProportionsScale: 0
16701673
m_Children: []
16711674
m_Father: {fileID: 873334740239139040}
1672-
m_RootOrder: 7
16731675
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16741676
m_AnchorMin: {x: 0, y: 0}
16751677
m_AnchorMax: {x: 1, y: 1}
@@ -1742,9 +1744,9 @@ RectTransform:
17421744
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
17431745
m_LocalPosition: {x: 0, y: 0, z: 0}
17441746
m_LocalScale: {x: 1, y: 1, z: 1}
1747+
m_ConstrainProportionsScale: 0
17451748
m_Children: []
17461749
m_Father: {fileID: 873334740239139040}
1747-
m_RootOrder: 6
17481750
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17491751
m_AnchorMin: {x: 0.5, y: 0}
17501752
m_AnchorMax: {x: 0.5, y: 1}
@@ -1817,9 +1819,9 @@ RectTransform:
18171819
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
18181820
m_LocalPosition: {x: 0, y: 0, z: 0}
18191821
m_LocalScale: {x: 1, y: 1, z: 1}
1822+
m_ConstrainProportionsScale: 0
18201823
m_Children: []
18211824
m_Father: {fileID: 3813561709073635053}
1822-
m_RootOrder: 0
18231825
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
18241826
m_AnchorMin: {x: 0, y: 0}
18251827
m_AnchorMax: {x: 1, y: 1}
@@ -1928,6 +1930,7 @@ PrefabInstance:
19281930
m_ObjectHideFlags: 0
19291931
serializedVersion: 2
19301932
m_Modification:
1933+
serializedVersion: 3
19311934
m_TransformParent: {fileID: 5277713031684110775}
19321935
m_Modifications:
19331936
- target: {fileID: 7109257143461247492, guid: 7562e0bb2a96dfc4996f8ab34f4a0cee, type: 3}
@@ -2119,6 +2122,9 @@ PrefabInstance:
21192122
value: 0
21202123
objectReference: {fileID: 0}
21212124
m_RemovedComponents: []
2125+
m_RemovedGameObjects: []
2126+
m_AddedGameObjects: []
2127+
m_AddedComponents: []
21222128
m_SourcePrefab: {fileID: 100100000, guid: 7562e0bb2a96dfc4996f8ab34f4a0cee, type: 3}
21232129
--- !u!224 &5277713031219212452 stripped
21242130
RectTransform:
@@ -2135,6 +2141,7 @@ PrefabInstance:
21352141
m_ObjectHideFlags: 0
21362142
serializedVersion: 2
21372143
m_Modification:
2144+
serializedVersion: 3
21382145
m_TransformParent: {fileID: 5277713031684110775}
21392146
m_Modifications:
21402147
- target: {fileID: 167653451897872314, guid: df0d6828f44fdd64bb311a3f19236959, type: 3}
@@ -2390,6 +2397,9 @@ PrefabInstance:
23902397
value: 36
23912398
objectReference: {fileID: 0}
23922399
m_RemovedComponents: []
2400+
m_RemovedGameObjects: []
2401+
m_AddedGameObjects: []
2402+
m_AddedComponents: []
23932403
m_SourcePrefab: {fileID: 100100000, guid: df0d6828f44fdd64bb311a3f19236959, type: 3}
23942404
--- !u!224 &9010914333762435528 stripped
23952405
RectTransform:
@@ -2401,6 +2411,7 @@ PrefabInstance:
24012411
m_ObjectHideFlags: 0
24022412
serializedVersion: 2
24032413
m_Modification:
2414+
serializedVersion: 3
24042415
m_TransformParent: {fileID: 5277713031684110775}
24052416
m_Modifications:
24062417
- target: {fileID: 1201613408548134179, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
@@ -2624,6 +2635,9 @@ PrefabInstance:
26242635
value: 0
26252636
objectReference: {fileID: 0}
26262637
m_RemovedComponents: []
2638+
m_RemovedGameObjects: []
2639+
m_AddedGameObjects: []
2640+
m_AddedComponents: []
26272641
m_SourcePrefab: {fileID: 100100000, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
26282642
--- !u!224 &5277713031123338908 stripped
26292643
RectTransform:
@@ -2635,6 +2649,7 @@ PrefabInstance:
26352649
m_ObjectHideFlags: 0
26362650
serializedVersion: 2
26372651
m_Modification:
2652+
serializedVersion: 3
26382653
m_TransformParent: {fileID: 5277713031684110775}
26392654
m_Modifications:
26402655
- target: {fileID: 797167611908236020, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3}
@@ -2730,6 +2745,9 @@ PrefabInstance:
27302745
value: 0
27312746
objectReference: {fileID: 0}
27322747
m_RemovedComponents: []
2748+
m_RemovedGameObjects: []
2749+
m_AddedGameObjects: []
2750+
m_AddedComponents: []
27332751
m_SourcePrefab: {fileID: 100100000, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3}
27342752
--- !u!224 &3433386668875250805 stripped
27352753
RectTransform:
@@ -2752,6 +2770,7 @@ PrefabInstance:
27522770
m_ObjectHideFlags: 0
27532771
serializedVersion: 2
27542772
m_Modification:
2773+
serializedVersion: 3
27552774
m_TransformParent: {fileID: 5277713031684110775}
27562775
m_Modifications:
27572776
- target: {fileID: 5210474333085558483, guid: 8b2306d4cfca3b642afa5534b0ba275a, type: 3}
@@ -2867,6 +2886,9 @@ PrefabInstance:
28672886
value: 0
28682887
objectReference: {fileID: 0}
28692888
m_RemovedComponents: []
2889+
m_RemovedGameObjects: []
2890+
m_AddedGameObjects: []
2891+
m_AddedComponents: []
28702892
m_SourcePrefab: {fileID: 100100000, guid: 8b2306d4cfca3b642afa5534b0ba275a, type: 3}
28712893
--- !u!224 &103977269980398715 stripped
28722894
RectTransform:

0 commit comments

Comments
 (0)