diff --git a/Assets/Resources/Images/newroute/System_map_mode.png b/Assets/Resources/Images/newroute/System_map_mode.png new file mode 100644 index 00000000..015d5fb9 Binary files /dev/null and b/Assets/Resources/Images/newroute/System_map_mode.png differ diff --git a/Assets/Resources/Images/newroute/System_map_mode.png.meta b/Assets/Resources/Images/newroute/System_map_mode.png.meta new file mode 100644 index 00000000..caeeddb6 --- /dev/null +++ b/Assets/Resources/Images/newroute/System_map_mode.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 99fa10acdd479fc4e899979e61beb96a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/MapList/MapItem.prefab b/Assets/Resources/UI/Prefab/MapList/MapItem.prefab index 40672969..98c92b26 100644 --- a/Assets/Resources/UI/Prefab/MapList/MapItem.prefab +++ b/Assets/Resources/UI/Prefab/MapList/MapItem.prefab @@ -136,7 +136,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -295,7 +295,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} + m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.5019608} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab index 46e5ef46..d4a656f9 100644 --- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab @@ -5067,7 +5067,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3ddaf6cc607735e438668d0845102529, + objectReference: {fileID: 21300000, guid: 99fa10acdd479fc4e899979e61beb96a, type: 3} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab index 98cc2634..df6e1652 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab @@ -1064,7 +1064,7 @@ GameObject: - component: {fileID: 2619940535986648585} - component: {fileID: 2619940535986648591} - component: {fileID: 2619940535986648584} - - component: {fileID: 2619940535986648590} + - component: {fileID: 72111155188167970} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1132,7 +1132,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: FLAT ---- !u!114 &2619940535986648590 +--- !u!114 &72111155188167970 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1141,13 +1141,10 @@ MonoBehaviour: m_GameObject: {fileID: 2619940535986648586} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!114 &7155673232822736569 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1580,7 +1577,7 @@ RectTransform: m_Children: - {fileID: 3356928343027675292} m_Father: {fileID: 1879042590406371758} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2965,11 +2962,11 @@ RectTransform: m_Father: {fileID: 465239218947862517} m_RootOrder: 0 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: -160} - m_SizeDelta: {x: 292, y: 332} - m_Pivot: {x: 0.5, y: 1} + 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: 233.6, y: 265.6} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1032965800497702725 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4788,7 +4785,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3950243154990735955} - {fileID: 6085250142340395341} m_Father: {fileID: 465239219729653177} m_RootOrder: 2 @@ -4920,11 +4916,11 @@ RectTransform: m_Father: {fileID: 8976674304292884952} m_RootOrder: 1 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: -292} - m_SizeDelta: {x: 211, y: 40} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &267367882303563041 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5089,187 +5085,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1001 &2119810059107813619 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1879042590406371758} - 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: 3ddaf6cc607735e438668d0845102529, - 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: 1 - 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: 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: 32 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.y - value: 32 - 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: GoList - 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: MAP MODE - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} ---- !u!224 &3950243154990735955 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - m_PrefabInstance: {fileID: 2119810059107813619} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2740046256807764050 PrefabInstance: m_ObjectHideFlags: 0 @@ -5956,18 +5771,18 @@ PrefabInstance: - {fileID: 7793409217181307314, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} - {fileID: 829206726517620079, 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 @@ -6133,21 +5948,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &8149286171844735752 stripped +--- !u!1 &3075247155673026290 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, 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 &6398833330297696636 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -6157,21 +5960,21 @@ GameObject: 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 &3075247155673026290 stripped +--- !u!1 &8149286171844735752 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 4089475371085219485, 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} @@ -6181,6 +5984,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} +--- !u!1 &6398833330297696636 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1231050277644289257, 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!1001 &6073211655158443556 PrefabInstance: m_ObjectHideFlags: 0 @@ -6330,15 +6145,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!1 &7820744829146851513 stripped +--- !u!1 &3980532922793874755 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &6216688916544654740 stripped +--- !u!1 &7820744829146851513 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -6348,21 +6163,9 @@ GameObject: 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 &4998415483215112909 stripped +--- !u!1 &6216688916544654740 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3745822250017908288 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -6372,18 +6175,30 @@ 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!1 &4998415483215112909 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1231050277644289257, 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 +GameObject: + m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6653062728498872177 PrefabInstance: m_ObjectHideFlags: 0 @@ -6548,15 +6363,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} ---- !u!224 &7944455583227005010 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3608523562535466787, 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!224 &7944455583227005010 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + m_PrefabInstance: {fileID: 6653062728498872177} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab index 867367e7..e885c234 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3661411345541232123 +--- !u!1 &2239030176411737966 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,54 +8,133 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1004106715778364418} - - component: {fileID: 2530677580452647532} - - component: {fileID: 1772694771311536693} - - component: {fileID: 5020917002755359002} + - component: {fileID: 3894915989844421851} + - component: {fileID: 7972066583884027716} + - component: {fileID: 2330414139545757493} m_Layer: 5 - m_Name: Shadow + m_Name: Desc m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1004106715778364418 +--- !u!224 &3894915989844421851 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3661411345541232123} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 2239030176411737966} + 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: 5526612272615142912} - m_RootOrder: 1 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 220} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 194, y: 86} m_Pivot: {x: 0.5, y: 0} ---- !u!222 &2530677580452647532 +--- !u!222 &7972066583884027716 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3661411345541232123} + m_GameObject: {fileID: 2239030176411737966} m_CullTransparentMesh: 0 ---- !u!114 &1772694771311536693 +--- !u!114 &2330414139545757493 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3661411345541232123} + m_GameObject: {fileID: 2239030176411737966} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &3691317595522851050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4442305603086872986} + - component: {fileID: 4426677584526138936} + - component: {fileID: 5484370831837817486} + - component: {fileID: 1742030526277639723} + - component: {fileID: 2137155518311914047} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4442305603086872986 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3691317595522851050} + 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: 9155624476384996310} + 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: 1461, y: 1461} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4426677584526138936 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3691317595522851050} + m_CullTransparentMesh: 0 +--- !u!114 &5484370831837817486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3691317595522851050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -65,39 +144,37 @@ MonoBehaviour: 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 &5020917002755359002 + m_Texture: {fileID: 2800000, guid: 970fa7b2c5134aa4689616c9085aa237, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &1742030526277639723 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3661411345541232123} + m_GameObject: {fileID: 3691317595522851050} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} + m_Script: {fileID: 11500000, guid: 2646b2ba277320e41bea125e9aebcb06, type: 3} m_Name: m_EditorClassIdentifier: - m_Direction: 1 - m_Color1: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.5019608} - m_Color2: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} - m_Color3: {r: 1, g: 1, b: 1, a: 1} - m_Color4: {r: 1, g: 1, b: 1, a: 1} - m_Rotation: 0 - m_Offset1: 0 - m_Offset2: 0 - m_GradientStyle: 0 - m_ColorSpace: -1 - m_IgnoreAspectRatio: 1 +--- !u!225 &2137155518311914047 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3691317595522851050} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &4880552100986372010 GameObject: m_ObjectHideFlags: 0 @@ -129,7 +206,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 9155624476384996310} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -415,11 +492,11 @@ RectTransform: - {fileID: 5526612273137644949} - {fileID: 5526612271950846019} m_Father: {fileID: 5526612272615142912} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 18, y: 78} + m_AnchoredPosition: {x: 18, y: 116} m_SizeDelta: {x: 191, y: 14} m_Pivot: {x: 0, y: 0} --- !u!222 &5526612272165583873 @@ -898,18 +975,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5526612273772399090} - - {fileID: 1004106715778364418} - - {fileID: 7425162175966398188} - {fileID: 5526612272636430230} - {fileID: 5526612272941488697} - {fileID: 5526612272165583874} + - {fileID: 3894915989844421851} m_Father: {fileID: 5526612272745412623} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 224, y: -10} + m_SizeDelta: {x: 234, y: -10} m_Pivot: {x: 0, y: 1} --- !u!222 &5526612272615142942 CanvasRenderer: @@ -960,8 +1036,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3} m_Name: m_EditorClassIdentifier: - r: {x: 20, y: 20, z: 0, w: 0} - rect2props: {x: 0.0000076293945, y: -10.000008, z: 68.58936, w: 68.58936} + r: {x: 20, y: 0, z: 0, w: 0} + rect2props: {x: 5.0000076, y: -5, z: 72.12489, w: 79.19597} --- !u!1 &5526612272623978845 GameObject: m_ObjectHideFlags: 0 @@ -1063,11 +1139,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5526612272615142912} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 3, y: 144} + m_AnchoredPosition: {x: 3, y: 164} m_SizeDelta: {x: -30, y: 56} m_Pivot: {x: 0.5, y: 0} --- !u!222 &5526612272636430228 @@ -1142,7 +1218,7 @@ RectTransform: - {fileID: 5526612272615142912} - {fileID: 5526612273599596600} m_Father: {fileID: 9155624476384996310} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1190,11 +1266,11 @@ RectTransform: - {fileID: 5526612273750354142} - {fileID: 5526612273925040422} m_Father: {fileID: 5526612272615142912} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 18, y: 120} + m_AnchoredPosition: {x: 18, y: 140} m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0, y: 0} --- !u!222 &5526612272941488695 @@ -1449,8 +1525,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3} m_Name: m_EditorClassIdentifier: - r: {x: 20, y: 20, z: 0, w: 0} - rect2props: {x: 0.000030517578, y: -10.000015, z: 158.39194, w: 158.39194} + r: {x: 0, y: 20, z: 0, w: 0} + rect2props: {x: -4.999977, y: -5.0000076, z: 165.463, w: 158.39194} --- !u!1 &5526612273750354113 GameObject: m_ObjectHideFlags: 0 @@ -1534,6 +1610,7 @@ GameObject: - component: {fileID: 5526612273772399088} - component: {fileID: 5526612273772399091} - component: {fileID: 6600152000473897068} + - component: {fileID: 6392938510632863500} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -1581,7 +1658,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -1606,8 +1683,31 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3} m_Name: m_EditorClassIdentifier: - r: {x: 20, y: 20, z: 0, w: 0} - rect2props: {x: 0.0000076293945, y: -10.000008, z: 68.58936, w: 68.58936} + r: {x: 20, y: 0, z: 0, w: 0} + rect2props: {x: 5.0000076, y: -5, z: 72.12489, w: 79.19597} +--- !u!114 &6392938510632863500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526612273772399093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Direction: 1 + m_Color1: {r: 1, g: 1, b: 1, a: 1} + m_Color2: {r: 1, g: 1, b: 1, a: 0} + m_Color3: {r: 1, g: 1, b: 1, a: 1} + m_Color4: {r: 1, g: 1, b: 1, a: 1} + m_Rotation: 0 + m_Offset1: 0 + m_Offset2: 0 + m_GradientStyle: 0 + m_ColorSpace: -1 + m_IgnoreAspectRatio: 1 --- !u!1 &5526612273925040425 GameObject: m_ObjectHideFlags: 0 @@ -1732,7 +1832,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 9155624476384996310} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1897,6 +1997,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4442305603086872986} - {fileID: 5526612272745412623} - {fileID: 8210619403058349570} - {fileID: 1179986094936499423} @@ -1929,161 +2030,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7f7db27f83919ce49a865d9187ff71aa, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &5526612272134958156 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5526612272615142912} - m_Modifications: - - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - 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.5 - 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: 194 - objectReference: {fileID: 0} - - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_SizeDelta.y - value: 38 - 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: 20 - 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: BtnRide - objectReference: {fileID: 0} - - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: m_Text - value: RIDE THIS COLLECTION - 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: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - propertyPath: mType - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} ---- !u!224 &7425162175966398188 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - m_PrefabInstance: {fileID: 5526612272134958156} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6155413159602679681 PrefabInstance: m_ObjectHideFlags: 0 @@ -2269,7 +2215,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab index ef7d2cae..dc92ad0d 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab @@ -1,5 +1,135 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2149340123248899631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5552129482140049371} + - component: {fileID: 8922798334284790612} + - component: {fileID: 8779238898146318117} + - component: {fileID: 2949082594240153580} + - component: {fileID: 6025253316260769310} + - component: {fileID: 877185432339026510} + m_Layer: 5 + m_Name: SwitchMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5552129482140049371 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2149340123248899631} + 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: + - {fileID: 3772108344569152307} + m_Father: {fileID: 3728196983693990286} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: 14} + m_SizeDelta: {x: 52, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8922798334284790612 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2149340123248899631} + m_CullTransparentMesh: 0 +--- !u!114 &8779238898146318117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2149340123248899631} + 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.13725491, g: 0.13725491, b: 0.1764706, a: 0.8} + 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 &2949082594240153580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2149340123248899631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 26 +--- !u!114 &6025253316260769310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2149340123248899631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!114 &877185432339026510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2149340123248899631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &3728196982063212415 GameObject: m_ObjectHideFlags: 0 @@ -1064,6 +1194,7 @@ RectTransform: - {fileID: 5320224889662748359} - {fileID: 2445898041947504840} - {fileID: 7018802226566223343} + - {fileID: 5552129482140049371} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1511,7 +1642,7 @@ MonoBehaviour: m_Top: 10 m_Bottom: 10 m_ChildAlignment: 4 - m_Spacing: 10 + m_Spacing: 6 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -1731,6 +1862,187 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1001 &2296899246317316499 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5552129482140049371} + 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: 3ddaf6cc607735e438668d0845102529, + 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: 1 + 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: 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: 32 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.y + value: 32 + 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: GoList + 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: MAP MODE + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &3772108344569152307 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 2296899246317316499} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7874734331461295940 PrefabInstance: m_ObjectHideFlags: 0 @@ -1811,12 +2123,12 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2016,12 +2328,12 @@ PrefabInstance: - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2036,12 +2348,12 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2071,12 +2383,12 @@ PrefabInstance: - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2086,12 +2398,12 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2101,7 +2413,7 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8763288661036287962, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2146,15 +2458,15 @@ PrefabInstance: m_RemovedComponents: - {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} ---- !u!1 &5320224889662748358 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - m_PrefabInstance: {fileID: 7874734331461295940} - m_PrefabAsset: {fileID: 0} --- !u!224 &5320224889662748359 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_PrefabInstance: {fileID: 7874734331461295940} m_PrefabAsset: {fileID: 0} +--- !u!1 &5320224889662748358 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + m_PrefabInstance: {fileID: 7874734331461295940} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab b/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab index aca2dd20..5e9119b3 100644 --- a/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab @@ -1,5 +1,83 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2348575606514753180 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7716035987251693038} + - component: {fileID: 4631336996211140511} + - component: {fileID: 287616414769766398} + m_Layer: 5 + m_Name: Desc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7716035987251693038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2348575606514753180} + 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: 5526612272615142912} + m_RootOrder: 5 + 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: -478} + m_SizeDelta: {x: 229, y: 238} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4631336996211140511 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2348575606514753180} + m_CullTransparentMesh: 0 +--- !u!114 &287616414769766398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2348575606514753180} + 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: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &3060614720484037117 GameObject: m_ObjectHideFlags: 0 @@ -119,7 +197,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1444, y: -30} + m_AnchoredPosition: {x: 1476, y: -30} m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0, y: 1} --- !u!222 &7724461041738267055 @@ -233,7 +311,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1440, y: -26} + m_AnchoredPosition: {x: 1472, y: -26} m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0, y: 1} --- !u!222 &1794599415301187487 @@ -506,7 +584,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -634} + m_AnchoredPosition: {x: 30, y: -434} m_SizeDelta: {x: 207.07605, y: 14} m_Pivot: {x: 0, y: 1} --- !u!222 &5526612272165583873 @@ -1063,6 +1141,7 @@ RectTransform: - {fileID: 5526612272636430230} - {fileID: 5526612272941488697} - {fileID: 5526612272165583874} + - {fileID: 7716035987251693038} m_Father: {fileID: 5526612272745412623} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1213,7 +1292,7 @@ RectTransform: 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: -552} + m_AnchoredPosition: {x: 0, y: -352} m_SizeDelta: {x: -60, y: 28} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5526612272636430228 @@ -1386,7 +1465,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -600} + m_AnchoredPosition: {x: 30, y: -400} m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0, y: 1} --- !u!222 &5526612272941488695 @@ -1771,12 +1850,12 @@ MonoBehaviour: m_Direction: 1 m_Color1: {r: 1, g: 1, b: 1, a: 1} m_Color2: {r: 1, g: 1, b: 1, a: 0} - m_Color3: {r: 1, g: 1, b: 1, a: 0} - m_Color4: {r: 1, g: 1, b: 1, a: 0} - m_Rotation: 37 + m_Color3: {r: 1, g: 1, b: 1, a: 1} + m_Color4: {r: 1, g: 1, b: 1, a: 1} + m_Rotation: 0 m_Offset1: 0 m_Offset2: 0 - m_GradientStyle: 1 + m_GradientStyle: 0 m_ColorSpace: -1 m_IgnoreAspectRatio: 1 --- !u!1 &5526612273925040425 @@ -2394,7 +2473,7 @@ PrefabInstance: - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2506,6 +2585,11 @@ PrefabInstance: propertyPath: m_Name value: BtnRide objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Text @@ -2514,12 +2598,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} diff --git a/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab b/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab index ee2ab9fb..f4e1fe61 100644 --- a/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab @@ -1391,6 +1391,7 @@ RectTransform: - {fileID: 5320224889662748359} - {fileID: 1440156313960039115} - {fileID: 6844527832940631884} + - {fileID: 580340923563950882} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1992,7 +1993,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1440, y: -26} + m_AnchoredPosition: {x: 1472, y: -26} m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0, y: 1} --- !u!222 &6334531348307347676 @@ -2301,7 +2302,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1444, y: -30} + m_AnchoredPosition: {x: 1476, y: -30} m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0, y: 1} --- !u!222 &97166207121493542 @@ -2529,6 +2530,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8975082268575677260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 580340923563950882} + - component: {fileID: 6239374027325006427} + - component: {fileID: 2426605039857529001} + m_Layer: 5 + m_Name: SwitchMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &580340923563950882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8975082268575677260} + 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: + - {fileID: 464923346225335825} + m_Father: {fileID: 3728196983693990286} + 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: 306, y: -30} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6239374027325006427 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8975082268575677260} + m_CullTransparentMesh: 0 +--- !u!114 &2426605039857529001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8975082268575677260} + 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.13725491, g: 0.13725491, b: 0.1764706, 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!1 &9183099091842026579 GameObject: m_ObjectHideFlags: 0 @@ -2563,9 +2639,9 @@ RectTransform: m_Father: {fileID: 3728196982087670782} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: 0} m_SizeDelta: {x: 1171, y: 191} m_Pivot: {x: 0, y: 1} --- !u!222 &1104243203791998138 @@ -2576,6 +2652,187 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9183099091842026579} m_CullTransparentMesh: 0 +--- !u!1001 &3299656856867431601 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 580340923563950882} + 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: 3ddaf6cc607735e438668d0845102529, + 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: 1 + 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: -10 + 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: GoList + 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: MAP MODE + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &464923346225335825 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 3299656856867431601} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7874734331461295940 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 0b35b630..c9e9419f 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -488,6 +488,205 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313551262} m_CullTransparentMesh: 0 +--- !u!1001 &575234469 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1378474436} + m_Modifications: + - target: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_Name + value: MessageRight + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875056, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 1651577591} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_SizeDelta.x + value: 280 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_SizeDelta.y + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1176 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_Color2.a + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_Color2.b + value: 0.1764706 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_Color2.g + value: 0.13725491 + objectReference: {fileID: 0} + - target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_Color2.r + value: 0.13725491 + objectReference: {fileID: 0} + - target: {fileID: 3342506723879539847, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 1824930348} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, type: 3} +--- !u!224 &575234470 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + m_PrefabInstance: {fileID: 575234469} + m_PrefabAsset: {fileID: 0} +--- !u!1 &575234471 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + m_PrefabInstance: {fileID: 575234469} + m_PrefabAsset: {fileID: 0} +--- !u!225 &575234472 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 575234471} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!223 &575234473 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 575234471} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &684809389 GameObject: m_ObjectHideFlags: 0 @@ -885,7 +1084,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: -30, z: 0} ---- !u!21 &884065758 +--- !u!21 &1180006863 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -971,93 +1170,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0} ---- !u!21 &1091840989 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 26, g: 26, b: 26, a: 0} ---- !u!21 &1180006863 +--- !u!21 &1233766911 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -1172,6 +1285,7 @@ RectTransform: m_Children: - {fileID: 154299662} - {fileID: 1426339559} + - {fileID: 575234470} m_Father: {fileID: 273807004} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1340,6 +1454,92 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1426339558} m_PrefabAsset: {fileID: 0} +--- !u!21 &1522437971 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 26, g: 26, b: 26, a: 0} --- !u!1 &1565405865 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, @@ -1379,6 +1579,92 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!21 &1651577591 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0} --- !u!1 &1726804851 GameObject: m_ObjectHideFlags: 0 @@ -1457,6 +1743,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726804851} m_CullTransparentMesh: 0 +--- !u!21 &1824930348 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 26, g: 26, b: 26, a: 0} --- !u!1 &1962586925 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 6f475d0a..d4320654 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -162,7 +162,20 @@ public static class App //记录当前集合 public static MapRouteAreaItem currentArea = null; internal static Dictionary RouteNameDict = new Dictionary(); - + public static bool _currentPageIsHome = false; + public static event EventHandler isHomeChanged; + public static bool currentPageIsHome + { + get => _currentPageIsHome; + set + { + _currentPageIsHome = value; + if (isHomeChanged != null) + { + isHomeChanged(value, new EventArgs()); + } + } + } static App() { InitLanguage(); diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index be54b6b5..ffec6bc5 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -52,11 +52,28 @@ public class MainController : BaseScene App.MainDeviceAdapter.StartScan(); #endif EventQueueSystem.AddListener(LinkedMessageHandler); + App.isHomeChanged -= OnIsHomeChanged; + App.isHomeChanged += OnIsHomeChanged; } - + #region 显示消息有关 + //切换页面后 + private void OnIsHomeChanged(object sender, EventArgs e) + { + DOTween.KillAll(); + if ((bool)sender) + { + FinishMessageRight(); + } + else + { + FinishMessageLeft(); + } + } + CanvasGroup[] msgs; Vector3 msgLocation; int msgIndex = 0; + CanvasGroup rightMessage; private void InitialMessage() { msgLocation = 1 * msg.transform.localPosition; @@ -71,20 +88,51 @@ public class MainController : BaseScene msg3.transform.localScale = Vector3.one; msg3.alpha = 0; msgs = new CanvasGroup[] { msg, msg2, msg3 }; + + rightMessage = transform.Find("GameObject/MessageRight").GetComponent(); +#if !UNITY_STANDALONE_WIN + +#endif } private void LinkedMessageHandler(LinkedMessageEvent e) { //msg.transform.Find("Content") emptyt = 0; +#if UNITY_STANDALONE_WIN Debug.Log(e.content); - DoMessage(e); + if (App.currentPageIsHome) + { + DoMessage(e); + } + else + { + DoMessageRight(e); + } +#else + +#endif + } + private void DoMessageRight(LinkedMessageEvent e) + { + SetMessage(rightMessage, e); + rightMessage.DOFade(1, 0.5f).onComplete = () => + { + if (App.currentPageIsHome) + { + foreach (var item in msgs) + { + item.alpha = 0; + } + } + Invoke("fade0", 0.8f); + }; } - private void DoMessage(LinkedMessageEvent e) { + var selectIndex = msgIndex % 3; - var m = msgs[selectIndex]; + var m = msgs[selectIndex]; if (msgIndex >= 3) // { //msgIndex = 0; @@ -107,8 +155,18 @@ public class MainController : BaseScene } msgIndex++; } - void FinishMessage() + { + if (App.currentPageIsHome) + { + FinishMessageLeft(); + } + else + { + FinishMessageRight(); + } + } + void FinishMessageLeft() { msgIndex = 0; foreach (var item in msgs) @@ -116,6 +174,12 @@ public class MainController : BaseScene item.DOFade(0, 0.3f); } } + + void FinishMessageRight() + { + msgIndex = 0; + rightMessage.DOFade(0, 0.3f); + } private void SetMessage(CanvasGroup m,LinkedMessageEvent e) { m.transform.Find("Avatar").GetComponent().texture = null; @@ -123,6 +187,12 @@ public class MainController : BaseScene m.transform.Find("Nickname").GetComponent().text = e.nickname; m.transform.Find("Content").GetComponent().text = e.content; } + CanvasGroup msg; + void fade0() + { + rightMessage.DOFade(0, 0.5f); + } +#endregion // Start is called before the first frame update async void Start() { @@ -301,11 +371,7 @@ public class MainController : BaseScene } } - CanvasGroup msg; - void fade0() - { - msg.DOFade(0, 0.5f); - } + private async Task Login() { var result = await ConfigHelper.userApi.Login("13115011550", "laozhong", ""); @@ -331,4 +397,8 @@ public class MainController : BaseScene } } } + private void OnDestroy() + { + App.isHomeChanged -= OnIsHomeChanged; + } } diff --git a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs index 72001ec9..62e471f0 100644 --- a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs @@ -103,7 +103,7 @@ public class BigMapController : PFUIPanel { mapManager.Destroy(); UIManager.PopStack(); - UIManager.ShowMapListPanel(); + UIManager.ShowNewRouteOverviewPanel(); //this.gameObject.SetActive(false); //DestroyImmediate(this.gameObject); }); diff --git a/Assets/Scripts/UI/Prefab/Panel/EarthController.cs b/Assets/Scripts/UI/Prefab/Panel/EarthController.cs index 65c29732..fa063c10 100644 --- a/Assets/Scripts/UI/Prefab/Panel/EarthController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/EarthController.cs @@ -83,9 +83,9 @@ public class EarthController : PFUIPanel SetRounded(goList, 64); #endif UIManager.AddEvent(goList.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) => - { + { //UIManager.PopStack(); - UIManager.ShowMapListPanel(); + UIManager.ShowNewRouteOverviewPanel(); //this.gameObject.SetActive(false); //DestroyImmediate(this.gameObject); }); diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index 1bcdaf3b..7834f9d2 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -98,6 +98,15 @@ public class MapListController : PFUIPanel map = Resources.Load("UI/Prefab/MapList/MapItem-Mobile"); #else topContainer = transform.Find("Panel").Find("Top"); +#endif +#if UNITY_STANDALONE_WIN + btnMapMode = this.transform.Find("SwitchMode").gameObject; + SetRounded(btnMapMode.transform, 64); + UIManager.AddEvent(btnMapMode.transform.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) => + { + Application.OpenURL("http://192.168.0.101:3081/Mine/Upload?token="+ App.CurrentUser.cookie); + }); + #endif transform.Find("MainNav").GetComponent().ShowBack(); sort = "Near"; @@ -107,15 +116,7 @@ public class MapListController : PFUIPanel // hardSelector.onValueChanged.AddListener(ChangeHard); //} //ApiBase.SetCookie("15A37DF28842CBA8E4E550BFA24186C8222D392F3EE18D9E95A49CC32796D2E3F6E40385C6A114942546EE1DD793DF34880DE48090B91AD2460EB887B59664BB3965F3371DDA1F1401EC7F27C5A1084566E47069F12CB6BBC0BC7A84ADC5582B"); - btnMapMode = this.transform.Find("SwitchMode").gameObject; - SetRounded(btnMapMode.transform, 64); - UIManager.AddEvent(btnMapMode.transform.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) => - { - UIManager.PopStack(); - //UIManager.ShowBigMapPanel(); - UIManager.ShowEarthPanel(App.latitude, App.longitude); - }); if (content!=null) { //var transform = content.transform.GetComponent(); @@ -459,7 +460,10 @@ public class MapListController : PFUIPanel { isRecent = true; } - transform.Find("Panel/Top/FavContainer").gameObject.SetActive(App.CurrentRouteType != "My Collection"); +#if UNITY_STANDALONE_WIN + btnMapMode.SetActive(App.CurrentRouteType == "My Upload"); +#endif + topContainer.Find("FavContainer").gameObject.SetActive(App.CurrentRouteType != "My Collection"); } void ResetList() { diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs index 6260fd7d..c7c9af25 100644 --- a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs @@ -92,6 +92,8 @@ public class NewRouteDetailController : PFUIPanel .text = string.Empty; transform.Find("Container/Left/Infos/SlopeContainer/Text").GetComponent() .text = string.Empty; + transform.Find("Container/Left/Desc").GetComponent() + .text = string.Empty; if (area.BannerImage != null) { Utils.DisplayImageTempDict(left.Find("Icon").GetComponent(), area.BannerImage, caches); @@ -124,6 +126,8 @@ public class NewRouteDetailController : PFUIPanel .text = $"{res.data.TotalClimb.ToString("#0")}M"; transform.Find("Container/Left/Infos/SlopeContainer/Text").GetComponent() .text = $"{res.data.AverageGrade.ToString("#0.00")}%"; + transform.Find("Container/Left/Desc").GetComponent() + .text = res.data.Description; LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/RideContainer").GetComponent()); } } diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs index 8c94afc4..3efe20ad 100644 --- a/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs @@ -56,6 +56,16 @@ public class NewRouteOverviewController: PFUIPanel tmpGroup = Resources.Load("UI/Prefab/NewRoute/Mobile/RouteGroup"); tmpItem = Resources.Load("UI/Prefab/NewRoute/Mobile/RouteItem"); #endif + + var btnMapMode = this.transform.Find("SwitchMode").gameObject; + SetRounded(btnMapMode.transform, 64); + UIManager.AddEvent(btnMapMode.transform.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) => + { + UIManager.PopStack(); + //UIManager.ShowBigMapPanel(); + UIManager.ShowEarthPanel(App.latitude, App.longitude); + }); + collectionContent = transform.Find("Container/Right/Scroll View/Viewport/Content") .GetComponent(); Refresh(); diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index 5b49b15e..8051549a 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -590,6 +590,8 @@ public class UIManager : MonoBehaviour return; } + App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.HomePanel); + if (modal) { parent = UIManager.Instance.ModalsPanel; diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 9b996cb4..4706883c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,7 +38,6 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}