Skip to content

Commit

Permalink
Merge pull request #4 from ARX-SKE12/tagging
Browse files Browse the repository at this point in the history
Update Scene
  • Loading branch information
ReiiYuki authored Jan 21, 2018
2 parents 21c8b83 + 8201ec2 commit 64b37d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 76 deletions.
75 changes: 0 additions & 75 deletions Assets/ARTag/Scenes/ARTag.unity
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,6 @@ RectTransform:
- {fileID: 114303265}
- {fileID: 1751991904}
- {fileID: 2044903785}
- {fileID: 1058915441}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1133,80 +1132,6 @@ Transform:
m_Father: {fileID: 711749370}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1058915440
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1058915441}
- component: {fileID: 1058915443}
- component: {fileID: 1058915442}
m_Layer: 5
m_Name: Pos
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1058915441
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1058915440}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999801, y: 0.9999801, z: 0.9999801}
m_Children: []
m_Father: {fileID: 479505304}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.05447714, y: 0.142}
m_AnchorMax: {x: 0.95423573, y: 0.21761611}
m_AnchoredPosition: {x: 0.000004529953, y: -1.3268738}
m_SizeDelta: {x: -2.7000732, y: -2.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1058915442
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1058915440}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 1
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: HIT
--- !u!222 &1058915443
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1058915440}
--- !u!1 &1169919492
GameObject:
m_ObjectHideFlags: 0
Expand Down
5 changes: 4 additions & 1 deletion ProjectSettings/EditorBuildSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
m_Scenes:
- enabled: 1
path: Assets/ARTag/Scenes/ARTag.unity
guid: 1f09ebf04e878ae4292dcf440080816c

0 comments on commit 64b37d7

Please sign in to comment.