Skip to content

Commit c1db4b3

Browse files
authored
Merge pull request #8 from Unity-Technologies/release/1.9.0
release/1.9.0
2 parents 58ca16b + db70aa7 commit c1db4b3

326 files changed

Lines changed: 30366 additions & 1671 deletions

File tree

Some content is hidden

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

Assets/Common/Prefabs/Debug/Debug Back Button.prefab

Lines changed: 225 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,80 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &1420127877840442754
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 8966883112530635464}
12+
- component: {fileID: 1273615324275093201}
13+
- component: {fileID: 5568376816699013756}
14+
m_Layer: 5
15+
m_Name: Button Background
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!224 &8966883112530635464
22+
RectTransform:
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
27+
m_GameObject: {fileID: 1420127877840442754}
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_Children: []
32+
m_Father: {fileID: 1870729987356791782}
33+
m_RootOrder: 0
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
m_AnchorMin: {x: 0, y: 0}
36+
m_AnchorMax: {x: 1, y: 1}
37+
m_AnchoredPosition: {x: 0, y: 0}
38+
m_SizeDelta: {x: 0, y: 0}
39+
m_Pivot: {x: 0.5, y: 0.5}
40+
--- !u!222 &1273615324275093201
41+
CanvasRenderer:
42+
m_ObjectHideFlags: 0
43+
m_CorrespondingSourceObject: {fileID: 0}
44+
m_PrefabInstance: {fileID: 0}
45+
m_PrefabAsset: {fileID: 0}
46+
m_GameObject: {fileID: 1420127877840442754}
47+
m_CullTransparentMesh: 1
48+
--- !u!114 &5568376816699013756
49+
MonoBehaviour:
50+
m_ObjectHideFlags: 0
51+
m_CorrespondingSourceObject: {fileID: 0}
52+
m_PrefabInstance: {fileID: 0}
53+
m_PrefabAsset: {fileID: 0}
54+
m_GameObject: {fileID: 1420127877840442754}
55+
m_Enabled: 1
56+
m_EditorHideFlags: 0
57+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
58+
m_Name:
59+
m_EditorClassIdentifier:
60+
m_Material: {fileID: 0}
61+
m_Color: {r: 1, g: 1, b: 1, a: 1}
62+
m_RaycastTarget: 1
63+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
64+
m_Maskable: 1
65+
m_OnCullStateChanged:
66+
m_PersistentCalls:
67+
m_Calls: []
68+
m_Sprite: {fileID: 21300000, guid: 8f3903a67d11a4910aef31ea9147a065, type: 3}
69+
m_Type: 1
70+
m_PreserveAspect: 0
71+
m_FillCenter: 1
72+
m_FillMethod: 4
73+
m_FillAmount: 1
74+
m_FillClockwise: 1
75+
m_FillOrigin: 0
76+
m_UseSpriteMesh: 0
77+
m_PixelsPerUnitMultiplier: 1
378
--- !u!1 &1870729987356791781
479
GameObject:
580
m_ObjectHideFlags: 0
@@ -30,7 +105,9 @@ RectTransform:
30105
m_LocalPosition: {x: 0, y: 0, z: 0}
31106
m_LocalScale: {x: 1, y: 1, z: 1}
32107
m_Children:
108+
- {fileID: 8966883112530635464}
33109
- {fileID: 1267245489249964990}
110+
- {fileID: 2648290244028472716}
34111
m_Father: {fileID: 0}
35112
m_RootOrder: 0
36113
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -68,11 +145,11 @@ MonoBehaviour:
68145
m_SelectOnRight: {fileID: 0}
69146
m_Transition: 1
70147
m_Colors:
71-
m_NormalColor: {r: 0.94, g: 0.94, b: 0.94, a: 1}
72-
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
73-
m_PressedColor: {r: 0.90099996, g: 0.90099996, b: 0.90099996, a: 1}
74-
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
75-
m_DisabledColor: {r: 0.56, g: 0.56, b: 0.56, a: 0.8}
148+
m_NormalColor: {r: 0.94, g: 0.94, b: 0.94, a: 0.2}
149+
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 0.29803923}
150+
m_PressedColor: {r: 0.90099996, g: 0.90099996, b: 0.90099996, a: 0.29803923}
151+
m_SelectedColor: {r: 1, g: 1, b: 1, a: 0.29803923}
152+
m_DisabledColor: {r: 0.56, g: 0.56, b: 0.56, a: 0.050980393}
76153
m_ColorMultiplier: 1
77154
m_FadeDuration: 0.1
78155
m_SpriteState:
@@ -87,7 +164,7 @@ MonoBehaviour:
87164
m_SelectedTrigger: Selected
88165
m_DisabledTrigger: Disabled
89166
m_Interactable: 1
90-
m_TargetGraphic: {fileID: 5581014507781104350}
167+
m_TargetGraphic: {fileID: 5568376816699013756}
91168
m_OnClick:
92169
m_PersistentCalls:
93170
m_Calls:
@@ -117,6 +194,140 @@ MonoBehaviour:
117194
m_EditorClassIdentifier:
118195
sceneName: Start Here
119196
readmeFile: {fileID: 11400000, guid: 0e9997e1da4a042ea8dcc9b25ad77185, type: 2}
197+
--- !u!1 &2401928329087443019
198+
GameObject:
199+
m_ObjectHideFlags: 0
200+
m_CorrespondingSourceObject: {fileID: 0}
201+
m_PrefabInstance: {fileID: 0}
202+
m_PrefabAsset: {fileID: 0}
203+
serializedVersion: 6
204+
m_Component:
205+
- component: {fileID: 2648290244028472716}
206+
- component: {fileID: 1316544614228775522}
207+
- component: {fileID: 5656641377365034621}
208+
m_Layer: 5
209+
m_Name: Label
210+
m_TagString: Untagged
211+
m_Icon: {fileID: 0}
212+
m_NavMeshLayer: 0
213+
m_StaticEditorFlags: 0
214+
m_IsActive: 1
215+
--- !u!224 &2648290244028472716
216+
RectTransform:
217+
m_ObjectHideFlags: 0
218+
m_CorrespondingSourceObject: {fileID: 0}
219+
m_PrefabInstance: {fileID: 0}
220+
m_PrefabAsset: {fileID: 0}
221+
m_GameObject: {fileID: 2401928329087443019}
222+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
223+
m_LocalPosition: {x: 0, y: 0, z: 0}
224+
m_LocalScale: {x: 1, y: 1, z: 1}
225+
m_Children: []
226+
m_Father: {fileID: 1870729987356791782}
227+
m_RootOrder: 2
228+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
229+
m_AnchorMin: {x: 0, y: 0}
230+
m_AnchorMax: {x: 1, y: 1}
231+
m_AnchoredPosition: {x: 17, y: 0}
232+
m_SizeDelta: {x: -34, y: 0}
233+
m_Pivot: {x: 0.5, y: 0.5}
234+
--- !u!222 &1316544614228775522
235+
CanvasRenderer:
236+
m_ObjectHideFlags: 0
237+
m_CorrespondingSourceObject: {fileID: 0}
238+
m_PrefabInstance: {fileID: 0}
239+
m_PrefabAsset: {fileID: 0}
240+
m_GameObject: {fileID: 2401928329087443019}
241+
m_CullTransparentMesh: 1
242+
--- !u!114 &5656641377365034621
243+
MonoBehaviour:
244+
m_ObjectHideFlags: 0
245+
m_CorrespondingSourceObject: {fileID: 0}
246+
m_PrefabInstance: {fileID: 0}
247+
m_PrefabAsset: {fileID: 0}
248+
m_GameObject: {fileID: 2401928329087443019}
249+
m_Enabled: 1
250+
m_EditorHideFlags: 0
251+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
252+
m_Name:
253+
m_EditorClassIdentifier:
254+
m_Material: {fileID: 0}
255+
m_Color: {r: 1, g: 1, b: 1, a: 1}
256+
m_RaycastTarget: 1
257+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
258+
m_Maskable: 1
259+
m_OnCullStateChanged:
260+
m_PersistentCalls:
261+
m_Calls: []
262+
m_text: Menu
263+
m_isRightToLeft: 0
264+
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
265+
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
266+
m_fontSharedMaterials: []
267+
m_fontMaterial: {fileID: 0}
268+
m_fontMaterials: []
269+
m_fontColor32:
270+
serializedVersion: 2
271+
rgba: 4292467161
272+
m_fontColor: {r: 0.85, g: 0.85, b: 0.85, a: 1}
273+
m_enableVertexGradient: 0
274+
m_colorMode: 3
275+
m_fontColorGradient:
276+
topLeft: {r: 1, g: 1, b: 1, a: 1}
277+
topRight: {r: 1, g: 1, b: 1, a: 1}
278+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
279+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
280+
m_fontColorGradientPreset: {fileID: 0}
281+
m_spriteAsset: {fileID: 0}
282+
m_tintAllSprites: 0
283+
m_StyleSheet: {fileID: 0}
284+
m_TextStyleHashCode: -1183493901
285+
m_overrideHtmlColors: 0
286+
m_faceColor:
287+
serializedVersion: 2
288+
rgba: 4294967295
289+
m_fontSize: 16
290+
m_fontSizeBase: 16
291+
m_fontWeight: 400
292+
m_enableAutoSizing: 0
293+
m_fontSizeMin: 18
294+
m_fontSizeMax: 72
295+
m_fontStyle: 1
296+
m_HorizontalAlignment: 1
297+
m_VerticalAlignment: 512
298+
m_textAlignment: 65535
299+
m_characterSpacing: -2
300+
m_wordSpacing: 0
301+
m_lineSpacing: 0
302+
m_lineSpacingMax: 0
303+
m_paragraphSpacing: 0
304+
m_charWidthMaxAdj: 0
305+
m_enableWordWrapping: 1
306+
m_wordWrappingRatios: 0.4
307+
m_overflowMode: 0
308+
m_linkedTextComponent: {fileID: 0}
309+
parentLinkedComponent: {fileID: 0}
310+
m_enableKerning: 1
311+
m_enableExtraPadding: 0
312+
checkPaddingRequired: 0
313+
m_isRichText: 1
314+
m_parseCtrlCharacters: 1
315+
m_isOrthographic: 1
316+
m_isCullingEnabled: 0
317+
m_horizontalMapping: 0
318+
m_verticalMapping: 0
319+
m_uvLineOffset: 0
320+
m_geometrySortingOrder: 0
321+
m_IsTextObjectScaleStatic: 0
322+
m_VertexBufferAutoSizeReduction: 0
323+
m_useMaxVisibleDescender: 1
324+
m_pageToDisplay: 1
325+
m_margin: {x: 0, y: 0, z: 0, w: 0}
326+
m_isUsingLegacyAnimationComponent: 0
327+
m_isVolumetricText: 0
328+
m_hasFontAssetChanged: 0
329+
m_baseMaterial: {fileID: 0}
330+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
120331
--- !u!1 &7831092584977098927
121332
GameObject:
122333
m_ObjectHideFlags: 0
@@ -147,13 +358,13 @@ RectTransform:
147358
m_LocalScale: {x: 1, y: 1, z: 1}
148359
m_Children: []
149360
m_Father: {fileID: 1870729987356791782}
150-
m_RootOrder: 0
361+
m_RootOrder: 1
151362
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
152-
m_AnchorMin: {x: 0.5, y: 0.5}
153-
m_AnchorMax: {x: 0.5, y: 0.5}
154-
m_AnchoredPosition: {x: 0, y: 0}
155-
m_SizeDelta: {x: 48, y: 48}
156-
m_Pivot: {x: 0.5, y: 0.5}
363+
m_AnchorMin: {x: 0, y: 0.5}
364+
m_AnchorMax: {x: 0, y: 0.5}
365+
m_AnchoredPosition: {x: 8, y: 0}
366+
m_SizeDelta: {x: 16, y: 16}
367+
m_Pivot: {x: 0, y: 0.5}
157368
--- !u!222 &6565132741397010784
158369
CanvasRenderer:
159370
m_ObjectHideFlags: 0
@@ -175,14 +386,14 @@ MonoBehaviour:
175386
m_Name:
176387
m_EditorClassIdentifier:
177388
m_Material: {fileID: 0}
178-
m_Color: {r: 1, g: 1, b: 1, a: 1}
389+
m_Color: {r: 0.85, g: 0.85, b: 0.85, a: 1}
179390
m_RaycastTarget: 1
180391
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
181392
m_Maskable: 1
182393
m_OnCullStateChanged:
183394
m_PersistentCalls:
184395
m_Calls: []
185-
m_Sprite: {fileID: 21300000, guid: 7f5915dbbf5a9476b8a9a66437bdd7e2, type: 3}
396+
m_Sprite: {fileID: 21300000, guid: 2f3880354ad1a45ce8e87802841bb97c, type: 3}
186397
m_Type: 0
187398
m_PreserveAspect: 1
188399
m_FillCenter: 1

