diff --git a/Assets/Resources/UI/Prefab/MainNav.prefab b/Assets/Resources/UI/Prefab/MainNav.prefab index 533750b1..e2dcb79f 100644 --- a/Assets/Resources/UI/Prefab/MainNav.prefab +++ b/Assets/Resources/UI/Prefab/MainNav.prefab @@ -32,6 +32,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8763288661036287962} - {fileID: 9135822971364406318} - {fileID: 4204578097682859198} - {fileID: 1450106334936664745} @@ -194,7 +195,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -294,12 +295,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -402,388 +403,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Name - value: Home - objectReference: {fileID: 0} - - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: mType - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: Tooltips - value: HOME - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} ---- !u!224 &4204578097682859198 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - m_PrefabInstance: {fileID: 1288215022711451166} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4050509607779535806 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2638424933752433027} - m_Modifications: - - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -58 - objectReference: {fileID: 0} - - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 0} - - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 122ef3a6e0fc73a4b9a04adb308773ab, - type: 3} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Name - value: Support - objectReference: {fileID: 0} - - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: mType - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: Tooltips - value: FEEDBACK - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} ---- !u!224 &1409429025663639838 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - m_PrefabInstance: {fileID: 4050509607779535806} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4586583323832115209 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2638424933752433027} - m_Modifications: - - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -58 - objectReference: {fileID: 0} - - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Color.b - value: 0.2627451 - objectReference: {fileID: 0} - - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Color.g - value: 0.20784314 - objectReference: {fileID: 0} - - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Color.r - value: 0.20784314 - objectReference: {fileID: 0} - - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 0} - - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 8eadcd575ceaf354db8781cf4cb6042e, - type: 3} - - target: {fileID: 2773518605446052280, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_CullTransparentMesh - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder @@ -882,27 +501,17 @@ PrefabInstance: - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Name - value: Device - objectReference: {fileID: 0} - - target: {fileID: 3475867170677891149, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Enabled - value: 1 + value: Home objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.y - value: 30 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -919,6 +528,398 @@ PrefabInstance: propertyPath: mType value: 3 objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: Tooltips + value: HOME + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &4204578097682859198 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 1288215022711451166} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4050509607779535806 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2638424933752433027} + m_Modifications: + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -58 + objectReference: {fileID: 0} + - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 122ef3a6e0fc73a4b9a04adb308773ab, + type: 3} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.y + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Name + value: Support + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: Tooltips + value: FEEDBACK + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &1409429025663639838 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 4050509607779535806} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4586583323832115209 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2638424933752433027} + m_Modifications: + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -58 + objectReference: {fileID: 0} + - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Color.b + value: 0.2627451 + objectReference: {fileID: 0} + - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Color.g + value: 0.20784314 + objectReference: {fileID: 0} + - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Color.r + value: 0.20784314 + objectReference: {fileID: 0} + - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8eadcd575ceaf354db8781cf4cb6042e, + type: 3} + - target: {fileID: 2773518605446052280, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_CullTransparentMesh + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.y + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Name + value: Device + objectReference: {fileID: 0} + - target: {fileID: 3475867170677891149, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 3 + objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: Tooltips @@ -932,6 +933,197 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4586583323832115209} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5918985171877047674 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2638424933752433027} + m_Modifications: + - target: {fileID: 412546516092973110, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -58 + objectReference: {fileID: 0} + - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: fdb6d865c6f1a0d45a6fa4e26e4784a8, + type: 3} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.y + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -32 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Name + value: Back + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: Tooltips + value: QUIT + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &8763288661036287962 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 5918985171877047674} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6156974477705518734 PrefabInstance: m_ObjectHideFlags: 0 @@ -983,7 +1175,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1083,17 +1275,17 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1164,7 +1356,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab index d0ec061e..46e5ef46 100644 --- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab @@ -481,6 +481,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1561963667172470244} - {fileID: 2234182990056195463} - {fileID: 6653062728066858165} - {fileID: 6653062727056844769} @@ -493,6 +494,8 @@ RectTransform: - {fileID: 185106026378206774} - {fileID: 4077563585998376547} - {fileID: 7944455583227005010} + - {fileID: 8606312026097154597} + - {fileID: 3446469379709562199} m_Father: {fileID: 6653062728990783300} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1083,6 +1086,97 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &2531465259114863209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1561963667172470244} + - component: {fileID: 5980349432888802299} + - component: {fileID: 4681475915644533501} + - component: {fileID: 1231262206036010953} + m_Layer: 5 + m_Name: line00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1561963667172470244 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2531465259114863209} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1429559311419137021} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 275, y: -20} + m_SizeDelta: {x: 1, y: 40} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5980349432888802299 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2531465259114863209} + m_CullTransparentMesh: 0 +--- !u!114 &4681475915644533501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2531465259114863209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.25490198, g: 0.25882354, b: 0.31764707, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1231262206036010953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2531465259114863209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Inverse: 0 + m_MaskInteraction: 85 + m_UseStencil: 1 + m_RaycastFilter: 0 --- !u!1 &2619940535986648586 GameObject: m_ObjectHideFlags: 0 @@ -1341,11 +1435,11 @@ RectTransform: - {fileID: 4853418148453060628} - {fileID: 4853418148479202716} m_Father: {fileID: 1429559311419137021} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 773, y: -30} + m_AnchoredPosition: {x: 999, y: -30} m_SizeDelta: {x: 78, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &3729561503460600226 @@ -1432,11 +1526,11 @@ RectTransform: - {fileID: 5897143235756338798} - {fileID: 4853418147711016675} m_Father: {fileID: 1429559311419137021} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 704, y: -30} + m_AnchoredPosition: {x: 930, y: -30} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &3729561503895154083 @@ -1629,11 +1723,11 @@ RectTransform: m_Children: - {fileID: 4077563585304955949} m_Father: {fileID: 1429559311419137021} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1143, y: -20} + m_AnchoredPosition: {x: 1213, y: -20} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &4077563585998376545 @@ -1760,11 +1854,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1429559311419137021} - m_RootOrder: 8 + 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: 1203, y: -20} + m_AnchoredPosition: {x: 1263, y: -20} m_SizeDelta: {x: 1, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &4167844826616894164 @@ -1854,11 +1948,11 @@ RectTransform: m_Father: {fileID: 7944455583227005010} 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: 206, y: -10} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 156, y: 0} m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &4167844827205442557 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2608,6 +2702,19 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!114 &4709470891637890102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4976321847170018841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!114 &4853418146790805965 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2624,19 +2731,6 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 ---- !u!114 &4709470891637890102 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4976321847170018841} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} - m_Name: - m_EditorClassIdentifier: - key: --- !u!114 &1429559311976359839 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3310,11 +3404,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1429559311419137021} - m_RootOrder: 2 + 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: 224, y: -20} + m_AnchoredPosition: {x: 480, y: -20} m_SizeDelta: {x: 1, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062727056844771 @@ -3639,11 +3733,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1429559311419137021} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 683, y: -20} + m_AnchoredPosition: {x: 919, y: -20} m_SizeDelta: {x: 1, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062727249243963 @@ -3734,11 +3828,11 @@ RectTransform: - {fileID: 6653062728649070855} - {fileID: 6653062728790589175} m_Father: {fileID: 1429559311419137021} - m_RootOrder: 4 + 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: 319, y: -20} + m_AnchoredPosition: {x: 565, y: -20} m_SizeDelta: {x: 344, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062727310468537 @@ -3900,11 +3994,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1429559311419137021} - m_RootOrder: 1 + 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: 20, y: -31} + m_AnchoredPosition: {x: 286, y: -31} m_SizeDelta: {x: 60, y: 19} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062728066858167 @@ -4247,11 +4341,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1429559311419137021} - m_RootOrder: 3 + 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: 245, y: -31} + m_AnchoredPosition: {x: 491, y: -31} m_SizeDelta: {x: 60, y: 19} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062728799582122 @@ -4547,6 +4641,98 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: +--- !u!1 &6743599095249549403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3446469379709562199} + - component: {fileID: 8052257542448155742} + - component: {fileID: 8413053655656907683} + - component: {fileID: 6022265162922645911} + m_Layer: 5 + m_Name: RouteTypeName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3446469379709562199 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6743599095249549403} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1429559311419137021} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 32, y: 0} + m_SizeDelta: {x: 215, y: 30} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &8052257542448155742 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6743599095249549403} + m_CullTransparentMesh: 0 +--- !u!114 &8413053655656907683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6743599095249549403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!114 &6022265162922645911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6743599095249549403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!114 &1429559311976359835 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4746,6 +4932,94 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!1 &7891646887530246059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8606312026097154597} + - component: {fileID: 5649331532468381832} + - component: {fileID: 7084092523381124771} + - component: {fileID: 1783289984531660292} + m_Layer: 5 + m_Name: RouteTypeIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8606312026097154597 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7891646887530246059} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1429559311419137021} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 20, y: 0} + m_SizeDelta: {x: 6, y: 32} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5649331532468381832 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7891646887530246059} + m_CullTransparentMesh: 0 +--- !u!114 &7084092523381124771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7891646887530246059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1783289984531660292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7891646887530246059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 3 --- !u!114 &3369533650645990175 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5293,18 +5567,18 @@ PrefabInstance: m_RemovedComponents: - {fileID: 7793409217181307314, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} ---- !u!1 &1500710352127235982 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - m_PrefabInstance: {fileID: 3480729881595313676} - m_PrefabAsset: {fileID: 0} --- !u!224 &1500710352127235983 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_PrefabInstance: {fileID: 3480729881595313676} m_PrefabAsset: {fileID: 0} +--- !u!1 &1500710352127235982 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + m_PrefabInstance: {fileID: 3480729881595313676} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5321188461237024149 PrefabInstance: m_ObjectHideFlags: 0 @@ -5317,6 +5591,21 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 6 objectReference: {fileID: 0} + - target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + propertyPath: m_Color.b + value: 0.1764706 + objectReference: {fileID: 0} + - target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + propertyPath: m_Color.g + value: 0.13725491 + objectReference: {fileID: 0} + - target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + propertyPath: m_Color.r + value: 0.13725491 + objectReference: {fileID: 0} - target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_Material @@ -5345,7 +5634,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -5430,7 +5719,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchoredPosition.x - value: 90 + value: 356 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -5454,39 +5743,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!224 &2234182990056195463 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3344798044730818033 stripped +--- !u!1 &6398833330297696636 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5779092891361109961 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8149286171844735752 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4628129972378993927 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4951052648640690816 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -5496,15 +5755,45 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} +--- !u!1 &5779092891361109961 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!224 &2234182990056195463 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4951052648640690816 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} --- !u!1 &5464789140640568869 stripped GameObject: m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &6398833330297696636 stripped +--- !u!1 &3344798044730818033 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4628129972378993927 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8149286171844735752 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -5515,6 +5804,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1429559311419137021} m_Modifications: + - target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + propertyPath: m_Color.b + value: 0.1764706 + objectReference: {fileID: 0} + - target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + propertyPath: m_Color.g + value: 0.13725491 + objectReference: {fileID: 0} + - target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + propertyPath: m_Color.r + value: 0.13725491 + objectReference: {fileID: 0} - target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_Material @@ -5538,7 +5842,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -5623,7 +5927,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchoredPosition.x - value: 1037 + value: 1107 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -5647,9 +5951,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!1 &6216688916544654740 stripped +--- !u!1 &6749386026079657654 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -5659,21 +5963,21 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &3980532922793874755 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, +--- !u!224 &185106026378206774 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &6749386026079657654 stripped +--- !u!1 &6216688916544654740 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &7820744829146851513 stripped +--- !u!1 &3745822250017908288 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -5683,21 +5987,21 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} +--- !u!1 &3980532922793874755 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} --- !u!1 &5594525415673429112 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!224 &185106026378206774 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3745822250017908288 stripped +--- !u!1 &7820744829146851513 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -5721,7 +6025,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -5746,7 +6050,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_SizeDelta.x - value: 236 + value: 186 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -5791,7 +6095,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_AnchoredPosition.x - value: 1224 + value: 1274 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -5831,15 +6135,15 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6653062728498872177} m_PrefabAsset: {fileID: 0} ---- !u!1 &6709540780725584165 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322, - type: 3} - m_PrefabInstance: {fileID: 6653062728498872177} - m_PrefabAsset: {fileID: 0} --- !u!1 &4976321847170018841 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} m_PrefabInstance: {fileID: 6653062728498872177} m_PrefabAsset: {fileID: 0} +--- !u!1 &6709540780725584165 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + m_PrefabInstance: {fileID: 6653062728498872177} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab b/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab index 010bfb67..9c6f3131 100644 --- a/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab @@ -30,7 +30,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3728196984118981625} - - {fileID: 3728196982428834366} m_Father: {fileID: 3728196984075467606} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -163,6 +162,7 @@ GameObject: - component: {fileID: 3728196982174386636} - component: {fileID: 3728196982174386610} - component: {fileID: 3728196982174386637} + - component: {fileID: 6239115279834407571} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -230,6 +230,19 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: My Upload +--- !u!114 &6239115279834407571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728196982174386639} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &3728196982387733773 GameObject: m_ObjectHideFlags: 0 @@ -360,6 +373,7 @@ GameObject: - component: {fileID: 3728196982428834366} - component: {fileID: 3728196982428834364} - component: {fileID: 3728196982428834367} + - component: {fileID: 2494360580695495928} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -374,17 +388,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3728196982428834361} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3728196982063212412} - m_RootOrder: 1 + m_Father: {fileID: 3728196984118981625} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -79} - m_SizeDelta: {x: 0, y: 17} + m_AnchoredPosition: {x: 0, y: -44} + m_SizeDelta: {x: 133, y: 17} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3728196982428834364 CanvasRenderer: @@ -426,7 +440,20 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: My Upload + m_Text: All Route +--- !u!114 &2494360580695495928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728196982428834361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &3728196982461360754 GameObject: m_ObjectHideFlags: 0 @@ -514,6 +541,7 @@ GameObject: - component: {fileID: 3728196982670996108} - component: {fileID: 3728196982670995826} - component: {fileID: 3728196982670996109} + - component: {fileID: 3452782474902022544} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -580,7 +608,20 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: My Upload + m_Text: My Collection +--- !u!114 &3452782474902022544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728196982670996111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &3728196982891290177 GameObject: m_ObjectHideFlags: 0 @@ -818,6 +859,7 @@ GameObject: - component: {fileID: 3728196983121123757} - component: {fileID: 3728196983121123731} - component: {fileID: 3728196983121123730} + - component: {fileID: 815652350771342255} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -884,7 +926,20 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: My Upload + m_Text: Recent Routes +--- !u!114 &815652350771342255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728196983121123756} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &3728196983254984101 GameObject: m_ObjectHideFlags: 0 @@ -1059,6 +1114,7 @@ GameObject: - component: {fileID: 3728196983693990286} - component: {fileID: 3728196983693990284} - component: {fileID: 3728196983693990287} + - component: {fileID: 1735218495705024833} m_Layer: 5 m_Name: NewRouteOverviewPanel m_TagString: Untagged @@ -1078,6 +1134,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3728196983700296690} + - {fileID: 5320224889662748359} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1106,6 +1163,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 198d3ec3822927f44af9fb241ac00195, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!225 &1735218495705024833 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728196983693990281} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &3728196983699769759 GameObject: m_ObjectHideFlags: 0 @@ -1350,7 +1419,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 3728196982428834366} m_Father: {fileID: 3728196982063212412} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1470,3 +1540,333 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &7874734331461295940 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3728196983693990286} + m_Modifications: + - target: {fileID: 485508193206389098, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1617869899094122649, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_Name + value: MainNav + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_SizeDelta.y + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3068819108013337933, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3068819108013337933, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3068819108013337933, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3068819108013337933, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4050334335733771918, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586126367539938617, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5972488954695143433, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} +--- !u!224 &5320224889662748359 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + m_PrefabInstance: {fileID: 7874734331461295940} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index 512f436c..35124189 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -279,7 +279,11 @@ "Mileage": "里程", "Times": "骑行次数", "Rank": "排名", - "Connecting...": "连接中" + "Connecting...": "连接中", + "My Upload": "我的上传", + "My Collection": "我的收藏", + "Recent Routes": "最近骑行", + "All Route": "全部线路" }, "en": { "HOT ROUTES": "HOT ROUTES", @@ -552,6 +556,10 @@ "Mileage": "Mileage", "Times": "Times", "Rank": "Rank", - "Connecting...": "Connecting..." + "Connecting...": "Connecting...", + "My Upload": "My Upload", + "My Collection": "My Collection", + "Recent Routes": "Recent Routes", + "All Route": "All Route" } } \ No newline at end of file diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 9e00e550..718402a0 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -107,6 +107,7 @@ public static class App private static string language { get; set; } public static Dictionary LanguageManager { get; set; } + public static string CurrentRouteType { get; set; } #region 语言改变事件 public static event ChangeLanguageDelegate ChangeLanguageEvent; static Dictionary> dic; @@ -139,6 +140,7 @@ public static class App private static void InitLanguage() { var systemLanguage = Application.systemLanguage.ToString().ToLower(); + Debug.Log(systemLanguage); if (systemLanguage.Contains("chinese")) { language = "zh"; diff --git a/Assets/Scripts/UI/Prefab/MainNav.cs b/Assets/Scripts/UI/Prefab/MainNav.cs index 70d8a1b4..39ebe890 100644 --- a/Assets/Scripts/UI/Prefab/MainNav.cs +++ b/Assets/Scripts/UI/Prefab/MainNav.cs @@ -11,6 +11,7 @@ public class MainNav : MonoBehaviour { private GameObject exit; private GameObject home; + private GameObject back; float delayTime = 0; private void Awake() { @@ -35,6 +36,8 @@ public class MainNav : MonoBehaviour exit = this.transform.Find("Exit").gameObject; exit.SetActive(false); + back = transform.Find("Back").gameObject; + back.SetActive(false); #if UNITY_ANDROID || UNITY_IOS UIManager.AddEvent(transform.Find("Delay").gameObject, EventTriggerType.PointerClick, b => { @@ -50,6 +53,10 @@ public class MainNav : MonoBehaviour Application.Quit(); },2); }); + UIManager.AddEvent(back, EventTriggerType.PointerClick, (e) => + { + UIManager.ShowPrePanel(); + }); UIManager.AddEvent(transform.Find("Setting").gameObject, EventTriggerType.PointerClick, x => { @@ -59,6 +66,7 @@ public class MainNav : MonoBehaviour { UIManager.ShowFeedBackModal(); }); + } public void ShowRowerTab() @@ -113,4 +121,15 @@ public class MainNav : MonoBehaviour home.SetActive(false); } } + public void ShowBack() + { + if (back) + { + back.SetActive(true); + } + if (home) + { + home.SetActive(false); + } + } } diff --git a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs index a210cc60..c2e2a637 100644 --- a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs @@ -57,6 +57,7 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect userApi = new UserApi(); #if !(UNITY_ANDROID || UNITY_IOS) panel = this.transform.Find("Panel"); + pan = new TKPanRecognizer(); #else panel = this.transform.Find("Panel/MainPanel"); panelTop = null; diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index 1d408cf1..809e30c2 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -112,7 +112,7 @@ public class HomeController : PFUIPanel } else { - UIManager.ShowMapListPanel(); + UIManager.ShowNewRouteOverviewPanel(); } #endif diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index d4c01b65..f8281996 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -92,6 +92,7 @@ public class MapListController : PFUIPanel map = Resources.Load("UI/Prefab/MapList/MapItem-Mobile"); #else topContainer = transform.Find("Panel").Find("Top"); + transform.Find("MainNav").GetComponent().ShowBack(); #endif sort = "Near"; sortDire = "asc"; @@ -386,6 +387,10 @@ public class MapListController : PFUIPanel public void ResetPanel() { +#if !(UNITY_ANDROID || UNITY_IOS) + var routeTypeName = transform.Find("Panel/Top/RouteTypeName"); + routeTypeName.GetComponent().text = App.GetLocalString(App.CurrentRouteType); +#endif if (searchInput != null) { //empty Data diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs index 50464862..7c8349bd 100644 --- a/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs @@ -1,4 +1,5 @@ -using System.Collections; +using Assets.Scripts; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; @@ -14,6 +15,7 @@ public class NewRouteOverviewController: PFUIPanel tmpItem = Resources.Load("UI/Prefab/NewRoute/RouteItem"); var rect = transform.Find("Container/Right/Scroll View/Viewport/Content") .GetComponent(); + for (int i = 0; i < 10; i++) { var group = Instantiate(tmpGroup); @@ -26,8 +28,37 @@ public class NewRouteOverviewController: PFUIPanel group.localScale = Vector3.one; } LayoutRebuilder.ForceRebuildLayoutImmediate(rect); + + var left = transform.Find("Container/Left"); + UIManager.AddEvent(left.Find("MyUpload").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + ToList("My Upload"); + }); + UIManager.AddEvent(left.Find("MyCollection").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + ToList("My Collection"); + }); + UIManager.AddEvent(left.Find("RecentRoute").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + ToList("Recent Routes"); + }); + UIManager.AddEvent(left.Find("AllRoutes").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + ToList("All Route"); + }); } + void ToList(string type) + { + App.CurrentRouteType = type;// ""; + UIManager.ShowMapListPanel(); + } + public override void Show() + { + base.Show(); + Debug.Log("触发59"); + transform.MyDOFade(); + } // Update is called once per frame void Update() {