Skip to content

Commit 074abdc

Browse files
authored
Merge pull request #65 from ARX-SKE12/utility
Production Icon
2 parents e289da0 + c56d2ca commit 074abdc

23 files changed

Lines changed: 1140 additions & 428 deletions

Assets/ARTag/Prefabs/Server Plane.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ MeshRenderer:
5050
m_PrefabParentObject: {fileID: 0}
5151
m_PrefabInternal: {fileID: 100100000}
5252
m_GameObject: {fileID: 1400114541640238}
53-
m_Enabled: 1
53+
m_Enabled: 0
5454
m_CastShadows: 1
5555
m_ReceiveShadows: 1
5656
m_DynamicOccludee: 1

Assets/ARTag/Prefabs/Tags/Image Tag.prefab

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ GameObject:
7272
- component: {fileID: 224033591998346538}
7373
- component: {fileID: 222957250344683758}
7474
- component: {fileID: 114770757622432532}
75+
- component: {fileID: 114842507501880012}
7576
m_Layer: 0
7677
m_Name: Panel
7778
m_TagString: Untagged
@@ -205,6 +206,58 @@ MonoBehaviour:
205206
m_FillAmount: 1
206207
m_FillClockwise: 1
207208
m_FillOrigin: 0
209+
--- !u!114 &114842507501880012
210+
MonoBehaviour:
211+
m_ObjectHideFlags: 1
212+
m_PrefabParentObject: {fileID: 0}
213+
m_PrefabInternal: {fileID: 100100000}
214+
m_GameObject: {fileID: 1878959644988706}
215+
m_Enabled: 1
216+
m_EditorHideFlags: 0
217+
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
218+
m_Name:
219+
m_EditorClassIdentifier:
220+
m_Navigation:
221+
m_Mode: 3
222+
m_SelectOnUp: {fileID: 0}
223+
m_SelectOnDown: {fileID: 0}
224+
m_SelectOnLeft: {fileID: 0}
225+
m_SelectOnRight: {fileID: 0}
226+
m_Transition: 1
227+
m_Colors:
228+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
229+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
230+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
231+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
232+
m_ColorMultiplier: 1
233+
m_FadeDuration: 0.1
234+
m_SpriteState:
235+
m_HighlightedSprite: {fileID: 0}
236+
m_PressedSprite: {fileID: 0}
237+
m_DisabledSprite: {fileID: 0}
238+
m_AnimationTriggers:
239+
m_NormalTrigger: Normal
240+
m_HighlightedTrigger: Highlighted
241+
m_PressedTrigger: Pressed
242+
m_DisabledTrigger: Disabled
243+
m_Interactable: 1
244+
m_TargetGraphic: {fileID: 114770757622432532}
245+
m_OnClick:
246+
m_PersistentCalls:
247+
m_Calls:
248+
- m_Target: {fileID: 114188066932942814}
249+
m_MethodName: OnClick
250+
m_Mode: 1
251+
m_Arguments:
252+
m_ObjectArgument: {fileID: 0}
253+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
254+
m_IntArgument: 0
255+
m_FloatArgument: 0
256+
m_StringArgument:
257+
m_BoolArgument: 0
258+
m_CallState: 2
259+
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
260+
Culture=neutral, PublicKeyToken=null
208261
--- !u!222 &222706045196058716
209262
CanvasRenderer:
210263
m_ObjectHideFlags: 1

Assets/ARTag/Prefabs/Tags/Image with Captions Tag.prefab

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ GameObject:
5555
- component: {fileID: 224108947620157174}
5656
- component: {fileID: 222135836826636894}
5757
- component: {fileID: 114938438115691314}
58+
- component: {fileID: 114678792464126196}
5859
m_Layer: 0
5960
m_Name: Image
6061
m_TagString: Untagged
@@ -254,6 +255,58 @@ MonoBehaviour:
254255
m_VerticalOverflow: 1
255256
m_LineSpacing: 1
256257
m_Text: Title
258+
--- !u!114 &114678792464126196
259+
MonoBehaviour:
260+
m_ObjectHideFlags: 1
261+
m_PrefabParentObject: {fileID: 0}
262+
m_PrefabInternal: {fileID: 100100000}
263+
m_GameObject: {fileID: 1677422235502948}
264+
m_Enabled: 1
265+
m_EditorHideFlags: 0
266+
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
267+
m_Name:
268+
m_EditorClassIdentifier:
269+
m_Navigation:
270+
m_Mode: 3
271+
m_SelectOnUp: {fileID: 0}
272+
m_SelectOnDown: {fileID: 0}
273+
m_SelectOnLeft: {fileID: 0}
274+
m_SelectOnRight: {fileID: 0}
275+
m_Transition: 1
276+
m_Colors:
277+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
278+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
279+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
280+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
281+
m_ColorMultiplier: 1
282+
m_FadeDuration: 0.1
283+
m_SpriteState:
284+
m_HighlightedSprite: {fileID: 0}
285+
m_PressedSprite: {fileID: 0}
286+
m_DisabledSprite: {fileID: 0}
287+
m_AnimationTriggers:
288+
m_NormalTrigger: Normal
289+
m_HighlightedTrigger: Highlighted
290+
m_PressedTrigger: Pressed
291+
m_DisabledTrigger: Disabled
292+
m_Interactable: 1
293+
m_TargetGraphic: {fileID: 114938438115691314}
294+
m_OnClick:
295+
m_PersistentCalls:
296+
m_Calls:
297+
- m_Target: {fileID: 114432598507987908}
298+
m_MethodName: OnClick
299+
m_Mode: 1
300+
m_Arguments:
301+
m_ObjectArgument: {fileID: 0}
302+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
303+
m_IntArgument: 0
304+
m_FloatArgument: 0
305+
m_StringArgument:
306+
m_BoolArgument: 0
307+
m_CallState: 2
308+
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
309+
Culture=neutral, PublicKeyToken=null
257310
--- !u!114 &114757400752676296
258311
MonoBehaviour:
259312
m_ObjectHideFlags: 1