Assets/Common/Project Inbox/Prefabs/InboxButton.prefab

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,6 @@ MonoBehaviour:
7676
m_FillOrigin: 0
7777
m_UseSpriteMesh: 0
7878
m_PixelsPerUnitMultiplier: 1
79-
--- !u!114 &2361792280780524619
80-
MonoBehaviour:
81-
m_ObjectHideFlags: 0
82-
m_CorrespondingSourceObject: {fileID: 0}
83-
m_PrefabInstance: {fileID: 0}
84-
m_PrefabAsset: {fileID: 0}
85-
m_GameObject: {fileID: 1922193173565503278}
86-
m_Enabled: 1
87-
m_EditorHideFlags: 0
88-
m_Script: {fileID: 11500000, guid: 65b603e7ad3c447cb60593522e350e1a, type: 3}
89-
m_Name:
90-
m_EditorClassIdentifier:
91-
m_InboxButton: {fileID: 1922193173565503276}
92-
m_MessagesCallout: {fileID: 2395781570748665219}
93-
m_InboxCountIndicator: {fileID: 339805790077684923}
94-
m_InboxCountText: {fileID: 2826155961769350747}
9579
--- !u!1 &2059251685009821344
9680
GameObject:
9781
m_ObjectHideFlags: 0
@@ -558,3 +542,32 @@ MonoBehaviour:
558542
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
559543
m_Name:
560544
m_EditorClassIdentifier:
545+
--- !u!114 &2361792280780524619
546+
MonoBehaviour:
547+
m_ObjectHideFlags: 0
548+
m_CorrespondingSourceObject: {fileID: 0}
549+
m_PrefabInstance: {fileID: 0}
550+
m_PrefabAsset: {fileID: 0}
551+
m_GameObject: {fileID: 1922193173565503278}
552+
m_Enabled: 1
553+
m_EditorHideFlags: 0
554+
m_Script: {fileID: 11500000, guid: 65b603e7ad3c447cb60593522e350e1a, type: 3}
555+
m_Name:
556+
m_EditorClassIdentifier:
557+
inboxButton: {fileID: 1922193173565503276}
558+
messagesCallout: {fileID: 2395781570748665219}
559+
inboxCountIndicator: {fileID: 339805790077684923}
560+
inboxCountText: {fileID: 2826155961769350747}
561+
--- !u!114 &285610968032154330
562+
MonoBehaviour:
563+
m_ObjectHideFlags: 0
564+
m_CorrespondingSourceObject: {fileID: 0}
565+
m_PrefabInstance: {fileID: 0}
566+
m_PrefabAsset: {fileID: 0}
567+
m_GameObject: {fileID: 1922193173565503278}
568+
m_Enabled: 1
569+
m_EditorHideFlags: 0
570+
m_Script: {fileID: 11500000, guid: 06b0a11160ab444328f4c66e07c105dc, type: 3}
571+
m_Name:
572+
m_EditorClassIdentifier:
573+
buttonName: ProjectInbox_OpenInboxButton

Assets/Common/Project Inbox/Prefabs/InboxPopup.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,8 +711,8 @@ MonoBehaviour:
711711
m_Script: {fileID: 11500000, guid: f6d577dbfcc14213a5ae059f147dae2c, type: 3}
712712
m_Name:
713713
m_EditorClassIdentifier:
714-
m_MessageListView: {fileID: 8477352401060951923}
715-
m_LoadingSpinner: {fileID: 1799412769346747362}
714+
messageListView: {fileID: 8477352401060951923}
715+
loadingSpinner: {fileID: 1799412769346747362}
716716
--- !u!1 &9099015751747866134
717717
GameObject:
718718
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)