Skip to content

Commit 83079a8

Browse files
committed
Merge remote-tracking branch 'origin/main' into main
2 parents ff9b994 + a7af7b0 commit 83079a8

20 files changed

+1200
-346
lines changed
Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &13983207499148722
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: 13983207499148723}
12+
- component: {fileID: 13983207499148720}
13+
m_Layer: 5
14+
m_Name: Mask
15+
m_TagString: Untagged
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!224 &13983207499148723
21+
RectTransform:
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
26+
m_GameObject: {fileID: 13983207499148722}
27+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28+
m_LocalPosition: {x: 0, y: 0, z: 0}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_Children:
31+
- {fileID: 13983208306011572}
32+
m_Father: {fileID: 0}
33+
m_RootOrder: 0
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
m_AnchorMin: {x: 0.5, y: 0}
36+
m_AnchorMax: {x: 0.5, y: 1}
37+
m_AnchoredPosition: {x: -10.811, y: -164.02}
38+
m_SizeDelta: {x: 1113.763, y: 597.319}
39+
m_Pivot: {x: 0.5, y: 0.5}
40+
--- !u!114 &13983207499148720
41+
MonoBehaviour:
42+
m_ObjectHideFlags: 0
43+
m_CorrespondingSourceObject: {fileID: 0}
44+
m_PrefabInstance: {fileID: 0}
45+
m_PrefabAsset: {fileID: 0}
46+
m_GameObject: {fileID: 13983207499148722}
47+
m_Enabled: 1
48+
m_EditorHideFlags: 0
49+
m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
50+
m_Name:
51+
m_EditorClassIdentifier:
52+
m_Padding: {x: 0, y: 0, z: 0, w: 0}
53+
m_Softness: {x: 0, y: 0}
54+
--- !u!1 &13983208306011575
55+
GameObject:
56+
m_ObjectHideFlags: 0
57+
m_CorrespondingSourceObject: {fileID: 0}
58+
m_PrefabInstance: {fileID: 0}
59+
m_PrefabAsset: {fileID: 0}
60+
serializedVersion: 6
61+
m_Component:
62+
- component: {fileID: 13983208306011572}
63+
- component: {fileID: 13983208306011576}
64+
- component: {fileID: 13983208306011579}
65+
- component: {fileID: 13983208306011578}
66+
- component: {fileID: 13983208306011573}
67+
m_Layer: 5
68+
m_Name: CreditsText
69+
m_TagString: Untagged
70+
m_Icon: {fileID: 0}
71+
m_NavMeshLayer: 0
72+
m_StaticEditorFlags: 0
73+
m_IsActive: 1
74+
--- !u!224 &13983208306011572
75+
RectTransform:
76+
m_ObjectHideFlags: 0
77+
m_CorrespondingSourceObject: {fileID: 0}
78+
m_PrefabInstance: {fileID: 0}
79+
m_PrefabAsset: {fileID: 0}
80+
m_GameObject: {fileID: 13983208306011575}
81+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
82+
m_LocalPosition: {x: 0, y: 0, z: 0}
83+
m_LocalScale: {x: 1, y: 1, z: 1}
84+
m_Children: []
85+
m_Father: {fileID: 13983207499148723}
86+
m_RootOrder: 0
87+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
88+
m_AnchorMin: {x: 0, y: 0.5}
89+
m_AnchorMax: {x: 1, y: 0.5}
90+
m_AnchoredPosition: {x: 0, y: 0}
91+
m_SizeDelta: {x: 0, y: 0}
92+
m_Pivot: {x: 0.5, y: 0.5}
93+
--- !u!222 &13983208306011576
94+
CanvasRenderer:
95+
m_ObjectHideFlags: 0
96+
m_CorrespondingSourceObject: {fileID: 0}
97+
m_PrefabInstance: {fileID: 0}
98+
m_PrefabAsset: {fileID: 0}
99+
m_GameObject: {fileID: 13983208306011575}
100+
m_CullTransparentMesh: 1
101+
--- !u!114 &13983208306011579
102+
MonoBehaviour:
103+
m_ObjectHideFlags: 0
104+
m_CorrespondingSourceObject: {fileID: 0}
105+
m_PrefabInstance: {fileID: 0}
106+
m_PrefabAsset: {fileID: 0}
107+
m_GameObject: {fileID: 13983208306011575}
108+
m_Enabled: 1
109+
m_EditorHideFlags: 0
110+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
111+
m_Name:
112+
m_EditorClassIdentifier:
113+
m_Material: {fileID: 0}
114+
m_Color: {r: 1, g: 1, b: 1, a: 1}
115+
m_RaycastTarget: 1
116+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
117+
m_Maskable: 1
118+
m_OnCullStateChanged:
119+
m_PersistentCalls:
120+
m_Calls: []
121+
m_text:
122+
m_isRightToLeft: 0
123+
m_fontAsset: {fileID: 11400000, guid: fe129390af88b40faa85c89db6820ea6, type: 2}
124+
m_sharedMaterial: {fileID: -5592514773993622969, guid: fe129390af88b40faa85c89db6820ea6,
125+
type: 2}
126+
m_fontSharedMaterials: []
127+
m_fontMaterial: {fileID: 0}
128+
m_fontMaterials: []
129+
m_fontColor32:
130+
serializedVersion: 2
131+
rgba: 4281420142
132+
m_fontColor: {r: 0.43137258, g: 0.28627452, b: 0.19215688, a: 1}
133+
m_enableVertexGradient: 0
134+
m_colorMode: 3
135+
m_fontColorGradient:
136+
topLeft: {r: 1, g: 1, b: 1, a: 1}
137+
topRight: {r: 1, g: 1, b: 1, a: 1}
138+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
139+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
140+
m_fontColorGradientPreset: {fileID: 0}
141+
m_spriteAsset: {fileID: 0}
142+
m_tintAllSprites: 0
143+
m_StyleSheet: {fileID: 0}
144+
m_TextStyleHashCode: -1183493901
145+
m_overrideHtmlColors: 0
146+
m_faceColor:
147+
serializedVersion: 2
148+
rgba: 4294967295
149+
m_fontSize: 51.39
150+
m_fontSizeBase: 51.39
151+
m_fontWeight: 400
152+
m_enableAutoSizing: 0
153+
m_fontSizeMin: 18
154+
m_fontSizeMax: 72
155+
m_fontStyle: 0
156+
m_HorizontalAlignment: 2
157+
m_VerticalAlignment: 256
158+
m_textAlignment: 65535
159+
m_characterSpacing: 0
160+
m_wordSpacing: 0
161+
m_lineSpacing: 0
162+
m_lineSpacingMax: 0
163+
m_paragraphSpacing: 0
164+
m_charWidthMaxAdj: 0
165+
m_enableWordWrapping: 1
166+
m_wordWrappingRatios: 0.4
167+
m_overflowMode: 0
168+
m_linkedTextComponent: {fileID: 0}
169+
parentLinkedComponent: {fileID: 0}
170+
m_enableKerning: 1
171+
m_enableExtraPadding: 0
172+
checkPaddingRequired: 0
173+
m_isRichText: 1
174+
m_parseCtrlCharacters: 1
175+
m_isOrthographic: 1
176+
m_isCullingEnabled: 0
177+
m_horizontalMapping: 0
178+
m_verticalMapping: 0
179+
m_uvLineOffset: 0
180+
m_geometrySortingOrder: 0
181+
m_IsTextObjectScaleStatic: 0
182+
m_VertexBufferAutoSizeReduction: 0
183+
m_useMaxVisibleDescender: 1
184+
m_pageToDisplay: 2
185+
m_margin: {x: 0, y: -12.6128845, z: -1.6937866, w: 1.324295}
186+
m_isUsingLegacyAnimationComponent: 0
187+
m_isVolumetricText: 0
188+
m_hasFontAssetChanged: 0
189+
m_baseMaterial: {fileID: 0}
190+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
191+
--- !u!114 &13983208306011578
192+
MonoBehaviour:
193+
m_ObjectHideFlags: 0
194+
m_CorrespondingSourceObject: {fileID: 0}
195+
m_PrefabInstance: {fileID: 0}
196+
m_PrefabAsset: {fileID: 0}
197+
m_GameObject: {fileID: 13983208306011575}
198+
m_Enabled: 1
199+
m_EditorHideFlags: 0
200+
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
201+
m_Name:
202+
m_EditorClassIdentifier:
203+
m_HorizontalFit: 0
204+
m_VerticalFit: 2
205+
--- !u!114 &13983208306011573
206+
MonoBehaviour:
207+
m_ObjectHideFlags: 0
208+
m_CorrespondingSourceObject: {fileID: 0}
209+
m_PrefabInstance: {fileID: 0}
210+
m_PrefabAsset: {fileID: 0}
211+
m_GameObject: {fileID: 13983208306011575}
212+
m_Enabled: 1
213+
m_EditorHideFlags: 0
214+
m_Script: {fileID: 11500000, guid: 9c39669197b4cc94f852f9245162bde9, type: 3}
215+
m_Name:
216+
m_EditorClassIdentifier:
217+
_creditsText: {fileID: 13983208306011579}
218+
_speedPreset: 100
219+
_speed: 5
220+
_rollAgain: 1
221+
_inputReader: {fileID: 11400000, guid: 945ec0365077176418488737deed54be, type: 2}
222+
_creditsRollEndEvent: {fileID: 11400000, guid: 0dca0c11566e4cb4c9149d174a77012e,
223+
type: 2}
224+
_textCredits: {fileID: 13983208306011572}
225+
_mask: {fileID: 13983207499148723}
226+
_creditsFilename: ContributorsList

UOP1_Project/Assets/Prefabs/UI/GameplayScene/Mask.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)