From fb464e42e60ebaf313075db1a6d0c0c7b147bc9c Mon Sep 17 00:00:00 2001 From: koya_15 Date: Tue, 23 Aug 2022 15:46:25 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC=E3=82=A2?= =?UTF-8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Material/Main/WorldMap.meta | 8 + ...Main_WorldMap_Country_icon_a_EggIsland.png | Bin 0 -> 3866 bytes ...WorldMap_Country_icon_a_EggIsland.png.meta | 98 ++++ ...n_WorldMap_Country_icon_b_SanFrancisco.png | Bin 0 -> 3014 bytes ...ldMap_Country_icon_b_SanFrancisco.png.meta | 98 ++++ ...i_Main_WorldMap_Country_icon_c_Beijing.png | Bin 0 -> 2967 bytes ...n_WorldMap_Country_icon_c_Beijing.png.meta | 98 ++++ .../Resource/UI/ui_button_icon_WorldMap.png | Bin 0 -> 5803 bytes .../UI/ui_button_icon_WorldMap.png.meta | 98 ++++ .../Scenes/Main/Prefabs/UI/Header.prefab | 500 +++++++++++++++++- 10 files changed, 884 insertions(+), 16 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/WorldMap.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_a_EggIsland.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_a_EggIsland.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_b_SanFrancisco.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_b_SanFrancisco.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_c_Beijing.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_c_Beijing.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/UI/ui_button_icon_WorldMap.png create mode 100644 popcorn/Assets/MyGame/Resource/UI/ui_button_icon_WorldMap.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/WorldMap.meta b/popcorn/Assets/MyGame/Resource/Material/Main/WorldMap.meta new file mode 100644 index 00000000..4c6cf662 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/WorldMap.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5355f151146737549ba2073a97ca6c0c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_a_EggIsland.png b/popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_a_EggIsland.png new file mode 100644 index 0000000000000000000000000000000000000000..797d79a308ef4c061a16fd1277ff3bb108f9b1e5 GIT binary patch literal 3866 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 N002ovPDHLkV1m>ZuP^`r literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_c_Beijing.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_c_Beijing.png.meta new file mode 100644 index 00000000..86252678 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/WorldMap/ui_Main_WorldMap_Country_icon_c_Beijing.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 2ba0bd0fda5e9824eab77006466e24b0 +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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_icon_WorldMap.png b/popcorn/Assets/MyGame/Resource/UI/ui_button_icon_WorldMap.png new file mode 100644 index 0000000000000000000000000000000000000000..9233e40fdd3ee50c261c69621ddb4b309f9efa77 GIT binary patch literal 5803 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 Mf{Y5NQpyDKKjdv3H~;_u literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_icon_WorldMap.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_button_icon_WorldMap.png.meta new file mode 100644 index 00000000..dd8e0fdc --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/UI/ui_button_icon_WorldMap.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 04a8e0cae00075a41935cc5ccefa7b6e +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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 800ebd13..6c45b0cd 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -28,6 +28,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127163878687691} m_RootOrder: 3 @@ -102,13 +103,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127162834349545} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -92, y: -82} + m_AnchoredPosition: {x: -231, y: -82} m_SizeDelta: {x: 122, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &137127162501263390 @@ -134,6 +136,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -162,6 +165,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -235,6 +239,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127162649858634} m_RootOrder: 0 @@ -267,6 +272,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -307,6 +313,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 137127162547959670} m_Father: {fileID: 137127162796222318} @@ -344,6 +351,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 137127164225778476} - {fileID: 137127162649858634} @@ -369,6 +377,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -431,10 +440,13 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 137127162501263387} - {fileID: 137127164298331673} - {fileID: 3158404179809041068} + - {fileID: 4503951777792434246} + - {fileID: 1295871286156640604} - {fileID: 2068391326539282533} m_Father: {fileID: 137127163878687691} m_RootOrder: 2 @@ -472,6 +484,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127164258565651} m_RootOrder: 1 @@ -504,6 +517,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.3372549, g: 0.21960784, b: 0.14117648, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -550,6 +564,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127164573744481} m_RootOrder: 0 @@ -582,6 +597,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -684,6 +700,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127164255914078} m_RootOrder: 1 @@ -716,6 +733,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -756,6 +774,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 137127164258565651} - {fileID: 137127164255914078} @@ -797,6 +816,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127162796222318} m_RootOrder: 0 @@ -829,6 +849,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -870,6 +891,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 137127162796222318} - {fileID: 137127163636725900} @@ -930,6 +952,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 137127163028694528} - {fileID: 137127163230790448} @@ -985,6 +1008,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1038,6 +1062,7 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &137127164298331672 GameObject: m_ObjectHideFlags: 0 @@ -1068,13 +1093,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127162834349545} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -243, y: -82.1} + m_AnchoredPosition: {x: -382, y: -82.1} m_SizeDelta: {x: 122, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &137127164298331676 @@ -1100,6 +1126,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1128,6 +1155,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1201,6 +1229,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 137127163584464919} - {fileID: 9036187569673410665} @@ -1235,6 +1264,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1249,6 +1279,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2166580290414857606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2430185935722522149} + - component: {fileID: 795074000638648589} + - component: {fileID: 4424930021374709487} + m_Layer: 5 + m_Name: icon_key + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2430185935722522149 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2166580290414857606} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1295871286156640604} + 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: 1, y: -13} + m_SizeDelta: {x: 72, y: 78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &795074000638648589 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2166580290414857606} + m_CullTransparentMesh: 1 +--- !u!114 &4424930021374709487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2166580290414857606} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d1c1666219bf9e14eaa717a8a7e85f3e, type: 3} + 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 &4558166201082566443 GameObject: m_ObjectHideFlags: 0 @@ -1277,6 +1383,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127164573744481} m_RootOrder: 1 @@ -1309,6 +1416,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1353,6 +1461,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1710717862299550814} m_Father: {fileID: 137127162834349545} @@ -1360,7 +1469,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -92.20003, y: -234} + m_AnchoredPosition: {x: -86, y: -82} m_SizeDelta: {x: 122, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3270954252519000258 @@ -1386,6 +1495,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1414,6 +1524,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1459,6 +1570,360 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 +--- !u!1 &5389178526981731133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4503951777792434246} + - component: {fileID: 8301665404463498419} + - component: {fileID: 3568450877575718348} + - component: {fileID: 8411783050349542885} + - component: {fileID: 9213346996732924661} + m_Layer: 5 + m_Name: Button_WorldMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4503951777792434246 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5389178526981731133} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8737461130351586685} + m_Father: {fileID: 137127162834349545} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -83, y: -223} + m_SizeDelta: {x: 122, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8301665404463498419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5389178526981731133} + m_CullTransparentMesh: 0 +--- !u!114 &3568450877575718348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5389178526981731133} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 04a8e0cae00075a41935cc5ccefa7b6e, type: 3} + 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 &8411783050349542885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5389178526981731133} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3568450877575718348} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &9213346996732924661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5389178526981731133} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 +--- !u!1 &6216373208680471031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1295871286156640604} + - component: {fileID: 6104739908406093787} + - component: {fileID: 8783829379458380809} + - component: {fileID: 4416511087053241826} + - component: {fileID: 5818444871374557994} + m_Layer: 5 + m_Name: Button_WorldMap_key + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1295871286156640604 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216373208680471031} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2430185935722522149} + m_Father: {fileID: 137127162834349545} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -83, y: -223} + m_SizeDelta: {x: 122, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6104739908406093787 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216373208680471031} + m_CullTransparentMesh: 0 +--- !u!114 &8783829379458380809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216373208680471031} + 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.6603774, g: 0.6603774, b: 0.6603774, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 04a8e0cae00075a41935cc5ccefa7b6e, type: 3} + 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 &4416511087053241826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216373208680471031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8783829379458380809} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5818444871374557994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216373208680471031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 +--- !u!1 &7295866844401052197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8737461130351586685} + - component: {fileID: 380053497631500331} + - component: {fileID: 998058506368945263} + m_Layer: 5 + m_Name: icon_Country + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8737461130351586685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7295866844401052197} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4503951777792434246} + 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: 13.1} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &380053497631500331 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7295866844401052197} + m_CullTransparentMesh: 1 +--- !u!114 &998058506368945263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7295866844401052197} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: de11dad165ea50441a39c14a9ad2c11b, type: 3} + 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 &9029281665625557719 GameObject: m_ObjectHideFlags: 0 @@ -1489,9 +1954,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.1, y: 1.1, z: 11} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 137127162834349545} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1521,6 +1987,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1549,6 +2016,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1713,18 +2181,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a768b64223c5940c2b597bf37dd8fa92, type: 3} ---- !u!95 &4683425562393467656 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 9019203541834850377, guid: a768b64223c5940c2b597bf37dd8fa92, - type: 3} - m_PrefabInstance: {fileID: 4455321625875757889} - m_PrefabAsset: {fileID: 0} --- !u!224 &137127163028694528 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4337906542777032001, guid: a768b64223c5940c2b597bf37dd8fa92, type: 3} m_PrefabInstance: {fileID: 4455321625875757889} m_PrefabAsset: {fileID: 0} +--- !u!95 &4683425562393467656 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 9019203541834850377, guid: a768b64223c5940c2b597bf37dd8fa92, + type: 3} + m_PrefabInstance: {fileID: 4455321625875757889} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7445681957362115943 PrefabInstance: m_ObjectHideFlags: 0 @@ -1844,15 +2312,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} ---- !u!1 &1937919369583800779 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, - type: 3} - m_PrefabInstance: {fileID: 7445681957362115943} - m_PrefabAsset: {fileID: 0} --- !u!224 &1710717862299550814 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, type: 3} m_PrefabInstance: {fileID: 7445681957362115943} m_PrefabAsset: {fileID: 0} +--- !u!1 &1937919369583800779 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 7445681957362115943} + m_PrefabAsset: {fileID: 0}