From b15a4fe2c162bf6228c93b06a086cf8a670a37fe Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Wed, 28 Apr 2021 18:41:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/70-32.png | Bin 0 -> 1834 bytes Assets/Resources/Images/70-32.png.meta | 116 ++++ Assets/Resources/Images/icon-1024.png | Bin 0 -> 5261 bytes Assets/Resources/Images/icon-1024.png.meta | 116 ++++ Assets/Resources/Sound.meta | 8 - Assets/Resources/UI/Prefab/MainNav.prefab | 2 +- .../UI/Prefab/Panel/BigMapPanel.prefab | 86 ++- .../UI/Prefab/Panel/EarthPanel.prefab | 575 +++++++++--------- .../UI/Prefab/Panel/MapListPanel.prefab | 166 ++--- Assets/Scripts/Apis/ThirdPartApi.cs | 4 +- Assets/Scripts/App.cs | 2 +- Assets/Scripts/Scenes/LoginController.cs | 18 +- .../Scripts/UI/Prefab/Login/QuickLoginUser.cs | 9 +- Assets/Scripts/UI/Prefab/MainNav.cs | 8 +- .../UI/Prefab/Panel/EditUserController.cs | 4 + .../Scripts/UI/Prefab/Panel/HomeController.cs | 17 +- .../UI/Prefab/Panel/UserInfoController.cs | 10 +- Assets/Scripts/UIManager.cs | 1 - 18 files changed, 740 insertions(+), 402 deletions(-) create mode 100644 Assets/Resources/Images/70-32.png create mode 100644 Assets/Resources/Images/70-32.png.meta create mode 100644 Assets/Resources/Images/icon-1024.png create mode 100644 Assets/Resources/Images/icon-1024.png.meta delete mode 100644 Assets/Resources/Sound.meta diff --git a/Assets/Resources/Images/70-32.png b/Assets/Resources/Images/70-32.png new file mode 100644 index 0000000000000000000000000000000000000000..f2a1200539b5a769df48274729b5c2401fbaa3e3 GIT binary patch literal 1834 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 Dyhmh= literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/icon-1024.png.meta b/Assets/Resources/Images/icon-1024.png.meta new file mode 100644 index 00000000..4357309c --- /dev/null +++ b/Assets/Resources/Images/icon-1024.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: d0c64427b3fee1c43b1029096f236331 +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: 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/Sound.meta b/Assets/Resources/Sound.meta deleted file mode 100644 index 1bdeea03..00000000 --- a/Assets/Resources/Sound.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 95a41acefc4f5e04a9a456f8ce06938e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/MainNav.prefab b/Assets/Resources/UI/Prefab/MainNav.prefab index 5098c33f..e6d5f42f 100644 --- a/Assets/Resources/UI/Prefab/MainNav.prefab +++ b/Assets/Resources/UI/Prefab/MainNav.prefab @@ -72,7 +72,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: a4edd9005cfc7fe4c86f1c36c911df9c, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab index a611be67..4f7aa3e1 100644 --- a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab @@ -367,7 +367,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4609279353588439486} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -440,7 +440,7 @@ RectTransform: - {fileID: 7433660959869354483} - {fileID: 5706700273602607966} m_Father: {fileID: 4609279353588439486} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -517,9 +517,10 @@ RectTransform: m_Children: - {fileID: 8125072195018992878} - {fileID: 185737327203972733} + - {fileID: 9219694857725158026} - {fileID: 2432749051672017236} - {fileID: 6114093792508456481} - - {fileID: 9219694857725158026} + - {fileID: 7577287810509805624} - {fileID: 6852378552522628550} - {fileID: 4377485060974967270} m_Father: {fileID: 3945718112839240075} @@ -691,6 +692,77 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1 &3652106585351849880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7577287810509805624} + - component: {fileID: 6278716857393371404} + - component: {fileID: 7798297540764622764} + m_Layer: 5 + m_Name: gq + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7577287810509805624 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3652106585351849880} + 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: 4609279353588439486} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1472, y: -26} + m_SizeDelta: {x: 72, y: 72} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6278716857393371404 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3652106585351849880} + m_CullTransparentMesh: 0 +--- !u!114 &7798297540764622764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3652106585351849880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 39c7432c0e6b9864d9adbcd21d6ead4b, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &3776172906833162711 GameObject: m_ObjectHideFlags: 0 @@ -1088,7 +1160,7 @@ RectTransform: m_Children: - {fileID: 3066601710640186072} m_Father: {fileID: 4609279353588439486} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1273,7 +1345,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4609279353588439486} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1688,7 +1760,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -1718,7 +1790,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 64 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/EarthPanel.prefab b/Assets/Resources/UI/Prefab/Panel/EarthPanel.prefab index 4318f1b4..928d65a1 100644 --- a/Assets/Resources/UI/Prefab/Panel/EarthPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/EarthPanel.prefab @@ -230,7 +230,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Recommended Routes ---- !u!1 &1771948720586153292 +--- !u!1 &1443207584849820019 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -238,45 +238,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5204752285644616196} - - component: {fileID: 1785198119865464530} - - component: {fileID: 5987128904974821808} + - component: {fileID: 225548298086912594} + - component: {fileID: 5038974846372488643} + - component: {fileID: 6914995114586000965} m_Layer: 0 - m_Name: Horizontal + m_Name: Vertical m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5204752285644616196 +--- !u!4 &225548298086912594 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1771948720586153292} + m_GameObject: {fileID: 1443207584849820019} 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: 7491847798338585112} - m_RootOrder: 1 + m_Father: {fileID: 4443610222176026466} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1785198119865464530 +--- !u!33 &5038974846372488643 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1771948720586153292} + m_GameObject: {fileID: 1443207584849820019} m_Mesh: {fileID: 0} ---- !u!23 &5987128904974821808 +--- !u!23 &6914995114586000965 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1771948720586153292} + m_GameObject: {fileID: 1443207584849820019} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -491,6 +491,49 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &2556038877156890949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7879760243438751217} + - component: {fileID: 3749913352446277094} + m_Layer: 0 + m_Name: Mount Points + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7879760243438751217 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2556038877156890949} + 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: 4208825652373016533} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3749913352446277094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2556038877156890949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b06c5ef98471a4a0896b496f3a3c06c9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2834785108472360228 GameObject: m_ObjectHideFlags: 0 @@ -1127,12 +1170,12 @@ Transform: - {fileID: 4208825652201158175} - {fileID: 4208825652215443232} - {fileID: 4208825652348703869} - - {fileID: 8129619903603144991} - - {fileID: 3225059556325478162} - - {fileID: 6464661120985463321} - - {fileID: 7491847798338585112} - - {fileID: 2448368163078178489} - - {fileID: 4528456364858940908} + - {fileID: 3180118263788884690} + - {fileID: 9108621511401588444} + - {fileID: 7879760243438751217} + - {fileID: 4443610222176026466} + - {fileID: 7832668512013505937} + - {fileID: 4290446962742936193} - {fileID: 300954412051337823} m_Father: {fileID: 4208825652095249312} m_RootOrder: 0 @@ -4067,9 +4110,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7592490534108398853} - {fileID: 8814413454309935799} - {fileID: 2956680531251441759} + - {fileID: 7592490534108398853} - {fileID: 7258651371060959300} m_Father: {fileID: 4208825651943795011} m_RootOrder: 0 @@ -4269,7 +4312,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &4316842262799051132 +--- !u!1 &4704490989976526937 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4277,139 +4320,41 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7491847798338585112} + - component: {fileID: 9108621511401588444} + - component: {fileID: 4646191247188584300} m_Layer: 0 - m_Name: Cursor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7491847798338585112 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4316842262799051132} - 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: 8535709675888369965} - - {fileID: 5204752285644616196} - m_Father: {fileID: 4208825652373016533} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4472706654967516090 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8129619903603144991} - m_Layer: 0 - m_Name: Frontiers + m_Name: Cities m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8129619903603144991 +--- !u!4 &9108621511401588444 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4472706654967516090} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002, y: 1.0002, z: 1.0002} - m_Children: [] - m_Father: {fileID: 4208825652373016533} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4571796493676812714 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2448368163078178489} - - component: {fileID: 7078656089277895441} - - component: {fileID: 817132293905696224} - m_Layer: 0 - m_Name: LatitudeLines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2448368163078178489 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4571796493676812714} + m_GameObject: {fileID: 4704490989976526937} 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: 4208825652373016533} - m_RootOrder: 7 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7078656089277895441 -MeshFilter: +--- !u!114 &4646191247188584300 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4571796493676812714} - m_Mesh: {fileID: 0} ---- !u!23 &817132293905696224 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4571796493676812714} + m_GameObject: {fileID: 4704490989976526937} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0be62bb3cbdf24291b0b2eff022c95bf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5074804616082347886 GameObject: m_ObjectHideFlags: 0 @@ -4481,6 +4426,38 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &5093537329309874711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4443610222176026466} + m_Layer: 0 + m_Name: Cursor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4443610222176026466 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5093537329309874711} + 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: 225548298086912594} + - {fileID: 2743959422175376879} + m_Father: {fileID: 4208825652373016533} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5243057192309193606 GameObject: m_ObjectHideFlags: 0 @@ -4559,6 +4536,85 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 000 +--- !u!1 &5866223628788507548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2743959422175376879} + - component: {fileID: 8445217147270545593} + - component: {fileID: 3462043826977954663} + m_Layer: 0 + m_Name: Horizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2743959422175376879 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5866223628788507548} + 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: 4443610222176026466} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8445217147270545593 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5866223628788507548} + m_Mesh: {fileID: 0} +--- !u!23 &3462043826977954663 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5866223628788507548} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &5919200257070549327 GameObject: m_ObjectHideFlags: 0 @@ -4591,7 +4647,7 @@ RectTransform: - {fileID: 1544009924689008171} - {fileID: 7941556003264812763} m_Father: {fileID: 4208825652493915609} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4802,7 +4858,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!1 &6388853888615918107 +--- !u!1 &6675243773001195269 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4810,41 +4866,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6464661120985463321} - - component: {fileID: 6558561250304252476} + - component: {fileID: 4290446962742936193} + - component: {fileID: 2360679078927603191} + - component: {fileID: 441289779692071615} m_Layer: 0 - m_Name: Mount Points + m_Name: LongitudeLines m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6464661120985463321 + m_IsActive: 0 +--- !u!4 &4290446962742936193 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6388853888615918107} + m_GameObject: {fileID: 6675243773001195269} 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: 4208825652373016533} - m_RootOrder: 5 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6558561250304252476 -MonoBehaviour: +--- !u!33 &2360679078927603191 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6388853888615918107} + m_GameObject: {fileID: 6675243773001195269} + m_Mesh: {fileID: 0} +--- !u!23 &441289779692071615 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6675243773001195269} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b06c5ef98471a4a0896b496f3a3c06c9, type: 3} - m_Name: - m_EditorClassIdentifier: + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &7212495366841866540 GameObject: m_ObjectHideFlags: 0 @@ -4958,7 +5050,7 @@ RectTransform: - {fileID: 8769387429708312568} - {fileID: 212748707908199544} m_Father: {fileID: 4208825652493915609} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5002,7 +5094,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8143561570328752944 +--- !u!1 &8511505404461149205 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5010,45 +5102,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4528456364858940908} - - component: {fileID: 6654497879270866968} - - component: {fileID: 1214760536352388303} + - component: {fileID: 3180118263788884690} m_Layer: 0 - m_Name: LongitudeLines + m_Name: Frontiers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3180118263788884690 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8511505404461149205} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002, y: 1.0002, z: 1.0002} + m_Children: [] + m_Father: {fileID: 4208825652373016533} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8720385788331787197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7832668512013505937} + - component: {fileID: 8962999900674683057} + - component: {fileID: 288559279243077998} + m_Layer: 0 + m_Name: LatitudeLines m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!4 &4528456364858940908 +--- !u!4 &7832668512013505937 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8143561570328752944} + m_GameObject: {fileID: 8720385788331787197} 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: 4208825652373016533} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6654497879270866968 +--- !u!33 &8962999900674683057 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8143561570328752944} + m_GameObject: {fileID: 8720385788331787197} m_Mesh: {fileID: 0} ---- !u!23 &1214760536352388303 +--- !u!23 &288559279243077998 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8143561570328752944} + m_GameObject: {fileID: 8720385788331787197} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -5081,128 +5203,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &8385055492194920565 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8535709675888369965} - - component: {fileID: 8712450334002609347} - - component: {fileID: 4622198939372413394} - m_Layer: 0 - m_Name: Vertical - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8535709675888369965 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8385055492194920565} - 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: 7491847798338585112} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8712450334002609347 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8385055492194920565} - m_Mesh: {fileID: 0} ---- !u!23 &4622198939372413394 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8385055492194920565} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!1 &9110850283759676128 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3225059556325478162} - - component: {fileID: 3259905824960391294} - m_Layer: 0 - m_Name: Cities - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3225059556325478162 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9110850283759676128} - 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: 4208825652373016533} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3259905824960391294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9110850283759676128} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0be62bb3cbdf24291b0b2eff022c95bf, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &9116095847844501617 GameObject: m_ObjectHideFlags: 0 @@ -5401,7 +5401,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_RootOrder - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -5431,7 +5431,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 64 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -5548,6 +5548,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7793409217181307314, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab index 0c131e2f..6af85828 100644 --- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab @@ -140,11 +140,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3292737747453648276} - - {fileID: 1500710352127235983} - {fileID: 6653062728990783300} - {fileID: 1879042590406371758} - {fileID: 1264410277530038736} - {fileID: 2240393815621593325} + - {fileID: 1500710352127235983} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -801,12 +801,12 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1500710352127235982} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 1 + m_HorizontalFit: 2 m_VerticalFit: 0 --- !u!1 &1856582807434622596 GameObject: @@ -928,7 +928,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 465239219729653177} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2665,7 +2665,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 465239219729653177} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3983,7 +3983,7 @@ RectTransform: - {fileID: 1429559311419137021} - {fileID: 1856582807434622599} m_Father: {fileID: 465239219729653177} - m_RootOrder: 2 + 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} @@ -4207,7 +4207,7 @@ RectTransform: m_Children: - {fileID: 3950243154990735955} m_Father: {fileID: 465239219729653177} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4602,12 +4602,12 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -4617,7 +4617,7 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -4637,7 +4637,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_RootOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -4662,7 +4662,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_SizeDelta.x - value: 172 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -4767,12 +4767,12 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -4782,17 +4782,17 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -4802,17 +4802,17 @@ PrefabInstance: - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -4822,7 +4822,7 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -5003,45 +5003,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!1 &4951052648640690816 stripped +--- !u!1 &4628129972378993927 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5464789140640568869 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3344798044730818033 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5779092891361109961 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8149286171844735752 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!224 &2234182990056195463 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3075247155673026290 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -5051,9 +5015,45 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &4628129972378993927 stripped +--- !u!1 &3344798044730818033 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3075247155673026290 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8149286171844735752 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5464789140640568869 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 148192672769352624, 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!224 &2234182990056195463 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6258245508770672658, 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} @@ -5196,12 +5196,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!224 &185106026378206774 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} --- !u!1 &6423651778393776433 stripped GameObject: m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, @@ -5214,21 +5208,27 @@ GameObject: 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!1 &6749386026079657654 stripped +--- !u!1 &5594525415673429112 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} +--- !u!224 &185106026378206774 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7820744829146851513 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -5238,9 +5238,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &7820744829146851513 stripped +--- !u!1 &6749386026079657654 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -5374,15 +5374,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/Scripts/Apis/ThirdPartApi.cs b/Assets/Scripts/Apis/ThirdPartApi.cs index 78ba3fed..58540694 100644 --- a/Assets/Scripts/Apis/ThirdPartApi.cs +++ b/Assets/Scripts/Apis/ThirdPartApi.cs @@ -26,7 +26,9 @@ namespace Assets.Scripts.Apis } public async Task GetMapImage(IpToGeoModel locationInfo) { - return await GetThirdPartStreamAsync($"https://api.mapbox.com/styles/v1/mapbox/dark-v10/static/{locationInfo.longitude},{locationInfo.latitude},12.14,0/1280x1280?access_token=pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA"); + return await GetThirdPartStreamAsync($"https://api.mapbox.com/styles/v1/mapbox/dark-v10/static/{locationInfo.longitude},{locationInfo.latitude},12.14,0/1280x1280?access_token={App.MapBoxAccessToken}"); + //pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA + //pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA } } } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index fe58bc41..f7eb2197 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -7,7 +7,7 @@ using UnityEngine; public static class App { - public static string Host = "http://192.168.0.97:5082/"; + public static string Host = "http://192.168.0.101:5082/"; public static string AppVersion = "1.0.0"; diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index 89548dab..76496f47 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -541,7 +541,7 @@ public class LoginController : MonoBehaviour } else { - RefreshWx3(data.ToObject()); + RefreshWx3(data.ToObject(),1); wxLogin3.gameObject.SetActive(true); //Utils.DisplayImage(StartCoroutine, //wxLogin3.Find("Avatar").GetComponent(), @@ -670,7 +670,7 @@ public class LoginController : MonoBehaviour if (r != null && r.result) { var u = JObject.FromObject(r.data).ToObject(); - RefreshWx3(u); + RefreshWx3(u, signType); LoadInfo(); StartScrollSign(1); } @@ -697,7 +697,7 @@ public class LoginController : MonoBehaviour if (r.result) { var u = JObject.FromObject(r.data).ToObject(); - RefreshWx3(u); + RefreshWx3(u,1); StartScrollPanel(4); } else @@ -730,11 +730,19 @@ public class LoginController : MonoBehaviour Utils.showToast(gameObject, r.errMsg); } } - void RefreshWx3(UserResultModel data) + void RefreshWx3(UserResultModel data,int type) { - Utils.DisplayImage(StartCoroutine, + if (string.IsNullOrEmpty(data.WxHeadImg)) + { + wxLogin3.Find("Avatar").GetComponent().texture = Resources.Load("Images/icon-1024"); + } + else + { + Utils.DisplayImage(StartCoroutine, wxLogin3.Find("Avatar").GetComponent(), data.WxHeadImg); + } + wxLogin3.Find("Wx").gameObject.SetActive(type == 1); wxLogin3.Find("NickName").GetComponent().text = data.Nickname; userResult = data; } diff --git a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs index bbd2c631..9be64671 100644 --- a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs +++ b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs @@ -29,7 +29,14 @@ public class QuickLoginUser : MonoBehaviour }); //transform.GetComponent