diff --git a/Assets/MemoryBox/arScene/Scripts/InitDebug.cs b/Assets/MemoryBox/arScene/Scripts/InitDebug.cs new file mode 100644 index 0000000000000000000000000000000000000000..a6d53904e7147470d35f29641ebb5c96198ecc71 --- /dev/null +++ b/Assets/MemoryBox/arScene/Scripts/InitDebug.cs @@ -0,0 +1,18 @@ +using UnityEngine; + +namespace MemoryBox.arScene.Scripts +{ + public class InitDebug : MonoBehaviour { + + // Use this for initialization + void Start () + { + enabled = Debug.isDebugBuild || Application.isEditor; + } + + // Update is called once per frame + void Update () { + + } + } +} diff --git a/Assets/MemoryBox/arScene/Scripts/InitDebug.cs.meta b/Assets/MemoryBox/arScene/Scripts/InitDebug.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..3d81a91d6131571388921328488e4131deb74b0d --- /dev/null +++ b/Assets/MemoryBox/arScene/Scripts/InitDebug.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 428db0daf05654045986055f54093643 +timeCreated: 1517592151 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MemoryBox/arScene/arScene.unity b/Assets/MemoryBox/arScene/arScene.unity index b8805e4aebfb5541d46c8a7ac5d8ae98676bb599..0941158d684ef34752fd8724a06a4f4b14ded861 100644 --- a/Assets/MemoryBox/arScene/arScene.unity +++ b/Assets/MemoryBox/arScene/arScene.unity @@ -158,7 +158,7 @@ Prefab: - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} @@ -168,17 +168,17 @@ Prefab: - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_AnchoredPosition.y - value: -14.192017 + value: -15.900024 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_SizeDelta.x - value: 108.33 + value: 108.3 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_SizeDelta.y - value: 28.583 + value: 32.9 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} @@ -249,9 +249,115 @@ Prefab: propertyPath: m_FontData.m_Alignment value: 2 objectReference: {fileID: 0} + - target: {fileID: 114986475278266802, guid: e8350cb38dd13ca46975a05ee8bd0e3a, + type: 2} + propertyPath: m_FontData.m_FontSize + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 114986475278266802, guid: e8350cb38dd13ca46975a05ee8bd0e3a, + type: 2} + propertyPath: m_FontData.m_MaxSize + value: 115 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} m_IsPrefabParent: 0 +--- !u!1 &194651071 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 194651075} + - component: {fileID: 194651074} + - component: {fileID: 194651073} + - component: {fileID: 194651072} + m_Layer: 5 + m_Name: HudAR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &194651072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 194651071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &194651073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 194651071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 720, y: 1280} + m_ScreenMatchMode: 1 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &194651074 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 194651071} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &194651075 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 194651071} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1917059639} + - {fileID: 390057442} + - {fileID: 642231144} + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &390057441 GameObject: m_ObjectHideFlags: 0 @@ -275,12 +381,12 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 390057441} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1746675495} - m_RootOrder: 2 + m_Father: {fileID: 194651075} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -650,7 +756,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &594891861 RectTransform: m_ObjectHideFlags: 0 @@ -664,11 +770,11 @@ RectTransform: - {fileID: 1533591244} - {fileID: 1076696613} m_Father: {fileID: 1746675495} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 11.38, y: 9.57} + m_AnchoredPosition: {x: 11.380005, y: 9.569946} m_SizeDelta: {x: 22.76, y: 19.15} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &594891862 @@ -928,6 +1034,116 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &642231143 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 642231144} + - component: {fileID: 642231147} + - component: {fileID: 642231146} + - component: {fileID: 642231145} + m_Layer: 5 + m_Name: ButtonMyMemories + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &642231144 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 642231143} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 194651075} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: 495} + m_SizeDelta: {x: 75, y: 140} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &642231145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 642231143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 642231146} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &642231146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 642231143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 21300000, guid: 2ed33bc04aefe4049ba06df2c529108e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &642231147 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 642231143} --- !u!1001 &747345095 Prefab: m_ObjectHideFlags: 0 @@ -1700,7 +1916,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1376629749 RectTransform: m_ObjectHideFlags: 0 @@ -1716,7 +1932,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 114.73, y: -18.05} + m_AnchoredPosition: {x: 114.73001, y: -18.050049} m_SizeDelta: {x: 280.87, y: 38.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1376629750 @@ -2250,6 +2466,7 @@ GameObject: - component: {fileID: 1746675494} - component: {fileID: 1746675493} - component: {fileID: 1746675492} + - component: {fileID: 1746675496} m_Layer: 5 m_Name: DebugCanvas m_TagString: Untagged @@ -2287,7 +2504,7 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 640} + m_ReferenceResolution: {x: 720, y: 1280} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -2326,10 +2543,9 @@ RectTransform: m_Children: - {fileID: 959351420} - {fileID: 1376629749} - - {fileID: 390057442} - {fileID: 594891861} - - {fileID: 1305741587} - {fileID: 602188452} + - {fileID: 1305741587} m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2338,6 +2554,85 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1746675496 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1746675491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 428db0daf05654045986055f54093643, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1917059638 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1917059639} + - component: {fileID: 1917059641} + - component: {fileID: 1917059640} + m_Layer: 5 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1917059639 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1917059638} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 194651075} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.49999997, y: 1} +--- !u!114 &1917059640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1917059638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.535} + 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_Sprite: {fileID: 21300000, guid: dc726a8ea451f400495ed3cbac7caca5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1917059641 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1917059638} --- !u!1001 &1920006673 Prefab: m_ObjectHideFlags: 0 @@ -2383,27 +2678,27 @@ Prefab: - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_AnchoredPosition.x - value: -44.841 + value: -20.89 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_AnchoredPosition.y - value: -31.7 + value: -40 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_SizeDelta.x - value: 110.2 + value: 51.35 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_SizeDelta.y - value: 23.91 + value: 26.09 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} @@ -2474,6 +2769,16 @@ Prefab: propertyPath: m_FontData.m_Alignment value: 2 objectReference: {fileID: 0} + - target: {fileID: 114986475278266802, guid: e8350cb38dd13ca46975a05ee8bd0e3a, + type: 2} + propertyPath: m_FontData.m_FontSize + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 114986475278266802, guid: e8350cb38dd13ca46975a05ee8bd0e3a, + type: 2} + propertyPath: m_FontData.m_MaxSize + value: 69 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} m_IsPrefabParent: 0