From 26c2b78022987492eba8675cac6eaf7d277c3474 Mon Sep 17 00:00:00 2001 From: Maciej Maj Date: Mon, 10 Sep 2018 11:47:14 +0200 Subject: [PATCH 1/6] Basic search implementation --- Assets/Animations/LeftListTopBar.meta | 10 + .../LeftListTopBar/CloseSearch.anim | 410 ++++++ .../LeftListTopBar/CloseSearch.anim.meta | 10 + .../LeftListTopBar/LeftListTopBar.anim | 287 +++++ .../LeftListTopBar/LeftListTopBar.anim.meta | 10 + .../Animations/LeftListTopBar/OpenSearch.anim | 410 ++++++ .../LeftListTopBar/OpenSearch.anim.meta | 10 + .../LeftListTopBar/TopBar.controller | 209 ++++ .../LeftListTopBar/TopBar.controller.meta | 10 + Assets/MainScene.unity | 1110 ++++++++++++++--- Assets/NewUI/SearchIcon.png | Bin 0 -> 2410 bytes Assets/NewUI/SearchIcon.png.meta | 76 ++ Assets/Prefabs/TabsButton.prefab | 60 +- Assets/Scripts/SearchField.cs | 3 + ProjectSettings/GraphicsSettings.asset | 1 - 15 files changed, 2392 insertions(+), 224 deletions(-) create mode 100644 Assets/Animations/LeftListTopBar.meta create mode 100644 Assets/Animations/LeftListTopBar/CloseSearch.anim create mode 100644 Assets/Animations/LeftListTopBar/CloseSearch.anim.meta create mode 100644 Assets/Animations/LeftListTopBar/LeftListTopBar.anim create mode 100644 Assets/Animations/LeftListTopBar/LeftListTopBar.anim.meta create mode 100644 Assets/Animations/LeftListTopBar/OpenSearch.anim create mode 100644 Assets/Animations/LeftListTopBar/OpenSearch.anim.meta create mode 100644 Assets/Animations/LeftListTopBar/TopBar.controller create mode 100644 Assets/Animations/LeftListTopBar/TopBar.controller.meta create mode 100644 Assets/NewUI/SearchIcon.png create mode 100644 Assets/NewUI/SearchIcon.png.meta diff --git a/Assets/Animations/LeftListTopBar.meta b/Assets/Animations/LeftListTopBar.meta new file mode 100644 index 0000000..b26b007 --- /dev/null +++ b/Assets/Animations/LeftListTopBar.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8ae53a65adae5404a9a5c33660c6d12e +folderAsset: yes +timeCreated: 1536570785 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/LeftListTopBar/CloseSearch.anim b/Assets/Animations/LeftListTopBar/CloseSearch.anim new file mode 100644 index 0000000..3e19a9c --- /dev/null +++ b/Assets/Animations/LeftListTopBar/CloseSearch.anim @@ -0,0 +1,410 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: CloseSearch + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 214 + inSlope: -1026.0532 + outSlope: -1026.0532 + tangentMode: 0 + - serializedVersion: 2 + time: 0.41666666 + value: 36 + inSlope: -0.18876824 + outSlope: -0.18876824 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: ButtonPlaces + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.41666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: ButtonPlaces/GameObject + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.41666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Date + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.41666666 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.41666666 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_BlocksRaycasts + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.41666666 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Interactable + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0.41666666 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SearchField + classID: 1 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3767987173 + attribute: 1967290853 + script: {fileID: 0} + typeID: 224 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1711373604 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 179083332 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 3739863151 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 4287062452 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.41666666 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 214 + inSlope: -1026.0532 + outSlope: -1026.0532 + tangentMode: 0 + - serializedVersion: 2 + time: 0.41666666 + value: 36 + inSlope: -0.18876824 + outSlope: -0.18876824 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: ButtonPlaces + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.41666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: ButtonPlaces/GameObject + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.41666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Date + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.41666666 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.41666666 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_BlocksRaycasts + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.41666666 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Interactable + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0.41666666 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SearchField + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/LeftListTopBar/CloseSearch.anim.meta b/Assets/Animations/LeftListTopBar/CloseSearch.anim.meta new file mode 100644 index 0000000..b7a1e19 --- /dev/null +++ b/Assets/Animations/LeftListTopBar/CloseSearch.anim.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 73afc6240cc364d38ab8c8e0d911481a +timeCreated: 1536572562 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/LeftListTopBar/LeftListTopBar.anim b/Assets/Animations/LeftListTopBar/LeftListTopBar.anim new file mode 100644 index 0000000..a5b946c --- /dev/null +++ b/Assets/Animations/LeftListTopBar/LeftListTopBar.anim @@ -0,0 +1,287 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: LeftListTopBar + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 36 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: ButtonPlaces + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Date + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SearchField + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Interactable + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_BlocksRaycasts + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: SearchField + classID: 225 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 446136569 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 4287062452 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 3739863151 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3767987173 + attribute: 1967290853 + script: {fileID: 0} + typeID: 224 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 179083332 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 36 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: ButtonPlaces + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Date + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SearchField + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Interactable + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_BlocksRaycasts + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: SearchField + classID: 225 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/LeftListTopBar/LeftListTopBar.anim.meta b/Assets/Animations/LeftListTopBar/LeftListTopBar.anim.meta new file mode 100644 index 0000000..2ee5861 --- /dev/null +++ b/Assets/Animations/LeftListTopBar/LeftListTopBar.anim.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 715469703c2d049b7a33731acb33266b +timeCreated: 1536570785 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/LeftListTopBar/OpenSearch.anim b/Assets/Animations/LeftListTopBar/OpenSearch.anim new file mode 100644 index 0000000..f57c8ee --- /dev/null +++ b/Assets/Animations/LeftListTopBar/OpenSearch.anim @@ -0,0 +1,410 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: OpenSearch + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Date + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 36 + inSlope: 1287.4518 + outSlope: 1287.4518 + tangentMode: 0 + - serializedVersion: 2 + time: 0.4 + value: 214 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: ButtonPlaces + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: ButtonPlaces/GameObject + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SearchField + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.4 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.4 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_BlocksRaycasts + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.4 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Interactable + path: SearchField + classID: 225 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 179083332 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3767987173 + attribute: 1967290853 + script: {fileID: 0} + typeID: 224 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1711373604 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 3739863151 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 446136569 + attribute: 4287062452 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Date + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 36 + inSlope: 1287.4518 + outSlope: 1287.4518 + tangentMode: 0 + - serializedVersion: 2 + time: 0.4 + value: 214 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: ButtonPlaces + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: ButtonPlaces/GameObject + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SearchField + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.4 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.4 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_BlocksRaycasts + path: SearchField + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.4 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Interactable + path: SearchField + classID: 225 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/LeftListTopBar/OpenSearch.anim.meta b/Assets/Animations/LeftListTopBar/OpenSearch.anim.meta new file mode 100644 index 0000000..434ca42 --- /dev/null +++ b/Assets/Animations/LeftListTopBar/OpenSearch.anim.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fef7abb39d730430f89ee84b36002107 +timeCreated: 1536570879 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/LeftListTopBar/TopBar.controller b/Assets/Animations/LeftListTopBar/TopBar.controller new file mode 100644 index 0000000..775d992 --- /dev/null +++ b/Assets/Animations/LeftListTopBar/TopBar.controller @@ -0,0 +1,209 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: TopBar + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Open + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Close + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107860610988348760} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1101617501170055338 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Open + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102401070818679564} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101631659072051284 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102102849767253632} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101778564656566258 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Close + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102031536005678602} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102031536005678602 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: CloseSearch + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101631659072051284} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 73afc6240cc364d38ab8c8e0d911481a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102102849767253632 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: LeftListTopBar + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101617501170055338} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 715469703c2d049b7a33731acb33266b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102401070818679564 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: OpenSearch + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fef7abb39d730430f89ee84b36002107, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107860610988348760 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102102849767253632} + m_Position: {x: 264, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102401070818679564} + m_Position: {x: 276, y: 72, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102031536005678602} + m_Position: {x: 540, y: -36, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 1101778564656566258} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 552, y: 60, z: 0} + m_EntryPosition: {x: 48, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102102849767253632} diff --git a/Assets/Animations/LeftListTopBar/TopBar.controller.meta b/Assets/Animations/LeftListTopBar/TopBar.controller.meta new file mode 100644 index 0000000..67b98f6 --- /dev/null +++ b/Assets/Animations/LeftListTopBar/TopBar.controller.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4aa3d2c14d5af4aaba07c1b2c973c1f3 +timeCreated: 1536570785 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MainScene.unity b/Assets/MainScene.unity index 4e23eff..ef75d5a 100644 --- a/Assets/MainScene.unity +++ b/Assets/MainScene.unity @@ -201,12 +201,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -56 + value: -84 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -11 + value: -33 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -1221,12 +1221,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -28 + value: -119.54999 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 33 + value: -479.46155 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -1994,7 +1994,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 199425746} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -388.14227, z: 0} + m_LocalPosition: {x: 0, y: -415.44995, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2129109461} @@ -2376,7 +2376,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 234618100} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 84, y: 55, z: 0} + m_LocalPosition: {x: 56, y: 0.000061035156, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 987742562} @@ -2436,12 +2436,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 28 + value: 0.000015258789 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -33 + value: -44.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -2907,7 +2907,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 321098578} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -86.15385, z: 0} + m_LocalPosition: {x: 109.5, y: -41.153847, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1811102931} @@ -3095,7 +3095,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 335009988} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 28, y: 55, z: 0} + m_LocalPosition: {x: -0.000015258789, y: 0.000061035156, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 987742562} @@ -3241,12 +3241,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: -85.72632 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: -4.504944 + value: 9.6150055 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -3390,12 +3390,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -28 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 11 + value: -22.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -4187,6 +4187,125 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 569a305541e944c43bf2f60f07449d4f, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &421023585 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1616544793} + m_Modifications: + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalPosition.x + value: 107 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalPosition.y + value: -22 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.x + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -22 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_SizeDelta.x + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_SizeDelta.y + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1660984752974596, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} + propertyPath: m_Name + value: ButtonPlaces + objectReference: {fileID: 0} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 897516548} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: StartSearching + objectReference: {fileID: 0} + - target: {fileID: 224723336648483644, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalPosition.x + value: -18 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} + m_IsPrefabParent: 0 --- !u!1 &421629612 GameObject: m_ObjectHideFlags: 0 @@ -4853,7 +4972,7 @@ Prefab: - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.x - value: 53.273468 + value: 49.235 objectReference: {fileID: 0} - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} @@ -5104,6 +5223,16 @@ Prefab: propertyPath: m_Type value: 0 objectReference: {fileID: 0} + - target: {fileID: 224182035284957092, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalPosition.x + value: 0.000022888184 + objectReference: {fileID: 0} + - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_IsPrefabParent: 0 @@ -5283,7 +5412,7 @@ Prefab: - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.x - value: 164.22192 + value: 163.22192 objectReference: {fileID: 0} - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} @@ -5378,12 +5507,12 @@ Prefab: - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.x - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.y - value: -256.9231 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1660984752974596, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_Name @@ -5397,7 +5526,7 @@ Prefab: - target: {fileID: 224723336648483644, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.x - value: -17.73077 + value: -18.73077 objectReference: {fileID: 0} - target: {fileID: 114416331955944360, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} @@ -5457,6 +5586,35 @@ Prefab: propertyPath: m_TargetGraphic value: objectReference: {fileID: 691927283} + - target: {fileID: 224182035284957092, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalPosition.x + value: 0.000022888184 + objectReference: {fileID: 0} + - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -256.9231 + objectReference: {fileID: 0} + - target: {fileID: 1030449418591758, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Open + objectReference: {fileID: 0} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_IsPrefabParent: 0 @@ -5569,12 +5727,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 84 + value: 56 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 33 + value: -11.000061 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -6368,7 +6526,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 565950011} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -181.42383, y: -21.499989, z: 0} + m_LocalPosition: {x: -159.11612, y: -21.499989, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1602992733} @@ -6419,7 +6577,7 @@ MonoBehaviour: - {fileID: 2059424205} - {fileID: 1881068471} - {fileID: 1881068471} - - {fileID: 1051724953} + - {fileID: 1757203714} tabs: - {fileID: 1861917361} - {fileID: 2063773714} @@ -6436,12 +6594,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 56 + value: 28.000015 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -11 + value: -33 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -6821,7 +6979,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 574856544} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.97496796, y: -344.30414, z: 0} + m_LocalPosition: {x: -0.97496796, y: -371.61182, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1716005849} @@ -6891,12 +7049,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -28 + value: -56 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -11 + value: -33 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -7402,7 +7560,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1410171403} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7768,7 +7926,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 642798510} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.11999, y: 177.69232, z: 0} + m_LocalPosition: {x: 119.11999, y: 205, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 439795140} @@ -8111,12 +8269,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 84 + value: 56 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -33 + value: -44.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -8781,12 +8939,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -56 + value: -84 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 11 + value: -22.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -9043,6 +9201,7 @@ GameObject: - component: {fileID: 694427862} - component: {fileID: 694427860} - component: {fileID: 694427861} + - component: {fileID: 694427864} m_Layer: 5 m_Name: Date m_TagString: Untagged @@ -9071,7 +9230,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 7d68bc0711a734214805019b1d183b6d, type: 3} - m_FontSize: 18 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -9107,7 +9266,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 694427859} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.0000076293945, y: 0, z: 0} + m_LocalPosition: {x: -6, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1051724950} @@ -9118,6 +9277,20 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 22.52} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &694427864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 694427859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.3019608} + m_EffectDistance: {x: 0, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &698079153 GameObject: m_ObjectHideFlags: 0 @@ -9195,13 +9368,15 @@ GameObject: m_Component: - component: {fileID: 715392270} - component: {fileID: 715392271} + - component: {fileID: 715392273} + - component: {fileID: 715392272} m_Layer: 5 m_Name: SearchSuggestions m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &715392270 RectTransform: m_ObjectHideFlags: 0 @@ -9209,7 +9384,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 715392269} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 18.130005, y: 23.692307, z: 0} + m_LocalPosition: {x: -3.5999985, y: 17.389984, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1202556823} @@ -9218,12 +9393,12 @@ RectTransform: - {fileID: 93463230} - {fileID: 499370168} m_Father: {fileID: 1764345209} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 137.13, y: -154} - m_SizeDelta: {x: 199.28, y: 200.98999} + m_AnchoredPosition: {x: 115.4, y: -187.61} + m_SizeDelta: {x: 211.68, y: 289.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &715392271 MonoBehaviour: @@ -9237,16 +9412,49 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 - m_Right: 0 + m_Left: 12 + m_Right: 12 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 - m_ChildForceExpandWidth: 0 + m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 m_ChildControlHeight: 0 +--- !u!114 &715392272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 715392269} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.10196079, g: 0.11764707, b: 0.14117648, 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &715392273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 715392269} --- !u!1001 &718114449 Prefab: m_ObjectHideFlags: 0 @@ -9485,25 +9693,118 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 752576666} ---- !u!1 &803260321 +--- !u!1 &787154563 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 1012539435112666, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 803260322} + - component: {fileID: 787154564} + - component: {fileID: 787154567} + - component: {fileID: 787154566} + - component: {fileID: 787154565} m_Layer: 5 - m_Name: GameObject + m_Name: Image (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &803260322 + m_IsActive: 1 +--- !u!224 &787154564 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 224182035284957092, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 787154563} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 83.50002, y: -2.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1757203713} + 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.000022888184, y: -2.5} + m_SizeDelta: {x: 8, y: 8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &787154565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114770354540230846, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 787154563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &787154566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114519372297509058, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 787154563} + 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: 256a73f2492264c168f27519097360dc, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &787154567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 222128846154579302, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 787154563} +--- !u!1 &803260321 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 803260322} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &803260322 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 803260321} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -9767,7 +10068,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 825851643} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -28, y: 55, z: 0} + m_LocalPosition: {x: -55.999985, y: 0.000061035156, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 987742562} @@ -9948,12 +10249,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: -118.96971 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: -391.74997 + value: 129.615 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -10158,12 +10459,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -28 + value: -56 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -55 + value: -54.99997 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -10748,7 +11049,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 888812806} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -198.25764, z: 0} + m_LocalPosition: {x: 0, y: -225.5653, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1197122675} @@ -10868,17 +11169,17 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 897107443} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 65.00001, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.0000042915344, y: -1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1051724950} - m_RootOrder: 3 + m_Father: {fileID: 1606747115} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -119.21999, y: -569.5692} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -0.0000041081, y: -1.5} + m_SizeDelta: {x: 12, y: 9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &897107445 MonoBehaviour: @@ -10926,32 +11227,33 @@ GameObject: - component: {fileID: 897516549} - component: {fileID: 897516548} - component: {fileID: 897516552} + - component: {fileID: 897516553} m_Layer: 5 m_Name: SearchField m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &897516547 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 897516546} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 142.6923, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -22.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1059206952} - {fileID: 1986380504} - m_Father: {fileID: 1764345209} - m_RootOrder: 4 + m_Father: {fileID: 1616544793} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 119, y: -35} - m_SizeDelta: {x: 218.2, y: 37} + m_AnchoredPosition: {x: 119, y: -22.5} + m_SizeDelta: {x: 214, y: 27} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &897516548 MonoBehaviour: @@ -10976,6 +11278,7 @@ MonoBehaviour: - {fileID: 279118489} - {fileID: 93463232} - {fileID: 499370170} + animator: {fileID: 1616544798} --- !u!114 &897516549 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11004,7 +11307,7 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 897516546} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -11083,6 +11386,17 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!225 &897516553 +CanvasGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 897516546} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1001 &915318958 Prefab: m_ObjectHideFlags: 0 @@ -11093,12 +11407,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -28 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -11 + value: -33 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -11298,7 +11612,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1764345209} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11348,12 +11662,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: -85.72632 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: 85.49501 + value: 99.615005 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -11609,12 +11923,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -28 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 33 + value: -11.000061 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -11796,12 +12110,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -84 + value: 84.000015 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -11 + value: -22.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -12142,7 +12456,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 967983572} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -184.81561, z: 0} + m_LocalPosition: {x: 0, y: -184.81567, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1602435184} @@ -12332,7 +12646,7 @@ Prefab: - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.y - value: -256.9231 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} @@ -12375,6 +12689,51 @@ Prefab: propertyPath: m_TargetGraphic value: objectReference: {fileID: 552538545} + - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -256.9231 + objectReference: {fileID: 0} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Open + objectReference: {fileID: 0} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1030449418591758, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114416331955944360, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1dd82dcb802b345fdac69807f53e2fd3, + type: 3} + - target: {fileID: 114416331955944360, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224515363179996242, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_SizeDelta.y + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 114824166883957558, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_Text + value: Filters + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_IsPrefabParent: 0 @@ -12388,12 +12747,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 56 + value: 28.000015 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 33 + value: -11.000061 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -12588,7 +12947,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 987742561} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -94.30769, z: 0} + m_LocalPosition: {x: 109.5, y: -24.000008, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1625547163} @@ -13213,12 +13572,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -28 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -55 + value: -54.99997 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -13414,7 +13773,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1036966641} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -388.14227, z: 0} + m_LocalPosition: {x: 0, y: -415.44995, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1995312711} @@ -13694,12 +14053,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -28 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -33 + value: -44.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -13899,19 +14258,19 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1051724949} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.019996643, y: -21.2, z: 0} + m_LocalPosition: {x: 83.5, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 694427863} - {fileID: 944965768} - {fileID: 92483158} - - {fileID: 897107444} - m_Father: {fileID: 1616544793} - m_RootOrder: 2 + - {fileID: 1606747115} + m_Father: {fileID: 1757203713} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 118.98, y: -21.2} + m_AnchoredPosition: {x: 106.98002, y: -13.200075} m_SizeDelta: {x: 237.95, y: 42.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1051724951 @@ -13926,7 +14285,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 16 + m_Left: 4 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -13969,7 +14328,7 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1051724949} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -14058,12 +14417,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -84 + value: 84.000015 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -55 + value: -44.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -14341,7 +14700,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1059206951} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -118.96973, y: -522, z: 0} + m_LocalPosition: {x: -25.46154, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 897516547} @@ -14377,7 +14736,7 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1059206951} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -14753,7 +15112,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1118294966} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 56, y: 55, z: 0} + m_LocalPosition: {x: 27.999985, y: 0.000061035156, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 987742562} @@ -14832,7 +15191,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1144076161} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.82997, y: -86.95729, z: 0} + m_LocalPosition: {x: 119.82997, y: -114.26497, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1340324852} @@ -15164,7 +15523,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1197122674} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.025032043, y: 177.59448, z: 0} + m_LocalPosition: {x: 0.025032043, y: 204.90216, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 211861403} @@ -15250,7 +15609,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1202541871} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -83.25, y: -17, z: 0} + m_LocalPosition: {x: 21.22, y: -17, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 592122253} @@ -15523,12 +15882,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 84 + value: 56 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -11 + value: -33 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -15886,12 +16245,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -84 + value: 84.000015 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 11 + value: -11.000061 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -16173,7 +16532,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1289797065} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalPosition: {x: 0, y: 0.0000104904175, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2078342591} @@ -16181,8 +16540,8 @@ RectTransform: 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.5} - m_SizeDelta: {x: -20, y: -13} + m_AnchoredPosition: {x: 0, y: 0.00001049} + m_SizeDelta: {x: -20, y: 0.0000038147} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1289797067 MonoBehaviour: @@ -16196,7 +16555,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.753} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -16210,7 +16569,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 1 @@ -16546,7 +16905,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1300177161} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -56, y: 55, z: 0} + m_LocalPosition: {x: -83.999985, y: 0.000061035156, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 987742562} @@ -16850,7 +17209,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1343234596} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -56, y: 33, z: 0} + m_LocalPosition: {x: 84.000015, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 987742562} @@ -16922,7 +17281,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1345978254} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -100.94998, y: -430.48846, z: 0} + m_LocalPosition: {x: -100.94998, y: -457.79614, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1197122675} @@ -17102,7 +17461,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1365152473} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 109.08466, y: -789.9886, z: -12.89335} + m_LocalPosition: {x: 109.08466, y: -817.29626, z: -12.89335} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 997138229} @@ -17183,7 +17542,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1371052590} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 177.61101, z: 0} + m_LocalPosition: {x: 0, y: 204.9323, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 803260322} @@ -17194,7 +17553,7 @@ RectTransform: 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.08129883} + m_AnchoredPosition: {x: 0, y: -0.06768799} m_SizeDelta: {x: 0, y: 449} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1371052592 @@ -17339,7 +17698,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1371052591} - - {fileID: 2078342591} - {fileID: 608806491} - {fileID: 1718920709} m_Father: {fileID: 1764345209} @@ -17505,7 +17863,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1433522475} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 130.33983, y: 60, z: 0} + m_LocalPosition: {x: 152.62419, y: 60, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 637090571} @@ -17514,7 +17872,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 130.33983, y: 60} + m_AnchoredPosition: {x: 152.62419, y: 60} m_SizeDelta: {x: 400, y: 150} m_Pivot: {x: 1, y: 1} --- !u!114 &1433522477 @@ -17608,7 +17966,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1437571375} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -388.14227, z: 0} + m_LocalPosition: {x: 0, y: -415.44995, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 341613270} @@ -17667,7 +18025,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1475666079} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -84, y: 33, z: 0} + m_LocalPosition: {x: -83.999985, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 987742562} @@ -17813,7 +18171,7 @@ Prefab: - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.x - value: -45.19654 + value: -49.235 objectReference: {fileID: 0} - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} @@ -18059,6 +18417,16 @@ Prefab: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} + - target: {fileID: 224182035284957092, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_LocalPosition.x + value: 0.000022888184 + objectReference: {fileID: 0} + - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_IsPrefabParent: 0 @@ -18072,12 +18440,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -56 + value: -84 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -33 + value: -44.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -18412,7 +18780,7 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -84 + value: 84.000015 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -18992,12 +19360,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 28 + value: 0.000015258789 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 33 + value: -11.000061 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -19247,12 +19615,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -28 + value: -56 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -33 + value: -44.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -19630,43 +19998,97 @@ RectTransform: m_PrefabParentObject: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_PrefabInternal: {fileID: 1985633680} ---- !u!1 &1609308049 +--- !u!1 &1606747114 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1609308050} - - component: {fileID: 1609308053} - - component: {fileID: 1609308052} - - component: {fileID: 1609308051} + - component: {fileID: 1606747115} + - component: {fileID: 1606747116} m_Layer: 5 - m_Name: Image (13) + m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1609308050 +--- !u!224 &1606747115 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1609308049} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 200, y: 0.000015258789, z: 0} - m_LocalScale: {x: 1.0000039, y: 1.0000039, z: 1.0000039} - m_Children: [] - m_Father: {fileID: 1036966642} - m_RootOrder: 13 + m_GameObject: {fileID: 1606747114} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 47.076923, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 897107444} + m_Father: {fileID: 1051724950} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 200, y: 0.000015258789} - m_SizeDelta: {x: 8.9, y: 20} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!225 &1609308051 +--- !u!114 &1606747116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1606747114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 12 + m_PreferredHeight: 28 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &1609308049 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1609308050} + - component: {fileID: 1609308053} + - component: {fileID: 1609308052} + - component: {fileID: 1609308051} + m_Layer: 5 + m_Name: Image (13) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1609308050 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1609308049} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 200, y: 0.000015258789, z: 0} + m_LocalScale: {x: 1.0000039, y: 1.0000039, z: 1.0000039} + m_Children: [] + m_Father: {fileID: 1036966642} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 200, y: 0.000015258789} + m_SizeDelta: {x: 8.9, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &1609308051 CanvasGroup: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -19870,6 +20292,7 @@ GameObject: - component: {fileID: 1616544795} - component: {fileID: 1616544797} - component: {fileID: 1616544796} + - component: {fileID: 1616544798} m_Layer: 5 m_Name: TopBar m_TagString: Untagged @@ -19884,12 +20307,15 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1616544792} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 177.6923, z: 0} + m_LocalPosition: {x: 0, y: 204.99998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1017326892} - {fileID: 1870081139} - - {fileID: 1051724950} + - {fileID: 897516547} + - {fileID: 2078342591} + - {fileID: 2138245040} + - {fileID: 1757203713} m_Father: {fileID: 1764345209} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19996,6 +20422,23 @@ MonoBehaviour: currentCatCircle: {fileID: 997138231} currentCatText: {fileID: 1740006184} currentCatTextMain: {fileID: 1072768483} +--- !u!95 &1616544798 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1616544792} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4aa3d2c14d5af4aaba07c1b2c973c1f3, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!1 &1625547162 GameObject: m_ObjectHideFlags: 0 @@ -20020,7 +20463,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1625547162} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -84, y: 55, z: 0} + m_LocalPosition: {x: -119.54999, y: -512.4615, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 987742562} @@ -20075,6 +20518,100 @@ RectTransform: m_PrefabParentObject: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_PrefabInternal: {fileID: 1502636481} +--- !u!1 &1655620737 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1030449418591758, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1655620738} + - component: {fileID: 1655620741} + - component: {fileID: 1655620740} + - component: {fileID: 1655620739} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1655620738 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1655620737} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 506.01038, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1757203713} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 422.51038, y: 0} + m_SizeDelta: {x: 37.69231, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1655620739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114093759870987442, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1655620737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.3019608} + m_EffectDistance: {x: 0, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &1655620740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114824166883957558, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1655620737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_FontData: + m_Font: {fileID: 12800000, guid: b83603e8e4e014b119d18d8da890cd14, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Saving... +--- !u!222 &1655620741 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 222524682717657260, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1655620737} --- !u!1 &1659316460 GameObject: m_ObjectHideFlags: 0 @@ -20333,7 +20870,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1668756029} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 55, z: 0} + m_LocalPosition: {x: -28, y: 0.000061035156, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 987742562} @@ -20406,7 +20943,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1677901181} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 362.508, z: 0} + m_LocalPosition: {x: 0, y: 389.81567, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2053729636} @@ -20437,12 +20974,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 56 + value: 28.000015 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 11 + value: -22.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -20829,7 +21366,7 @@ RectTransform: - {fileID: 1859588817} - {fileID: 1580129720} m_Father: {fileID: 1410171403} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -21200,7 +21737,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1741422319} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -23.426163, y: -21.499939, z: 0} + m_LocalPosition: {x: -45.73387, y: -21.499939, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2047732803} @@ -21234,6 +21771,160 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 m_ChildControlHeight: 0 +--- !u!1 &1757203712 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1660984752974596, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1757203713} + - component: {fileID: 1757203717} + - component: {fileID: 1757203716} + - component: {fileID: 1757203715} + - component: {fileID: 1757203714} + - component: {fileID: 1757203718} + m_Layer: 5 + m_Name: Date + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1757203713 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1757203712} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -107, y: -21.999939, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 787154564} + - {fileID: 1051724950} + - {fileID: 1655620738} + m_Father: {fileID: 1616544793} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 12, y: -21.999939} + m_SizeDelta: {x: 167, y: 28} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1757203714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114863656116577508, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1757203712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ebab3e09d845491ba1554514dc94b84, type: 3} + m_Name: + m_EditorClassIdentifier: + button: {fileID: 0} + image: {fileID: 787154566} + text: {fileID: 694427860} + unSelectedSprite: {fileID: 21300000, guid: 256a73f2492264c168f27519097360dc, type: 3} + selectedSprite: {fileID: 21300000, guid: 6692b4ea2bce94b13b54273b1eacd200, type: 3} +--- !u!114 &1757203715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1757203712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + 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.86764705, g: 0.86764705, b: 0.86764705, 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: 787154566} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 565950014} + m_MethodName: Open + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1757203716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114766430419047574, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1757203712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 6 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!222 &1757203717 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 222540666219853598, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1757203712} +--- !u!225 &1757203718 +CanvasGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1757203712} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1001 &1761121242 Prefab: m_ObjectHideFlags: 0 @@ -21244,12 +21935,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: -85.72632 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: 25.49504 + value: 39.615005 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -21409,14 +22100,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1764345208} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -129.60617, y: 0.000015258789, z: 0} + m_LocalPosition: {x: -151.91388, y: 0.000015258789, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1003281121} - {fileID: 1410171403} - {fileID: 1616544793} - {fileID: 967983573} - - {fileID: 897516547} - {fileID: 715392270} - {fileID: 918711133} m_Father: {fileID: 2127403382} @@ -22051,7 +22741,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1811102930} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 94.49384, z: 0} + m_LocalPosition: {x: -25.000004, y: 49.493843, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 321098579} @@ -22059,7 +22749,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0.33999634} + m_AnchoredPosition: {x: -25, y: 0.33999634} m_SizeDelta: {x: 78.54, y: 17.89} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1811102932 @@ -22438,12 +23128,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 28 + value: 0.000015258789 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -11 + value: -33 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -22884,7 +23574,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1861917361} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 133.14616, y: 131.69232, z: 0} + m_LocalPosition: {x: 155.45387, y: 159, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1557032088} @@ -23493,12 +24183,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: -85.72632 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: 55.495056 + value: 69.615005 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -23784,12 +24474,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -28 + value: -56 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 11 + value: -22.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -24065,12 +24755,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 56 + value: 28.000015 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -33 + value: -44.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -24584,6 +25274,21 @@ Prefab: propertyPath: m_TargetGraphic value: objectReference: {fileID: 317093948} + - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.x + value: -456.9231 + objectReference: {fileID: 0} + - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -256.9231 + objectReference: {fileID: 0} + - target: {fileID: 224182035284957092, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_AnchoredPosition.x + value: -17.999977 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_IsPrefabParent: 0 @@ -24611,7 +25316,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1986380503} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 10, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 897516547} @@ -24634,7 +25339,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -24642,7 +25347,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 2852971394b9b435ca27bbe6a601ac0a, type: 3} + m_Font: {fileID: 12800000, guid: 7d68bc0711a734214805019b1d183b6d, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -24685,7 +25390,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1992294012} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -16.153847, z: 0} + m_LocalPosition: {x: -711.0762, y: -415.73, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2081856948} @@ -24826,12 +25531,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 28 + value: 0.000015258789 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 11 + value: -22.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -25110,7 +25815,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2003772631} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 83.25, y: -17.000015, z: 0} + m_LocalPosition: {x: 197.78, y: -17.000015, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1016116668} @@ -25783,7 +26488,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2063773714} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 133.14616, y: 131.69232, z: 0} + m_LocalPosition: {x: 155.45387, y: 159, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1228375422} @@ -25891,12 +26596,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 84 + value: 56 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: 11 + value: -22.00003 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -26084,7 +26789,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2078342591 RectTransform: m_ObjectHideFlags: 0 @@ -26092,18 +26797,18 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2078342590} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.025001526, y: 142.6923, z: 0} + m_LocalPosition: {x: 0, y: -22, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2102326051} - {fileID: 1289797066} - m_Father: {fileID: 1410171403} - m_RootOrder: 1 + m_Father: {fileID: 1616544793} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 119.025, y: -35} - m_SizeDelta: {x: 185.15, y: 30} + m_AnchoredPosition: {x: 119, y: -22} + m_SizeDelta: {x: 214, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2078342592 MonoBehaviour: @@ -26204,7 +26909,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2081856948 RectTransform: m_ObjectHideFlags: 0 @@ -26212,7 +26917,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2081856947} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -129.29617, y: 131.69232, z: 0} + m_LocalPosition: {x: -261.15387, y: 159, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 321098579} @@ -26225,9 +26930,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 119.54999, y: -46} - m_SizeDelta: {x: 208.94, y: 80.30769} - m_Pivot: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 10, y: -46} + m_SizeDelta: {x: 219, y: 80.30769} + m_Pivot: {x: 0, y: 1} --- !u!114 &2081856949 MonoBehaviour: m_ObjectHideFlags: 0 @@ -26656,12 +27361,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: 28 + value: 0.000015258789 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -55 + value: -54.99997 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -26843,12 +27548,12 @@ Prefab: - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.x - value: -56 + value: -84 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} propertyPath: m_LocalPosition.y - value: -55 + value: -54.99997 objectReference: {fileID: 0} - target: {fileID: 224113873120918998, guid: e3258efa81b564849bb46d2dc11003df, type: 2} @@ -27267,7 +27972,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2127403378} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 323.5, y: 231, z: 0} + m_LocalPosition: {x: 352.5, y: 266.5, z: 0} m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: - {fileID: 187655526} @@ -27661,6 +28366,11 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 536334473} m_Script: {fileID: 11500000, guid: 02dccebd9cc5f4657855bd609d399f5c, type: 3} +--- !u!224 &2138245040 stripped +RectTransform: + m_PrefabParentObject: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + m_PrefabInternal: {fileID: 421023585} --- !u!1 &2142407208 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/NewUI/SearchIcon.png b/Assets/NewUI/SearchIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..08a6914873d698c7fddfc229bb826360a3c4fdaa GIT binary patch literal 2410 zcmV-w36=JVP)Px;BuPX;R9FeUmuYNO#}&u@Y-3{^I|e&o2mwDerJ%S)DRF{W#S$cFBeft!U2r8M z@u3Jq(-0}Nj-UcQRD7s}s+NWd5KC0bhq5F{EGdhF8VXUNsBJ1^0|6V`7`$M-6fgb% zF85rGFYm!K1djB7XO=TF|2cE!+VK76oKTWT%`=kvtS-ao;_$oEQp+*v7 zDS~M$({BQ~9tYIvw+*15ny?V$*jT!dDGXhAiaO>IeDx`J*&XuE6Gv zw2DtIVX`AmpFUmI)6>%xW|PY` z^k4x`v*u$70|ArZf#(-3TJ)+sSm%08UTiHXDfxr?R}1e7Zwo7gGT~>!JHmSf1qHu4 zd-m)_cP!=O$B)0K{uhKC0mlp|p55IUVJ2bsLoZ&u_zY0?#!l#9i9GRoi+Cr&J!IdkT#DtmJ8-o2Jtvu4dzn0={+yF!;h8bltM z^4J|>#Hq7rh9(^~e*E~i==7zptgP%qk-ee%ZJ|M^@o`<+KwF)_rdk&)SnwCcH+`NA z8Z_v+jT<-qNR=$XQk|`T-{>K~Mi>(Y5e{CyUA=nsn~F~+^+YlI&mB8w|J*dwYBHx^?S5RymLf6DE9574kD{v8KyI)%fBXQU-)XmTvU7-CsvuWD0Wy`-B8XDMuC%L(~h4bdkBaSl!m+&J!4M8(P+lL}k zm*!>FJyHJcRJQoHDnN}ELH&!0a*6=I#RFlSkR zT+QxG+>jWYo}SK;d7{kFtjhv9h!`NrWwQ&XqPKZ2kUe&opUao6Tpf5=^`xwyHHK13nTsciDk$7V~Bn&B2r%uf+EG*=bdD79*(RTFcQ8I~b*zb9?atV7x zHN-nky$Am04%gS}`x7Tl?mFDFy4fA=Eg2<)22-&DJdzGJ^4(cf`yBFYQDw8 zl}!#22yt{XgdbnNe7V|v3tYK!r6MgY?OWJf@ychpFDZ;Q}vYyvxIR18)FVOJ0QaBki|v_-xTHvr3Vil{KQ?5 zvK~SI*}He|Pt-qJcwXRS0E>@Ux^!uAb#?WhWa@ghPhY#n;lqcolFeJf6d@|)3T!wb z!tRc^P>|+$SR4)&#P^6zgnW{t3R@#4jQ z)W7Y1F|G04$BrF)NBu7d&k0;w^R$W&O4zH^J+DeLn4=XnKeAoCVMpI-PyBe?@MXx=gys#>bG?n(l4f6!gR(W%>X0q5{4*5@W>q>gaRauC>k3! zXGff(k4LlOw^^6)WtVg`8l5|R`tBv*rhuJ(M~4O7g|E3&?s%B%X)wcR%Q9+JnVZHm~6Y*Ne0pLDOmq?5zzQQFz?a zr@g+oxVTWcx=T;n-yS-2=#u*QWSf^g2e?PCzPJ*$3)kZg^gFNzoG9KS#gQ6wg?xb= zPwM2PAW0^v6B-1v40plva=egGe?Rd&;j~bH9I>Nita%yF;YA3;hqxycxDVKSo|X0_ zQNkF9Ne;xz?pT*J^AbuBCbQsu>Ui05H}yaULO2-Y7hDqIzHpt*x%Mt;^RRt2v10?4 zY3y!za}LBy-he0gv9(MSuUvY7{1#hG!+=b;EVzVZ^C><#>iR;A!fCtQ`;^$e^c1{$U&f cqPF<|0Y-A_C!4j*O#lD@07*qoM6N<$g31n?RsaA1 literal 0 HcmV?d00001 diff --git a/Assets/NewUI/SearchIcon.png.meta b/Assets/NewUI/SearchIcon.png.meta new file mode 100644 index 0000000..e405ede --- /dev/null +++ b/Assets/NewUI/SearchIcon.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 9b7ad316d82824cb3a34cf5b47936409 +timeCreated: 1536568956 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/TabsButton.prefab b/Assets/Prefabs/TabsButton.prefab index 67f5d8b..5b9ceda 100644 --- a/Assets/Prefabs/TabsButton.prefab +++ b/Assets/Prefabs/TabsButton.prefab @@ -46,7 +46,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &1269045613020094 GameObject: m_ObjectHideFlags: 1 @@ -74,6 +74,7 @@ GameObject: m_Component: - component: {fileID: 224723336648483644} - component: {fileID: 114840476112366440} + - component: {fileID: 225475526020916984} m_Layer: 5 m_Name: GameObject m_TagString: Untagged @@ -149,13 +150,13 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 114519372297509058} m_OnClick: m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} - m_MethodName: Open - m_Mode: 3 + m_MethodName: Save + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -204,7 +205,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1dd82dcb802b345fdac69807f53e2fd3, type: 3} + m_Sprite: {fileID: 21300000, guid: 9b7ad316d82824cb3a34cf5b47936409, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -256,7 +257,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 4 + m_Spacing: 6 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 @@ -312,7 +313,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Filters + m_Text: Saving... --- !u!114 &114840476112366440 MonoBehaviour: m_ObjectHideFlags: 1 @@ -345,7 +346,9 @@ MonoBehaviour: m_EditorClassIdentifier: button: {fileID: 0} image: {fileID: 0} - text: {fileID: 114824166883957558} + text: {fileID: 0} + unSelectedSprite: {fileID: 0} + selectedSprite: {fileID: 0} --- !u!222 &222128846154579302 CanvasRenderer: m_ObjectHideFlags: 1 @@ -376,8 +379,8 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1030449418591758} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -456.9231, y: -256.9231, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 404.51038, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224765645928447170} @@ -385,8 +388,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -456.9231, y: -256.9231} - m_SizeDelta: {x: 160, y: 22} + m_AnchoredPosition: {x: 422.51038, y: 0} + m_SizeDelta: {x: 37.69231, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224182035284957092 RectTransform: @@ -395,7 +398,7 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1012539435112666} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.000022888184, y: -2.5, z: 0} + m_LocalPosition: {x: -17.999977, y: -2.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224765645928447170} @@ -413,7 +416,7 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1269045613020094} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1.5, z: 0} + m_LocalPosition: {x: 0, y: -2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224723336648483644} @@ -421,8 +424,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -1.5} - m_SizeDelta: {x: 20, y: 14} + m_AnchoredPosition: {x: 0, y: -2} + m_SizeDelta: {x: 21, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224723336648483644 RectTransform: @@ -431,7 +434,7 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1508202401969002} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -18, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224515363179996242} @@ -450,7 +453,7 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1660984752974596} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -12, y: -22, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224182035284957092} @@ -459,8 +462,19 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 27} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -12, y: -22} + m_SizeDelta: {x: 36, y: 28} + m_Pivot: {x: 1, y: 0.5} +--- !u!225 &225475526020916984 +CanvasGroup: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1508202401969002} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 diff --git a/Assets/Scripts/SearchField.cs b/Assets/Scripts/SearchField.cs index eb2d37b..4b34caf 100644 --- a/Assets/Scripts/SearchField.cs +++ b/Assets/Scripts/SearchField.cs @@ -12,11 +12,13 @@ public class SearchField : MonoBehaviour { public GameObject stopSearchingArea; public GameObject searchSuggestionsGroup; public SearchSuggestion[] suggestion; + public Animator animator; bool inSearchMode = false; // Start animation public void StartSearching() { + animator.SetTrigger("Open"); inSearchMode = true; foreach (var item in searchHelp) { item.SetActive(false); @@ -46,6 +48,7 @@ void Update() { } } public void StopSearching() { + animator.SetTrigger("Close"); inSearchMode = false; foreach (var item in searchHelp) { item.SetActive(true); diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 657a7fa..d74737e 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -36,7 +36,6 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} From 7a8dd4f827ccdddb2d58e564305bd88358b54468 Mon Sep 17 00:00:00 2001 From: Maciej Maj Date: Mon, 10 Sep 2018 13:27:11 +0200 Subject: [PATCH 2/6] Search UI fixes --- .../LeftListTopBar/CloseSearch.anim | 51 +++ .../LeftListTopBar/LeftListTopBar.anim | 39 +++ .../Animations/LeftListTopBar/OpenSearch.anim | 75 +++++ Assets/MainScene.unity | 300 +++++++++++------- Assets/Prefabs/SearchSuggestion.prefab | 153 +++++++-- Assets/Scripts/SearchSuggestion.cs | 6 +- ProjectSettings/GraphicsSettings.asset | 1 + 7 files changed, 469 insertions(+), 156 deletions(-) diff --git a/Assets/Animations/LeftListTopBar/CloseSearch.anim b/Assets/Animations/LeftListTopBar/CloseSearch.anim index 3e19a9c..ac2b1db 100644 --- a/Assets/Animations/LeftListTopBar/CloseSearch.anim +++ b/Assets/Animations/LeftListTopBar/CloseSearch.anim @@ -170,6 +170,28 @@ AnimationClip: path: SearchField classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.033333335 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: InputField + classID: 225 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -227,6 +249,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3407979168 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -403,6 +432,28 @@ AnimationClip: path: SearchField classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.033333335 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: InputField + classID: 225 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/LeftListTopBar/LeftListTopBar.anim b/Assets/Animations/LeftListTopBar/LeftListTopBar.anim index a5b946c..e08f785 100644 --- a/Assets/Animations/LeftListTopBar/LeftListTopBar.anim +++ b/Assets/Animations/LeftListTopBar/LeftListTopBar.anim @@ -112,6 +112,22 @@ AnimationClip: path: SearchField classID: 225 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: InputField + classID: 225 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -162,6 +178,13 @@ AnimationClip: typeID: 225 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3407979168 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -280,6 +303,22 @@ AnimationClip: path: SearchField classID: 225 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: InputField + classID: 225 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/LeftListTopBar/OpenSearch.anim b/Assets/Animations/LeftListTopBar/OpenSearch.anim index f57c8ee..e5b9e66 100644 --- a/Assets/Animations/LeftListTopBar/OpenSearch.anim +++ b/Assets/Animations/LeftListTopBar/OpenSearch.anim @@ -170,6 +170,40 @@ AnimationClip: path: SearchField classID: 225 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.4 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: InputField + classID: 225 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -227,6 +261,13 @@ AnimationClip: typeID: 225 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3407979168 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -403,6 +444,40 @@ AnimationClip: path: SearchField classID: 225 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.4 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: InputField + classID: 225 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/MainScene.unity b/Assets/MainScene.unity index ef75d5a..5e6293a 100644 --- a/Assets/MainScene.unity +++ b/Assets/MainScene.unity @@ -1994,7 +1994,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 199425746} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -415.44995, z: 0} + m_LocalPosition: {x: 0, y: -442.37305, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2129109461} @@ -3241,12 +3241,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -85.72632 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: 9.6150055 + value: -4.504944 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -3362,21 +3362,28 @@ Prefab: propertyPath: deselectedColor.b value: 0.5441177 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.r value: 0.2794118 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.g value: 0.2794118 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.b value: 0.2794118 objectReference: {fileID: 0} + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + type: 2} + propertyPath: m_LocalPosition.x + value: -6.920006 + objectReference: {fileID: 0} + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} m_IsPrefabParent: 0 @@ -4194,6 +4201,11 @@ Prefab: m_Modification: m_TransformParent: {fileID: 1616544793} m_Modifications: + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.x @@ -4303,6 +4315,31 @@ Prefab: propertyPath: m_LocalPosition.x value: -18 objectReference: {fileID: 0} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 565950014} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: ClearCalendarView + objectReference: {fileID: 0} + - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_IsPrefabParent: 0 @@ -4972,7 +5009,7 @@ Prefab: - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.x - value: 49.235 + value: 53.273468 objectReference: {fileID: 0} - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} @@ -5233,6 +5270,10 @@ Prefab: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1030449418591758, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_IsPrefabParent: 0 @@ -5512,7 +5553,7 @@ Prefab: - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -256.9231 objectReference: {fileID: 0} - target: {fileID: 1660984752974596, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_Name @@ -6526,7 +6567,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 565950011} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -159.11612, y: -21.499989, z: 0} + m_LocalPosition: {x: -71.039215, y: -21.499989, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1602992733} @@ -6979,7 +7020,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 574856544} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.97496796, y: -371.61182, z: 0} + m_LocalPosition: {x: -0.97496796, y: -398.5349, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1716005849} @@ -7926,14 +7967,14 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 642798510} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.11999, y: 205, z: 0} + m_LocalPosition: {x: 119.11999, y: 231.92308, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 439795140} - {fileID: 565950012} - {fileID: 1741422320} m_Father: {fileID: 2127403382} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -9376,15 +9417,15 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &715392270 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 715392269} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.5999985, y: 17.389984, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -239.99078, y: 145.75308, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1202556823} @@ -9392,13 +9433,13 @@ RectTransform: - {fileID: 279118487} - {fileID: 93463230} - {fileID: 499370168} - m_Father: {fileID: 1764345209} - m_RootOrder: 4 + m_Father: {fileID: 2127403382} + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 115.4, y: -187.61} - m_SizeDelta: {x: 211.68, y: 289.23} + m_AnchoredPosition: {x: 119.240005, y: -86.17} + m_SizeDelta: {x: 238, y: 86.35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &715392271 MonoBehaviour: @@ -9412,16 +9453,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 - m_Right: 12 + m_Left: 0 + m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 + m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 - m_ChildControlHeight: 0 + m_ChildControlHeight: 1 --- !u!114 &715392272 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10135,7 +10176,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &829495928 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10195,16 +10236,16 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 829495927} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 118.48001, y: 25.5, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2127403382} - m_RootOrder: 4 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 118.48001, y: 25.5} - m_SizeDelta: {x: -237.96002, y: -50.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &829495930 MonoBehaviour: @@ -10249,12 +10290,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -118.96971 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: 129.615 + value: -391.74997 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -10336,35 +10377,15 @@ Prefab: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 114803886446355086, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} - propertyPath: deselectedColor.r - value: 0.5441177 - objectReference: {fileID: 0} - - target: {fileID: 114803886446355086, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} - propertyPath: deselectedColor.g - value: 0.5441177 - objectReference: {fileID: 0} - - target: {fileID: 114803886446355086, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} - propertyPath: deselectedColor.b - value: 0.5441177 - objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} - propertyPath: m_Color.r - value: 0.2794118 - objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} - propertyPath: m_Color.g - value: 0.2794118 + propertyPath: m_LocalPosition.x + value: -6.920006 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} - propertyPath: m_Color.b - value: 0.2794118 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -11049,7 +11070,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 888812806} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -225.5653, z: 0} + m_LocalPosition: {x: 0, y: -252.4884, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1197122675} @@ -11612,7 +11633,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1764345209} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11662,12 +11683,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -85.72632 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: 99.615005 + value: 85.49501 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -11783,21 +11804,28 @@ Prefab: propertyPath: deselectedColor.b value: 0.5441177 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.r value: 0.2794118 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.g value: 0.2794118 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.b value: 0.2794118 objectReference: {fileID: 0} + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + type: 2} + propertyPath: m_LocalPosition.x + value: -6.920006 + objectReference: {fileID: 0} + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} m_IsPrefabParent: 0 @@ -12646,7 +12674,7 @@ Prefab: - target: {fileID: 224027010031595932, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -256.9231 objectReference: {fileID: 0} - target: {fileID: 114209058920708520, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} @@ -13773,7 +13801,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1036966641} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -415.44995, z: 0} + m_LocalPosition: {x: 0, y: -442.37305, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1995312711} @@ -14700,7 +14728,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1059206951} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -25.46154, y: 0, z: 0} + m_LocalPosition: {x: -2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 897516547} @@ -15191,7 +15219,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1144076161} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.82997, y: -114.26497, z: 0} + m_LocalPosition: {x: 119.82997, y: -141.18805, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1340324852} @@ -15523,7 +15551,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1197122674} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.025032043, y: 204.90216, z: 0} + m_LocalPosition: {x: 0.025032043, y: 231.82526, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 211861403} @@ -17281,7 +17309,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1345978254} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -100.94998, y: -457.79614, z: 0} + m_LocalPosition: {x: -100.94998, y: -484.71924, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1197122675} @@ -17461,7 +17489,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1365152473} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 109.08466, y: -817.29626, z: -12.89335} + m_LocalPosition: {x: 109.08466, y: -844.21936, z: -12.89335} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 997138229} @@ -17542,7 +17570,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1371052590} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 204.9323, z: 0} + m_LocalPosition: {x: 0, y: 231.85538, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 803260322} @@ -17863,7 +17891,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1433522475} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 152.62419, y: 60, z: 0} + m_LocalPosition: {x: 240.54227, y: 60, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 637090571} @@ -17872,7 +17900,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 152.62419, y: 60} + m_AnchoredPosition: {x: 240.54227, y: 60} m_SizeDelta: {x: 400, y: 150} m_Pivot: {x: 1, y: 1} --- !u!114 &1433522477 @@ -17966,7 +17994,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1437571375} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -415.44995, z: 0} + m_LocalPosition: {x: 0, y: -442.37305, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 341613270} @@ -18171,7 +18199,7 @@ Prefab: - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} propertyPath: m_LocalPosition.x - value: -49.235 + value: -45.19654 objectReference: {fileID: 0} - target: {fileID: 224765645928447170, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} @@ -18427,6 +18455,10 @@ Prefab: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1030449418591758, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 103d1f8304bdb41bea27bcf9b447795c, type: 2} m_IsPrefabParent: 0 @@ -20307,7 +20339,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1616544792} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 204.99998, z: 0} + m_LocalPosition: {x: 0, y: 231.92307, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1017326892} @@ -20943,7 +20975,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1677901181} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 389.81567, z: 0} + m_LocalPosition: {x: 0, y: 416.73877, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2053729636} @@ -21360,7 +21392,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1718920708} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.57372284, y: -30.800003, z: 0} + m_LocalPosition: {x: -0.57372284, y: -30.799988, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1859588817} @@ -21737,7 +21769,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1741422319} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -45.73387, y: -21.499939, z: 0} + m_LocalPosition: {x: -133.81078, y: -21.499939, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2047732803} @@ -21935,12 +21967,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -85.72632 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: 39.615005 + value: 25.49504 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -22056,21 +22088,28 @@ Prefab: propertyPath: deselectedColor.b value: 0.5441177 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.r value: 0.2794118 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.g value: 0.2794118 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.b value: 0.2794118 objectReference: {fileID: 0} + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + type: 2} + propertyPath: m_LocalPosition.x + value: -6.920006 + objectReference: {fileID: 0} + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} m_IsPrefabParent: 0 @@ -22100,14 +22139,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1764345208} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -151.91388, y: 0.000015258789, z: 0} + m_LocalPosition: {x: -239.99078, y: 0.000015258789, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1003281121} - {fileID: 1410171403} - {fileID: 1616544793} - {fileID: 967983573} - - {fileID: 715392270} - {fileID: 918711133} m_Father: {fileID: 2127403382} m_RootOrder: 1 @@ -23574,7 +23612,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1861917361} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 155.45387, y: 159, z: 0} + m_LocalPosition: {x: 243.53078, y: 185.92308, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1557032088} @@ -23586,7 +23624,7 @@ RectTransform: - {fileID: 148047053} - {fileID: 2142407209} m_Father: {fileID: 2127403382} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -24183,12 +24221,12 @@ Prefab: - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -85.72632 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} propertyPath: m_LocalPosition.y - value: 69.615005 + value: 55.495056 objectReference: {fileID: 0} - target: {fileID: 224640988348812148, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} @@ -24304,21 +24342,28 @@ Prefab: propertyPath: deselectedColor.b value: 0.5441177 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.r value: 0.2794118 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.g value: 0.2794118 objectReference: {fileID: 0} - - target: {fileID: 114997750818555210, guid: ba260f12d9a1d4a7e9507f0667ff1d98, - type: 2} + - target: {fileID: 0} propertyPath: m_Color.b value: 0.2794118 objectReference: {fileID: 0} + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + type: 2} + propertyPath: m_LocalPosition.x + value: -6.920006 + objectReference: {fileID: 0} + - target: {fileID: 224304898510520400, guid: ba260f12d9a1d4a7e9507f0667ff1d98, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: ba260f12d9a1d4a7e9507f0667ff1d98, type: 2} m_IsPrefabParent: 0 @@ -25339,7 +25384,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -25359,7 +25404,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Search + m_Text: --- !u!222 &1986380506 CanvasRenderer: m_ObjectHideFlags: 0 @@ -26488,7 +26533,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2063773714} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 155.45387, y: 159, z: 0} + m_LocalPosition: {x: 243.53078, y: 185.92308, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1228375422} @@ -26496,7 +26541,7 @@ RectTransform: - {fileID: 1360541113} - {fileID: 298398177} m_Father: {fileID: 2127403382} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -26783,13 +26828,14 @@ GameObject: - component: {fileID: 2078342591} - component: {fileID: 2078342593} - component: {fileID: 2078342592} + - component: {fileID: 2078342594} m_Layer: 5 m_Name: InputField m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2078342591 RectTransform: m_ObjectHideFlags: 0 @@ -26890,6 +26936,17 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2078342590} +--- !u!225 &2078342594 +CanvasGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2078342590} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &2081856947 GameObject: m_ObjectHideFlags: 0 @@ -26917,7 +26974,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2081856947} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -261.15387, y: 159, z: 0} + m_LocalPosition: {x: -349.23077, y: 185.92308, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 321098579} @@ -26926,7 +26983,7 @@ RectTransform: - {fileID: 1202541872} - {fileID: 2003772632} m_Father: {fileID: 2127403382} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -27296,7 +27353,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2102326050} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalPosition: {x: 0, y: 0.000014305115, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2078342591} @@ -27304,8 +27361,8 @@ RectTransform: 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.5} - m_SizeDelta: {x: -20, y: -13} + m_AnchoredPosition: {x: 0, y: 0.000014067} + m_SizeDelta: {x: -20, y: 0.0000076294} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2102326052 MonoBehaviour: @@ -27319,7 +27376,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_Color: {r: 1, g: 1, b: 1, a: 0.722} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -27327,13 +27384,13 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 47e170a2c82e640c7914dc82e6e9c789, type: 3} + m_Font: {fileID: 12800000, guid: 7d68bc0711a734214805019b1d183b6d, type: 3} m_FontSize: 14 - m_FontStyle: 2 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -27972,18 +28029,19 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2127403378} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 352.5, y: 266.5, z: 0} + m_LocalPosition: {x: 467, y: 301.5, z: 0} m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: - {fileID: 187655526} - {fileID: 1764345209} - {fileID: 384800660} - {fileID: 1144076162} - - {fileID: 829495929} - {fileID: 642798511} - {fileID: 1861917362} - {fileID: 2063773715} - {fileID: 2081856948} + - {fileID: 829495929} + - {fileID: 715392270} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/SearchSuggestion.prefab b/Assets/Prefabs/SearchSuggestion.prefab index b9d44d6..c4df3c8 100644 --- a/Assets/Prefabs/SearchSuggestion.prefab +++ b/Assets/Prefabs/SearchSuggestion.prefab @@ -11,6 +11,23 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1361427156393630} m_IsPrefabParent: 1 +--- !u!1 &1318685910124670 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224304898510520400} + - component: {fileID: 222038625222311214} + - component: {fileID: 114510613539028778} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1361427156393630 GameObject: m_ObjectHideFlags: 0 @@ -20,9 +37,10 @@ GameObject: m_Component: - component: {fileID: 224640988348812148} - component: {fileID: 222581917986071178} - - component: {fileID: 114997750818555210} - component: {fileID: 114803886446355086} - component: {fileID: 114585451235110456} + - component: {fileID: 114310254615581998} + - component: {fileID: 114589820500548208} m_Layer: 5 m_Name: SearchSuggestion m_TagString: Untagged @@ -30,6 +48,66 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &114310254615581998 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1361427156393630} + 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: 0.15992649, g: 0.18125002, b: 0.21323532, 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114510613539028778 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1318685910124670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.68235296, g: 0.68235296, b: 0.68235296, 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: 12800000, guid: 7d68bc0711a734214805019b1d183b6d, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Dom --- !u!114 &114585451235110456 MonoBehaviour: m_ObjectHideFlags: 1 @@ -65,7 +143,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 114997750818555210} + m_TargetGraphic: {fileID: 114310254615581998} m_OnClick: m_PersistentCalls: m_Calls: @@ -82,7 +160,7 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &114803886446355086 +--- !u!114 &114589820500548208 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -90,11 +168,21 @@ MonoBehaviour: m_GameObject: {fileID: 1361427156393630} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 596dca55ee24440aab90153b252babca, type: 3} + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - deselectedColor: {r: 0.69803923, g: 0.69803923, b: 0.69803923, a: 1} ---- !u!114 &114997750818555210 + m_Padding: + m_Left: 25 + m_Right: 0 + m_Top: 2 + m_Bottom: 6 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &114803886446355086 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -102,37 +190,41 @@ MonoBehaviour: m_GameObject: {fileID: 1361427156393630} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 596dca55ee24440aab90153b252babca, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.6985294, g: 0.6985294, b: 0.6985294, 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: 12800000, guid: 47e170a2c82e640c7914dc82e6e9c789, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Dom + deselectedColor: {r: 0.6838235, g: 0.6838235, b: 0.6838235, a: 1} + text: {fileID: 114510613539028778} +--- !u!222 &222038625222311214 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1318685910124670} --- !u!222 &222581917986071178 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1361427156393630} +--- !u!224 &224304898510520400 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1318685910124670} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.920006, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224640988348812148} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -6.920005, y: 0} + m_SizeDelta: {x: 173.84, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224640988348812148 RectTransform: m_ObjectHideFlags: 1 @@ -142,7 +234,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -118.96971, y: -391.74997, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 224304898510520400} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/SearchSuggestion.cs b/Assets/Scripts/SearchSuggestion.cs index af3d193..25637c1 100644 --- a/Assets/Scripts/SearchSuggestion.cs +++ b/Assets/Scripts/SearchSuggestion.cs @@ -11,13 +11,9 @@ public class SearchSuggestion : MonoBehaviour { SearchField searchField; public Color deselectedColor; - Text text; + public Text text; bool isEnabled = false; - void Awake() { - text = GetComponent(); - } - public void ClickOnPlace() { if (isEnabled) { RightListUI.instance.NewPlace(place); diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index d74737e..657a7fa 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -36,6 +36,7 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} From 3a6f5f978044ff4e19b557ba63c99557bb23a68f Mon Sep 17 00:00:00 2001 From: Maciej Maj Date: Mon, 10 Sep 2018 22:40:21 +0200 Subject: [PATCH 3/6] Douglas-Peucker algorithm implementation --- Assets/MainScene.unity | 53 +++++++++--------- Assets/Scripts/ReadJson.cs | 4 +- Assets/Scripts/RenderMap.cs | 26 +++++---- Assets/Scripts/SimplifyPath.cs | 87 +++++++++++++++++++++++++++++ Assets/Scripts/SimplifyPath.cs.meta | 13 +++++ 5 files changed, 145 insertions(+), 38 deletions(-) create mode 100644 Assets/Scripts/SimplifyPath.cs create mode 100644 Assets/Scripts/SimplifyPath.cs.meta diff --git a/Assets/MainScene.unity b/Assets/MainScene.unity index 5e6293a..ea8591e 100644 --- a/Assets/MainScene.unity +++ b/Assets/MainScene.unity @@ -1994,7 +1994,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 199425746} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -442.37305, z: 0} + m_LocalPosition: {x: 0, y: -388.9115, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2129109461} @@ -3753,7 +3753,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 384800659} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.330025, y: 0.12402344, z: 0} + m_LocalPosition: {x: 119.33002, y: 0.12402344, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2127403382} @@ -6567,7 +6567,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 565950011} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -71.039215, y: -21.499989, z: 0} + m_LocalPosition: {x: -199.50076, y: -21.499989, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1602992733} @@ -7020,7 +7020,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 574856544} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.97496796, y: -398.5349, z: 0} + m_LocalPosition: {x: -0.97496796, y: -345.07336, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1716005849} @@ -7967,7 +7967,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 642798510} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.11999, y: 231.92308, z: 0} + m_LocalPosition: {x: 119.11998, y: 178.46155, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 439795140} @@ -9425,7 +9425,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 715392269} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -239.99078, y: 145.75308, z: 0} + m_LocalPosition: {x: -111.529236, y: 92.29155, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1202556823} @@ -11070,7 +11070,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 888812806} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -252.4884, z: 0} + m_LocalPosition: {x: 0, y: -199.02687, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1197122675} @@ -13801,7 +13801,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1036966641} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -442.37305, z: 0} + m_LocalPosition: {x: 0, y: -388.9115, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1995312711} @@ -15219,7 +15219,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1144076161} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.82997, y: -141.18805, z: 0} + m_LocalPosition: {x: 119.82997, y: -87.72652, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1340324852} @@ -15551,7 +15551,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1197122674} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.025032043, y: 231.82526, z: 0} + m_LocalPosition: {x: 0.025032043, y: 178.36371, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 211861403} @@ -17309,7 +17309,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1345978254} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -100.94998, y: -484.71924, z: 0} + m_LocalPosition: {x: -100.94998, y: -431.2577, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1197122675} @@ -17489,7 +17489,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1365152473} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 109.08466, y: -844.21936, z: -12.89335} + m_LocalPosition: {x: 109.08466, y: -790.7578, z: -12.89335} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 997138229} @@ -17570,7 +17570,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1371052590} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 231.85538, z: 0} + m_LocalPosition: {x: 0, y: 178.39384, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 803260322} @@ -17891,7 +17891,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1433522475} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 240.54227, y: 60, z: 0} + m_LocalPosition: {x: 112.25154, y: 60, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 637090571} @@ -17900,7 +17900,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 240.54227, y: 60} + m_AnchoredPosition: {x: 112.25154, y: 60} m_SizeDelta: {x: 400, y: 150} m_Pivot: {x: 1, y: 1} --- !u!114 &1433522477 @@ -17994,7 +17994,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1437571375} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -442.37305, z: 0} + m_LocalPosition: {x: 0, y: -388.9115, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 341613270} @@ -20339,7 +20339,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1616544792} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 231.92307, z: 0} + m_LocalPosition: {x: 0, y: 178.46153, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1017326892} @@ -20975,7 +20975,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1677901181} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 416.73877, z: 0} + m_LocalPosition: {x: 0, y: 363.27722, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2053729636} @@ -21392,7 +21392,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1718920708} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.57372284, y: -30.799988, z: 0} + m_LocalPosition: {x: -0.57372284, y: -30.800003, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1859588817} @@ -21769,7 +21769,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1741422319} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -133.81078, y: -21.499939, z: 0} + m_LocalPosition: {x: -5.3492355, y: -21.499939, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2047732803} @@ -22139,7 +22139,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1764345208} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -239.99078, y: 0.000015258789, z: 0} + m_LocalPosition: {x: -111.52925, y: 0.000015258789, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1003281121} @@ -23112,6 +23112,7 @@ MonoBehaviour: targetMapScale: 0 mapScale: 1 maxMetersForShortPath: 3000 + simplifyMultiplayer: 0.005 --- !u!114 &1817788143 MonoBehaviour: m_ObjectHideFlags: 0 @@ -23155,7 +23156,7 @@ MonoBehaviour: - {x: 4096, y: 1} style: '&style=element:geometry%7Ccolor:0x121212&style=element:labels.icon%7Cvisibility:off&style=element:labels.text.fill%7Ccolor:0x757575&style=element:labels.text.stroke%7Ccolor:0x212121&style=feature:administrative%7Celement:geometry%7Ccolor:0x757575&style=feature:administrative.country%7Celement:labels.text.fill%7Ccolor:0x9e9e9e&style=feature:administrative.land_parcel%7Cvisibility:off&style=feature:administrative.locality%7Celement:labels.text.fill%7Ccolor:0xbdbdbd&style=feature:poi%7Celement:labels.text.fill%7Ccolor:0x757575&style=feature:poi.park%7Celement:geometry%7Ccolor:0x181818&style=feature:poi.park%7Celement:labels.text.fill%7Ccolor:0x616161&style=feature:poi.park%7Celement:labels.text.stroke%7Ccolor:0x1b1b1b&style=feature:road%7Celement:geometry.fill%7Ccolor:0x2c2c2c&style=feature:road%7Celement:labels.text.fill%7Ccolor:0x8a8a8a&style=feature:road.arterial%7Celement:geometry%7Ccolor:0x373737&style=feature:road.highway%7Celement:geometry%7Ccolor:0x3c3c3c&style=feature:road.highway.controlled_access%7Celement:geometry%7Ccolor:0x4e4e4e&style=feature:road.local%7Celement:labels.text.fill%7Ccolor:0x616161&style=feature:transit%7Celement:labels.text.fill%7Ccolor:0x757575&style=feature:water%7Celement:geometry%7Ccolor:0x000000&style=feature:water%7Celement:labels.text.fill%7Ccolor:0x3d3d3d' timeMarginAfterMove: 0.04 - useGoogleMaps: 0 + useGoogleMaps: 1 --- !u!1001 &1834677549 Prefab: m_ObjectHideFlags: 0 @@ -23612,7 +23613,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1861917361} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 243.53078, y: 185.92308, z: 0} + m_LocalPosition: {x: 115.069244, y: 132.46155, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1557032088} @@ -26533,7 +26534,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2063773714} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 243.53078, y: 185.92308, z: 0} + m_LocalPosition: {x: 115.069244, y: 132.46155, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1228375422} @@ -26974,7 +26975,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2081856947} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -349.23077, y: 185.92308, z: 0} + m_LocalPosition: {x: -220.76924, y: 132.46155, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 321098579} @@ -28029,7 +28030,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2127403378} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 467, y: 301.5, z: 0} + m_LocalPosition: {x: 300, y: 232, z: 0} m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: - {fileID: 187655526} diff --git a/Assets/Scripts/ReadJson.cs b/Assets/Scripts/ReadJson.cs index 307ab35..d25fc7b 100644 --- a/Assets/Scripts/ReadJson.cs +++ b/Assets/Scripts/ReadJson.cs @@ -377,11 +377,13 @@ void CalculationAfterLoadedFiles(bool daysToDrawLoaded = true) { } if (daysToDraw.Count == 0) return; + long drawnPoints = 0; foreach (var item in daysToDraw) { PlacesRanking.instance.AnalyseDay(item.day); ChartUI.instance.CheckMaxCalories(item.day); - RenderMap.instance.RenderDay(item.day); + drawnPoints += RenderMap.instance.RenderDay(item.day); } + Debug.Log("Drawn points: " + drawnPoints.ToString()); PlacesRanking.instance.SortAndDisplay(); ChartUI.instance.SetupCharts(); diff --git a/Assets/Scripts/RenderMap.cs b/Assets/Scripts/RenderMap.cs index 0ef145a..d6e017c 100644 --- a/Assets/Scripts/RenderMap.cs +++ b/Assets/Scripts/RenderMap.cs @@ -26,6 +26,7 @@ public class RenderMap : MonoBehaviour { public float mapScale = 1f; public int maxMetersForShortPath = 3000; + public double simplifyMultiplayer = 1; float timeSinceLastZoom; List[] filterLines = new List[10]; @@ -41,8 +42,9 @@ void Awake() { } loactionsGO = Instantiate(new GameObject(), new Vector3(0, 0, 0), transform.rotation); loactionsGO.name = "Loactions"; - loactionsGO.transform.SetSiblingIndex(1); - } + loactionsGO.transform.SetSiblingIndex(1); + + } void Update() { timeSinceLastZoom += Time.deltaTime; @@ -82,7 +84,8 @@ public void UpdateMapSize(float? newMapScale = null) { List alreadyRenderedPlaces = new List(); List renderedLines = new List(); - public void RenderDay(MovesJson day) { + public int RenderDay(MovesJson day) { + int renderedPoints = 0; GameObject dateGO = Instantiate(new GameObject(), transform.position, transform.rotation); dateGO.transform.SetParent(gameObject.transform); dateGO.name = day.date; @@ -113,11 +116,14 @@ public void RenderDay(MovesJson day) { // Set Line points List positions = new List(); - foreach (var item3 in item2.trackPoints) - positions.Add(Conversion.LatLonToMeters(item3.lat, item3.lon)); + foreach (var item3 in item2.trackPoints) { + positions.Add(Conversion.LatLonToMeters(item3.lat, item3.lon)); + } + positions = SimplifyPath.Simplify(positions, simplifyMultiplayer); + renderedPoints += positions.Count; Vector3[] positionsArray = positions.ToArray(); lineTemp.positionCount = positionsArray.Length; - lineTemp.SetPositions(positions.ToArray()); + lineTemp.SetPositions(positionsArray); // Set lines color lineTempGo.GetComponent().material = SetMaterial(item2.activity); @@ -130,7 +136,8 @@ public void RenderDay(MovesJson day) { } } } - } + } + return renderedPoints; } Material SetMaterial(ActivityType activity) { @@ -264,10 +271,7 @@ public void DisableShortPaths() { item.SetActive(false); } } - - public void TryCollect() { - GC.Collect(); - } + } public static class Conversion { diff --git a/Assets/Scripts/SimplifyPath.cs b/Assets/Scripts/SimplifyPath.cs new file mode 100644 index 0000000..3d1b7c5 --- /dev/null +++ b/Assets/Scripts/SimplifyPath.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +using Point = System.Tuple; + +public class SimplifyPath { + + + static double PerpendicularDistance(Point pt, Point lineStart, Point lineEnd) { + double dx = lineEnd.Item1 - lineStart.Item1; + double dy = lineEnd.Item2 - lineStart.Item2; + + // Normalize + double mag = Math.Sqrt(dx * dx + dy * dy); + if (mag > 0.0) { + dx /= mag; + dy /= mag; + } + double pvx = pt.Item1 - lineStart.Item1; + double pvy = pt.Item2 - lineStart.Item2; + + // Get dot product (project pv onto normalized direction) + double pvdot = dx * pvx + dy * pvy; + + // Scale line direction vector and subtract it from pv + double ax = pvx - pvdot * dx; + double ay = pvy - pvdot * dy; + + return Math.Sqrt(ax * ax + ay * ay); + } + + static void RamerDouglasPeucker(List pointList, double epsilon, List output) { + if (pointList.Count < 2) { + throw new ArgumentOutOfRangeException("Not enough points to simplify"); + } + + // Find the point with the maximum distance from line between the start and end + double dmax = 0.0; + int index = 0; + int end = pointList.Count - 1; + for (int i = 1; i < end; ++i) { + double d = PerpendicularDistance(pointList[i], pointList[0], pointList[end]); + if (d > dmax) { + index = i; + dmax = d; + } + } + + // If max distance is greater than epsilon, recursively simplify + if (dmax > epsilon) { + List recResults1 = new List(); + List recResults2 = new List(); + List firstLine = pointList.Take(index + 1).ToList(); + List lastLine = pointList.Skip(index).ToList(); + RamerDouglasPeucker(firstLine, epsilon, recResults1); + RamerDouglasPeucker(lastLine, epsilon, recResults2); + + // build the result list + output.AddRange(recResults1.Take(recResults1.Count - 1)); + output.AddRange(recResults2); + if (output.Count < 2) throw new Exception("Problem assembling output"); + } else { + // Just return start and end points + output.Clear(); + output.Add(pointList[0]); + output.Add(pointList[pointList.Count - 1]); + } + } + + public static List Simplify(List path, double epsilon) { + List pointListIn = new List(); + foreach (var item in path) { + pointListIn.Add(new Point(item.x, item.y)); + } + List pointListOut = new List(); + RamerDouglasPeucker(pointListIn, epsilon, pointListOut); + List output = new List(); + foreach (var item in pointListOut) { + output.Add(new Vector3((float)item.Item1, (float)item.Item2)); + } + return output; + } + +} diff --git a/Assets/Scripts/SimplifyPath.cs.meta b/Assets/Scripts/SimplifyPath.cs.meta new file mode 100644 index 0000000..6fdd48a --- /dev/null +++ b/Assets/Scripts/SimplifyPath.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: fd7b44f1ee0f8496e9cdb88347cea253 +timeCreated: 1536603166 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From b54baa633f394b01a38aa36911c983c47978e919 Mon Sep 17 00:00:00 2001 From: Maciej Maj Date: Tue, 11 Sep 2018 21:17:51 +0200 Subject: [PATCH 4/6] Arc-json skeleton --- Assets/ButtonTabs.cs | 1 + Assets/Scripts/ReadArcAppJson.cs | 109 ++++++++++++++++++++++++++ Assets/Scripts/ReadArcAppJson.cs.meta | 13 +++ ProjectSettings/ProjectSettings.asset | 2 +- 4 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 Assets/Scripts/ReadArcAppJson.cs create mode 100644 Assets/Scripts/ReadArcAppJson.cs.meta diff --git a/Assets/ButtonTabs.cs b/Assets/ButtonTabs.cs index 7cea0f9..f0b1ba9 100644 --- a/Assets/ButtonTabs.cs +++ b/Assets/ButtonTabs.cs @@ -52,6 +52,7 @@ public void Save() { } IEnumerator RevertAfterTime() { yield return new WaitForEndOfFrame(); + yield return new WaitForSeconds(1f); SaveSystem.Save(); saveButtonText.text = "Saved!"; yield return new WaitForSeconds(1.5f); diff --git a/Assets/Scripts/ReadArcAppJson.cs b/Assets/Scripts/ReadArcAppJson.cs new file mode 100644 index 0000000..f5803fb --- /dev/null +++ b/Assets/Scripts/ReadArcAppJson.cs @@ -0,0 +1,109 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[System.Serializable] +public class ArcJson { + public class TimelineItem { + public class Radius { + public float mean; + public float sd; + } + public class Center { + public float longitude; + public float latitude; + } + public class Sample { + public class Location { + public int verticalAccuracy; + public int horizontalAccuracy; + + public float speed; + public float longitude; + public float latitude; + public float course; + public float altitude; + + public string timestamp; + } + public class Place { + public string placeId; + public Radius radius; + public bool isHome; + public string name; + public Center center; + } + + // Recording + public string confirmedType; + public float zAcceleration; + public float xyAcceleration; + public float courseVariance; + public string recordingState; + public string movingState; + public string coreMotionActivityType; + + // Data + public string date; + public Location location; + public float stepHz; + + // ID's + public string timelineItemId; + public string sampleId; + } + + // Activity type + public string activityType; + public bool uncertainActivityType; + public bool manualActivityType; + public bool isVisit; + public float activityTypeConfidenceScore; + + // Item ID's + public string nextItemId; + public string previousItemId; + public string itemId; + + // Position + public Radius radius; + public Center center; + public Sample[] samples; + public float altitude; + + + // Place + public Place place; + public bool manualPlace; + public string streetAddress; + + // Stats + public float maxHeartRate; + public float averageHeartRate; + public int stepCount; + public float activeEnergyBurned; + public int hkStepCount; + + // Date + public string endDate; + public string startDate; + + // Other + + } + + public TimelineItem[] timelineItems; +} + +public class ReadArcAppJson : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/Scripts/ReadArcAppJson.cs.meta b/Assets/Scripts/ReadArcAppJson.cs.meta new file mode 100644 index 0000000..dbd275f --- /dev/null +++ b/Assets/Scripts/ReadArcAppJson.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 4d12108a09e2e4a9aaa3fa8bddab3895 +timeCreated: 1536648518 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6f2d939..cd82316 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -65,7 +65,7 @@ PlayerSettings: androidBlitType: 0 defaultIsFullScreen: 0 defaultIsNativeResolution: 1 - macRetinaSupport: 0 + macRetinaSupport: 1 runInBackground: 0 captureSingleScreen: 0 muteOtherAudioSources: 0 From d551b3ddab5db0bd7976e783a385e937665d202a Mon Sep 17 00:00:00 2001 From: Maciej Maj Date: Wed, 12 Sep 2018 00:32:31 +0200 Subject: [PATCH 5/6] Updated Arc converter to v1.4.3 --- Assets/ArcConverter/ConverterLibrary.dll | Bin 22016 -> 22016 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Assets/ArcConverter/ConverterLibrary.dll b/Assets/ArcConverter/ConverterLibrary.dll index 49913010c395761569ce367768ad9a25407635af..b5a5342193ab6f577992542e1a6e9a5491571637 100755 GIT binary patch delta 2162 zcmZ{me@s(X6vxl)dwqTHwYb(o`B8qh1`1U`+X+QP5afp<(f}jOC5oVkLyIj;{1K6C zF*>saav3fL6DBTkMmDuEaXOuuTjCO9)S0>Ire;4fjQgQ;L5WM;xwlWEf9xgiy!$!l zd(OT0-TQ94;|SStg!CUGw+23HoYvnCumtcL0q7J4(yTO%tRTP8KC+B-hOdwuUHmze zu&WYp9q6H}2q4-GKxmpSFI+2*M3V{nAkJ+w$-x5xbOzP|s0A}ooo_=!YZGI#F?19| zuGd-U#?z-yvm)ByS>{y%B$ok=ak~)(Q7pxQDVLsA^JQS62nTOG%iuD*iKkdaIXFJ0 z4srDa9gBBlCyO{D6IKm6uocXmLNCLGQ^>M|<@C?^lvJ&xUJky(!fZM|7caSrgbCZfgsG80er436&1Tq7Qj+0wL5%feo0E1z^R_1_*#1z#>q8Vzj7A!JRbM9%GL; zO2J_)W(!zZ^<1nTaRd)jy*-OCl}+lzm}x5W6m7LT>NcV;Zovsmcs2lZ*ou0l9M8F9 zn*u?MZp8%_V~ZR9PeL!)Q{@g6GCjR-_u1G4bc(AAMp3EOKBA(};o9 zT*~W&{Ma^P0ez&v^OdF>T)5zCDyf_NycKp!rxeGU> zv#u-HzM+lnRdA&MTo%#SPzR6kg_zOjtZ1kz!>2rhZg&*njyU7+kxu%^@vyX7w&^4o zk< ##PpyZ>%>;u!h?=xjn$`X>PA^`xm#W$!S7;c-9P$*n3*85(xCCVmB}Z7v<%G z0AFw#h`TQD(;46gEp|&@DRp!_OULl5q7fSvL;oDOJoTRACI!&Qy$VQeYavHA$XV)~9dk2KP+ z+?l;A)VK62Vc5%c(5f!bHN$0%0!XXicTRoKqYmp^;Qm~u?1MhcTMhmB5!$VOre6bQ zUxeOMZ;S2Fs?ia36xP9DK_qsP)5yFCozLP}iJu!QdWn;HKBJxREvGV0L-130@63>n zyc#ydHgkZP zMm%;SO>Q4c%V~}`gS65{uitzVa)sMaB>aZY(|CtZdFRPdfzB0G8&+@ZZtiIB+8q9; zutW@dN{$I?R3YTRCg_B&@SU<~f=9@t|HOwWD`QGNxz<+qDB&&*i{&N*J3aYzQv1zj zaET@@wUcwyx3uDTO|>p6P8%PK#nGl(kFi7;OTgIyKIz`tW;}5xYn`N?CizE&LWrX0 t{TWgDFb8~)4f)^!Pxy)7M}%Sw<<+@g4B?-GA!Q|i39H}ng)KD`dxS4gJG?#B>zRN`d< zGb9xO%zFR`O*Z9)>c!)W$$9!9&Kstk5TIL|rY&~czHl*64xnm#(X`isS|A)ngrd!$ zA<%)kFAeMItX)E*TLq9_lEy38L`A##B0I>lXOXo>%*e`XPZ^p-=%)AV4rdA~x;+&& zE%yboDq23xa5$49^wMTUt7L9IF*h&0f#vL?oerlGVH#)!5Cff*Ix6GjD046e=NiN~ zDbR&|J+>?n2I-#;C+VZz@iFmsi=-XF{Mdkv-DwsU)D7A=EsOW?s919Vec|+(BaWP= zlkq8QyOHD8Ok%L!?|D}=FKG_+;4pw&B`)!Ad|3#!CnU+8Mm#M}@Y&e(Op3b-Cm`@0 zN%hd-1dqhFLAyj}64J>u{XM})Iz!764-?W!r8Vg2=Xk|APCE3jRW!w@NKz4@#c!O&( z-X<$ia$paO5d&>Jl-CJ1pl-neX1xHfL=#gy*8k??w3Vc-L06xhghRmEw5MMX#n5kpnc!e$zG6T7BIT@Lg947&kQS#OZe6a#h_AqgIR-Wl_oJC zPO>)(ea%X*=!5SKYE$~f0{Dm1!MHBrfLI9bbQXCKdT6F6ucBX>5^=jd%r*uGl(R_F zoJN2u7sX1LHE2>fYFY<{_~@|6Gn_^_u{lq9%6wlb_r)6M!-pH|%Rg{BVbB%jyifyI z4Z4lKT6kvA9QAt3ObZItyzUA~jW;*L&P=_?f-*^(Vc4KJ?)%xG7VqXAkm(6_} zbb>;9$D2p0s68WnUxT{eycNcCc^qs~*O*%1vOz6K+u#pQL(rj)n_FRe6^k5#Am+6} zVZKfS>IL)LaKWJW)nCPSu=;f0C+Y-rfWJVeQ=Dp6>vYb;@sWWuoG#$I$M)bSPV=0` z;96)dBWNNup)Hw*OmCLLn0b=eiBEP3r4TE9Mv6&^yiyp2E@1*jxwjOKn{Q!EBgWXF zSuR1@B4ZYGaM_D;oaZL+tOTxazz=G5_Vubcp-EZ+4}~t2e{m^@Ot)}p6N9M7bKNB# zM%^pkkXj)grr<7@0%7`uaF=%Gw0Q5SV8&CZ7%i0Q>Wg7gv zuErFRgyo(eNwm2>$1=ZTzXN~3fFu35zJ(0Zg?blxgC;gi2!4p9-!-H~bp(hPKg1Zz+a~i$>cjMpuh_V$R99wPmg`(;nlYarHsjeCT From d98643a98565173e05bd7580ae18bf3eab5aa9e7 Mon Sep 17 00:00:00 2001 From: Maciej Maj Date: Wed, 12 Sep 2018 00:59:48 +0200 Subject: [PATCH 6/6] Fixed a case when there are no places on map --- Assets/Scripts/PlacesRanking.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/PlacesRanking.cs b/Assets/Scripts/PlacesRanking.cs index f6e4c2d..2f9a4c9 100644 --- a/Assets/Scripts/PlacesRanking.cs +++ b/Assets/Scripts/PlacesRanking.cs @@ -91,8 +91,11 @@ public void SortAndDisplay() { Dictionary ranking = new Dictionary(); foreach (var item in places) { ranking.Add(item.Value, item.Value.timesVisited); - } - ranking = ranking.OrderByDescending(x => x.Value).ToDictionary(x => x.Key, x => x.Value); + } + if (ranking.Count == 0) + return; + ranking = ranking.OrderByDescending(x => x.Value).ToDictionary(x => x.Key, x => x.Value); + maxValue = ranking.First().Value; if (maxValue > theBiggestPlaceVisits) maxValue = theBiggestPlaceVisits;