Skip to content

Commit 93a4cae

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents e98cf3c + 00166e6 commit 93a4cae

File tree

6 files changed

+533
-8
lines changed

6 files changed

+533
-8
lines changed
Lines changed: 332 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,332 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &1023847579128865624
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: 104997861827913311}
12+
- component: {fileID: 7314421248705519828}
13+
- component: {fileID: 7152513905270507753}
14+
m_Layer: 0
15+
m_Name: Javeriana
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!224 &104997861827913311
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: 1023847579128865624}
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_ConstrainProportionsScale: 0
32+
m_Children: []
33+
m_Father: {fileID: 9101491513542103955}
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
m_AnchorMin: {x: 0, y: 0}
36+
m_AnchorMax: {x: 0, y: 0}
37+
m_AnchoredPosition: {x: 0, y: 0}
38+
m_SizeDelta: {x: 204.4705, y: 100}
39+
m_Pivot: {x: 0.5, y: 0.5}
40+
--- !u!222 &7314421248705519828
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: 1023847579128865624}
47+
m_CullTransparentMesh: 1
48+
--- !u!114 &7152513905270507753
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: 1023847579128865624}
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: edbe117a41c87334aabba3c23bf84caf, type: 3}
69+
m_Type: 0
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
78+
--- !u!1 &3480441365153933837
79+
GameObject:
80+
m_ObjectHideFlags: 0
81+
m_CorrespondingSourceObject: {fileID: 0}
82+
m_PrefabInstance: {fileID: 0}
83+
m_PrefabAsset: {fileID: 0}
84+
serializedVersion: 6
85+
m_Component:
86+
- component: {fileID: 4481228903227946954}
87+
- component: {fileID: 4512583911279701492}
88+
- component: {fileID: 2368097734150569121}
89+
m_Layer: 0
90+
m_Name: Companies
91+
m_TagString: Untagged
92+
m_Icon: {fileID: 0}
93+
m_NavMeshLayer: 0
94+
m_StaticEditorFlags: 0
95+
m_IsActive: 1
96+
--- !u!224 &4481228903227946954
97+
RectTransform:
98+
m_ObjectHideFlags: 0
99+
m_CorrespondingSourceObject: {fileID: 0}
100+
m_PrefabInstance: {fileID: 0}
101+
m_PrefabAsset: {fileID: 0}
102+
m_GameObject: {fileID: 3480441365153933837}
103+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
104+
m_LocalPosition: {x: 0, y: 0, z: 0}
105+
m_LocalScale: {x: 1, y: 1, z: 1}
106+
m_ConstrainProportionsScale: 0
107+
m_Children:
108+
- {fileID: 9101491513542103955}
109+
m_Father: {fileID: 0}
110+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
111+
m_AnchorMin: {x: 0, y: 0}
112+
m_AnchorMax: {x: 0, y: 0}
113+
m_AnchoredPosition: {x: 0, y: 0}
114+
m_SizeDelta: {x: 0, y: 0}
115+
m_Pivot: {x: 0.5, y: 0.5}
116+
--- !u!222 &4512583911279701492
117+
CanvasRenderer:
118+
m_ObjectHideFlags: 0
119+
m_CorrespondingSourceObject: {fileID: 0}
120+
m_PrefabInstance: {fileID: 0}
121+
m_PrefabAsset: {fileID: 0}
122+
m_GameObject: {fileID: 3480441365153933837}
123+
m_CullTransparentMesh: 1
124+
--- !u!114 &2368097734150569121
125+
MonoBehaviour:
126+
m_ObjectHideFlags: 0
127+
m_CorrespondingSourceObject: {fileID: 0}
128+
m_PrefabInstance: {fileID: 0}
129+
m_PrefabAsset: {fileID: 0}
130+
m_GameObject: {fileID: 3480441365153933837}
131+
m_Enabled: 1
132+
m_EditorHideFlags: 0
133+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
134+
m_Name:
135+
m_EditorClassIdentifier:
136+
m_Material: {fileID: 0}
137+
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
138+
m_RaycastTarget: 1
139+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
140+
m_Maskable: 1
141+
m_OnCullStateChanged:
142+
m_PersistentCalls:
143+
m_Calls: []
144+
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
145+
m_Type: 1
146+
m_PreserveAspect: 0
147+
m_FillCenter: 1
148+
m_FillMethod: 4
149+
m_FillAmount: 1
150+
m_FillClockwise: 1
151+
m_FillOrigin: 0
152+
m_UseSpriteMesh: 0
153+
m_PixelsPerUnitMultiplier: 1
154+
--- !u!1 &4741102144739592491
155+
GameObject:
156+
m_ObjectHideFlags: 0
157+
m_CorrespondingSourceObject: {fileID: 0}
158+
m_PrefabInstance: {fileID: 0}
159+
m_PrefabAsset: {fileID: 0}
160+
serializedVersion: 6
161+
m_Component:
162+
- component: {fileID: 8423387801309023409}
163+
- component: {fileID: 1804838191122727518}
164+
- component: {fileID: 7009675706151387639}
165+
m_Layer: 0
166+
m_Name: Awaq
167+
m_TagString: Untagged
168+
m_Icon: {fileID: 0}
169+
m_NavMeshLayer: 0
170+
m_StaticEditorFlags: 0
171+
m_IsActive: 1
172+
--- !u!224 &8423387801309023409
173+
RectTransform:
174+
m_ObjectHideFlags: 0
175+
m_CorrespondingSourceObject: {fileID: 0}
176+
m_PrefabInstance: {fileID: 0}
177+
m_PrefabAsset: {fileID: 0}
178+
m_GameObject: {fileID: 4741102144739592491}
179+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
180+
m_LocalPosition: {x: 0, y: 0, z: 0}
181+
m_LocalScale: {x: 1, y: 1, z: 1}
182+
m_ConstrainProportionsScale: 0
183+
m_Children: []
184+
m_Father: {fileID: 9101491513542103955}
185+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
186+
m_AnchorMin: {x: 0, y: 0}
187+
m_AnchorMax: {x: 0, y: 0}
188+
m_AnchoredPosition: {x: 0, y: 0}
189+
m_SizeDelta: {x: 100, y: 100}
190+
m_Pivot: {x: 0.5, y: 0.5}
191+
--- !u!222 &1804838191122727518
192+
CanvasRenderer:
193+
m_ObjectHideFlags: 0
194+
m_CorrespondingSourceObject: {fileID: 0}
195+
m_PrefabInstance: {fileID: 0}
196+
m_PrefabAsset: {fileID: 0}
197+
m_GameObject: {fileID: 4741102144739592491}
198+
m_CullTransparentMesh: 1
199+
--- !u!114 &7009675706151387639
200+
MonoBehaviour:
201+
m_ObjectHideFlags: 0
202+
m_CorrespondingSourceObject: {fileID: 0}
203+
m_PrefabInstance: {fileID: 0}
204+
m_PrefabAsset: {fileID: 0}
205+
m_GameObject: {fileID: 4741102144739592491}
206+
m_Enabled: 1
207+
m_EditorHideFlags: 0
208+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
209+
m_Name:
210+
m_EditorClassIdentifier:
211+
m_Material: {fileID: 0}
212+
m_Color: {r: 1, g: 1, b: 1, a: 1}
213+
m_RaycastTarget: 1
214+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
215+
m_Maskable: 1
216+
m_OnCullStateChanged:
217+
m_PersistentCalls:
218+
m_Calls: []
219+
m_Sprite: {fileID: 21300000, guid: 6d4175f4314682142a896b7d4287dbeb, type: 3}
220+
m_Type: 0
221+
m_PreserveAspect: 0
222+
m_FillCenter: 1
223+
m_FillMethod: 4
224+
m_FillAmount: 1
225+
m_FillClockwise: 1
226+
m_FillOrigin: 0
227+
m_UseSpriteMesh: 0
228+
m_PixelsPerUnitMultiplier: 1
229+
--- !u!1 &7815087359903978363
230+
GameObject:
231+
m_ObjectHideFlags: 0
232+
m_CorrespondingSourceObject: {fileID: 0}
233+
m_PrefabInstance: {fileID: 0}
234+
m_PrefabAsset: {fileID: 0}
235+
serializedVersion: 6
236+
m_Component:
237+
- component: {fileID: 9101491513542103955}
238+
- component: {fileID: 320369541091694232}
239+
- component: {fileID: 8941091004109886143}
240+
- component: {fileID: 7024774610467736875}
241+
m_Layer: 0
242+
m_Name: Images
243+
m_TagString: Untagged
244+
m_Icon: {fileID: 0}
245+
m_NavMeshLayer: 0
246+
m_StaticEditorFlags: 0
247+
m_IsActive: 1
248+
--- !u!224 &9101491513542103955
249+
RectTransform:
250+
m_ObjectHideFlags: 0
251+
m_CorrespondingSourceObject: {fileID: 0}
252+
m_PrefabInstance: {fileID: 0}
253+
m_PrefabAsset: {fileID: 0}
254+
m_GameObject: {fileID: 7815087359903978363}
255+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
256+
m_LocalPosition: {x: 0, y: 0, z: 0}
257+
m_LocalScale: {x: 1, y: 1, z: 1}
258+
m_ConstrainProportionsScale: 0
259+
m_Children:
260+
- {fileID: 8423387801309023409}
261+
- {fileID: 104997861827913311}
262+
m_Father: {fileID: 4481228903227946954}
263+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
264+
m_AnchorMin: {x: 0, y: 0}
265+
m_AnchorMax: {x: 1, y: 1}
266+
m_AnchoredPosition: {x: 0, y: 0}
267+
m_SizeDelta: {x: 0, y: 0}
268+
m_Pivot: {x: 0.5, y: 0.5}
269+
--- !u!222 &320369541091694232
270+
CanvasRenderer:
271+
m_ObjectHideFlags: 0
272+
m_CorrespondingSourceObject: {fileID: 0}
273+
m_PrefabInstance: {fileID: 0}
274+
m_PrefabAsset: {fileID: 0}
275+
m_GameObject: {fileID: 7815087359903978363}
276+
m_CullTransparentMesh: 1
277+
--- !u!114 &8941091004109886143
278+
MonoBehaviour:
279+
m_ObjectHideFlags: 0
280+
m_CorrespondingSourceObject: {fileID: 0}
281+
m_PrefabInstance: {fileID: 0}
282+
m_PrefabAsset: {fileID: 0}
283+
m_GameObject: {fileID: 7815087359903978363}
284+
m_Enabled: 1
285+
m_EditorHideFlags: 0
286+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
287+
m_Name:
288+
m_EditorClassIdentifier:
289+
m_Material: {fileID: 0}
290+
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
291+
m_RaycastTarget: 1
292+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
293+
m_Maskable: 1
294+
m_OnCullStateChanged:
295+
m_PersistentCalls:
296+
m_Calls: []
297+
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
298+
m_Type: 1
299+
m_PreserveAspect: 0
300+
m_FillCenter: 1
301+
m_FillMethod: 4
302+
m_FillAmount: 1
303+
m_FillClockwise: 1
304+
m_FillOrigin: 0
305+
m_UseSpriteMesh: 0
306+
m_PixelsPerUnitMultiplier: 1
307+
--- !u!114 &7024774610467736875
308+
MonoBehaviour:
309+
m_ObjectHideFlags: 0
310+
m_CorrespondingSourceObject: {fileID: 0}
311+
m_PrefabInstance: {fileID: 0}
312+
m_PrefabAsset: {fileID: 0}
313+
m_GameObject: {fileID: 7815087359903978363}
314+
m_Enabled: 1
315+
m_EditorHideFlags: 0
316+
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
317+
m_Name:
318+
m_EditorClassIdentifier:
319+
m_Padding:
320+
m_Left: 20
321+
m_Right: 20
322+
m_Top: 10
323+
m_Bottom: 10
324+
m_ChildAlignment: 1
325+
m_Spacing: 0
326+
m_ChildForceExpandWidth: 1
327+
m_ChildForceExpandHeight: 1
328+
m_ChildControlWidth: 0
329+
m_ChildControlHeight: 0
330+
m_ChildScaleWidth: 0
331+
m_ChildScaleHeight: 0
332+
m_ReverseArrangement: 0

Assets/Prefabs/Credits/Companies.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.
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)