Assets/ARTag/Prefabs/Tags/Text Tag.prefab

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ GameObject:
7676
- component: {fileID: 114502830424129464}
7777
- component: {fileID: 114120174913846948}
7878
- component: {fileID: 114186147998653476}
79+
- component: {fileID: 114300153712252120}
7980
m_Layer: 0
8081
m_Name: Panel
8182
m_TagString: Untagged
@@ -182,6 +183,58 @@ MonoBehaviour:
182183
m_VerticalOverflow: 1
183184
m_LineSpacing: 1
184185
m_Text: Title
186+
--- !u!114 &114300153712252120
187+
MonoBehaviour:
188+
m_ObjectHideFlags: 1
189+
m_PrefabParentObject: {fileID: 0}
190+
m_PrefabInternal: {fileID: 100100000}
191+
m_GameObject: {fileID: 1875871293611064}
192+
m_Enabled: 1
193+
m_EditorHideFlags: 0
194+
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
195+
m_Name:
196+
m_EditorClassIdentifier:
197+
m_Navigation:
198+
m_Mode: 3
199+
m_SelectOnUp: {fileID: 0}
200+
m_SelectOnDown: {fileID: 0}
201+
m_SelectOnLeft: {fileID: 0}
202+
m_SelectOnRight: {fileID: 0}
203+
m_Transition: 1
204+
m_Colors:
205+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
206+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
207+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
208+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
209+
m_ColorMultiplier: 1
210+
m_FadeDuration: 0.1
211+
m_SpriteState:
212+
m_HighlightedSprite: {fileID: 0}
213+
m_PressedSprite: {fileID: 0}
214+
m_DisabledSprite: {fileID: 0}
215+
m_AnimationTriggers:
216+
m_NormalTrigger: Normal
217+
m_HighlightedTrigger: Highlighted
218+
m_PressedTrigger: Pressed
219+
m_DisabledTrigger: Disabled
220+
m_Interactable: 1
221+
m_TargetGraphic: {fileID: 114502830424129464}
222+
m_OnClick:
223+
m_PersistentCalls:
224+
m_Calls:
225+
- m_Target: {fileID: 114676336842234580}
226+
m_MethodName: OnClick
227+
m_Mode: 1
228+
m_Arguments:
229+
m_ObjectArgument: {fileID: 0}
230+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
231+
m_IntArgument: 0
232+
m_FloatArgument: 0
233+
m_StringArgument:
234+
m_BoolArgument: 0
235+
m_CallState: 2
236+
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
237+
Culture=neutral, PublicKeyToken=null
185238
--- !u!114 &114396786055055444
186239
MonoBehaviour:
187240
m_ObjectHideFlags: 1
@@ -384,7 +437,7 @@ RectTransform:
384437
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
385438
m_AnchorMin: {x: 0, y: 0}
386439
m_AnchorMax: {x: 0, y: 0}
387-
m_AnchoredPosition: {x: 0, y: 0}
440+
m_AnchoredPosition: {x: 750, y: 0}
388441
m_SizeDelta: {x: 0, y: 0}
389442
m_Pivot: {x: 0.5, y: 1}
390443
--- !u!224 &224108179310387874

