diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_ImGM_maincity_btn.png b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_ImGM_maincity_btn.png new file mode 100644 index 0000000000..3bd5f61d4a Binary files /dev/null and b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_ImGM_maincity_btn.png differ diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_ImGM_maincity_btn.png.meta b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_ImGM_maincity_btn.png.meta new file mode 100644 index 0000000000..d7a9921293 --- /dev/null +++ b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_ImGM_maincity_btn.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9d726cb843e3fc84bbeb7b94ad7ea02f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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: 2 + 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 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b8d990ca2f979ac4a9d6c988cc7de0b0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GMAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_change_maincity_btn_zh.png b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_change_maincity_btn_zh.png index 3bd5f61d4a..3432d34c09 100644 Binary files a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_change_maincity_btn_zh.png and b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_change_maincity_btn_zh.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index dcac9b6143..6c9bed19a3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -7115,13 +7115,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7936514539972252779} + - {fileID: 3999239444542945653} - {fileID: 1174661642300151069} - {fileID: 7679659585813988529} - {fileID: 6606176237701159688} - {fileID: 165462485454605335} - {fileID: 2025934754434711663} - {fileID: 1248926969036112801} - - {fileID: 3999239444542945653} m_Father: {fileID: 986452627335843391} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -34399,7 +34399,7 @@ RectTransform: - {fileID: 2608772048199405974} - {fileID: 1149902287171607320} m_Father: {fileID: 7019400324678272696} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -45846,7 +45846,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 6.1} - m_SizeDelta: {x: 148, y: 149} + m_SizeDelta: {x: 149, y: 149} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2753988853598746416 CanvasRenderer: @@ -56722,7 +56722,7 @@ RectTransform: - {fileID: 1395028326126029132} - {fileID: 2534243185546137147} m_Father: {fileID: 7019400324678272696} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -62156,7 +62156,7 @@ RectTransform: - {fileID: 2393141543341706285} - {fileID: 6848493942208162007} m_Father: {fileID: 7019400324678272696} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -71003,7 +71003,7 @@ RectTransform: - {fileID: 2175078994281552001} - {fileID: 3210510460490899911} m_Father: {fileID: 7019400324678272696} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -71708,7 +71708,7 @@ RectTransform: - {fileID: 119690817069795584} - {fileID: 998803897713680703} m_Father: {fileID: 7019400324678272696} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -77878,7 +77878,7 @@ RectTransform: - {fileID: 8364985247832632234} - {fileID: 6553487087509411090} m_Father: {fileID: 7019400324678272696} - m_RootOrder: 7 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -87182,7 +87182,7 @@ RectTransform: - {fileID: 2641714763032379374} - {fileID: 4972939020597592494} m_Father: {fileID: 7019400324678272696} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -93061,7 +93061,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 6.1} + m_AnchoredPosition: {x: 0, y: -7} m_SizeDelta: {x: 148, y: 149} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8106363761748936195 @@ -93092,7 +93092,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a2ea741f017c1a947b6bb9dc2b460bdc, type: 3} + m_Sprite: {fileID: 21300000, guid: 9d726cb843e3fc84bbeb7b94ad7ea02f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1