Assets/ARTag/Prefabs/Tags/Title Tag.prefab

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ GameObject:
7676
- component: {fileID: 114244901995229186}
7777
- component: {fileID: 114998069604353300}
7878
- component: {fileID: 114917881228142128}
79+
- component: {fileID: 114762586766537652}
7980
m_Layer: 0
8081
m_Name: Panel
8182
m_TagString: Untagged
@@ -229,6 +230,58 @@ MonoBehaviour:
229230
m_ChildForceExpandHeight: 0
230231
m_ChildControlWidth: 1
231232
m_ChildControlHeight: 1
233+
--- !u!114 &114762586766537652
234+
MonoBehaviour:
235+
m_ObjectHideFlags: 1
236+
m_PrefabParentObject: {fileID: 0}
237+
m_PrefabInternal: {fileID: 100100000}
238+
m_GameObject: {fileID: 1740630720879836}
239+
m_Enabled: 1
240+
m_EditorHideFlags: 0
241+
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
242+
m_Name:
243+
m_EditorClassIdentifier:
244+
m_Navigation:
245+
m_Mode: 3
246+
m_SelectOnUp: {fileID: 0}
247+
m_SelectOnDown: {fileID: 0}
248+
m_SelectOnLeft: {fileID: 0}
249+
m_SelectOnRight: {fileID: 0}
250+
m_Transition: 1
251+
m_Colors:
252+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
253+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
254+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
255+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
256+
m_ColorMultiplier: 1
257+
m_FadeDuration: 0.1
258+
m_SpriteState:
259+
m_HighlightedSprite: {fileID: 0}
260+
m_PressedSprite: {fileID: 0}
261+
m_DisabledSprite: {fileID: 0}
262+
m_AnimationTriggers:
263+
m_NormalTrigger: Normal
264+
m_HighlightedTrigger: Highlighted
265+
m_PressedTrigger: Pressed
266+
m_DisabledTrigger: Disabled
267+
m_Interactable: 1
268+
m_TargetGraphic: {fileID: 114244901995229186}
269+
m_OnClick:
270+
m_PersistentCalls:
271+
m_Calls:
272+
- m_Target: {fileID: 114812225001662112}
273+
m_MethodName: OnClick
274+
m_Mode: 1
275+
m_Arguments:
276+
m_ObjectArgument: {fileID: 0}
277+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
278+
m_IntArgument: 0
279+
m_FloatArgument: 0
280+
m_StringArgument:
281+
m_BoolArgument: 0
282+
m_CallState: 2
283+
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
284+
Culture=neutral, PublicKeyToken=null
232285
--- !u!114 &114812225001662112
233286
MonoBehaviour:
234287
m_ObjectHideFlags: 1

Assets/ARTag/Prefabs/Tags/Vertical Image with Captions Tag.prefab

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ GameObject:
9191
- component: {fileID: 224398383666176830}
9292
- component: {fileID: 222489678539282398}
9393
- component: {fileID: 114677997497106786}
94+
- component: {fileID: 114955637509097314}
9495
m_Layer: 0
9596
m_Name: Image
9697
m_TagString: Untagged
@@ -364,6 +365,58 @@ MonoBehaviour:
364365
m_FallbackScreenDPI: 96
365366
m_DefaultSpriteDPI: 96
366367
m_DynamicPixelsPerUnit: 1
368+
--- !u!114 &114955637509097314
369+
MonoBehaviour:
370+
m_ObjectHideFlags: 1
371+
m_PrefabParentObject: {fileID: 0}
372+
m_PrefabInternal: {fileID: 100100000}
373+
m_GameObject: {fileID: 1694371197545330}
374+
m_Enabled: 1
375+
m_EditorHideFlags: 0
376+
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
377+
m_Name:
378+
m_EditorClassIdentifier:
379+
m_Navigation:
380+
m_Mode: 3
381+
m_SelectOnUp: {fileID: 0}
382+
m_SelectOnDown: {fileID: 0}
383+
m_SelectOnLeft: {fileID: 0}
384+
m_SelectOnRight: {fileID: 0}
385+
m_Transition: 1
386+
m_Colors:
387+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
388+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
389+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
390+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
391+
m_ColorMultiplier: 1
392+
m_FadeDuration: 0.1
393+
m_SpriteState:
394+
m_HighlightedSprite: {fileID: 0}
395+
m_PressedSprite: {fileID: 0}
396+
m_DisabledSprite: {fileID: 0}
397+
m_AnimationTriggers:
398+
m_NormalTrigger: Normal
399+
m_HighlightedTrigger: Highlighted
400+
m_PressedTrigger: Pressed
401+
m_DisabledTrigger: Disabled
402+
m_Interactable: 1
403+
m_TargetGraphic: {fileID: 114677997497106786}
404+
m_OnClick:
405+
m_PersistentCalls:
406+
m_Calls:
407+
- m_Target: {fileID: 114135131330887576}
408+
m_MethodName: OnClick
409+
m_Mode: 1
410+
m_Arguments:
411+
m_ObjectArgument: {fileID: 0}
412+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
413+
m_IntArgument: 0
414+
m_FloatArgument: 0
415+
m_StringArgument:
416+
m_BoolArgument: 0
417+
m_CallState: 2
418+
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
419+
Culture=neutral, PublicKeyToken=null
367420
--- !u!114 &114985191445136588
368421
MonoBehaviour:
369422
m_ObjectHideFlags: 1

0 commit comments

Comments
 (0)