From 2d20edf57a82f11f396f53169a1509e0f0cca715 Mon Sep 17 00:00:00 2001 From: suntao Date: Mon, 19 Apr 2021 18:16:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=B7=A1=E5=85=A5=E6=B7=A1=E5=87=BA?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E3=80=82=E9=87=8D=E8=AE=BE=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E3=80=82=E5=8A=A0=E9=80=80=E5=87=BA=E5=AF=BC=E8=88=AA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/quit.png | Bin 0 -> 5035 bytes Assets/Resources/Images/quit.png.meta | 104 +++++++ .../User.meta => Resources/Sound.meta} | 2 +- Assets/Resources/UI/Prefab/BigMap/Item.prefab | 8 +- Assets/Resources/UI/Prefab/BigMap/Tips.prefab | 12 +- .../Prefab/Device/ConnectDeviceModal.prefab | 4 +- .../UI/Prefab/Device/DeviceItem.prefab | 2 +- .../UI/Prefab/Device/DeviceView.prefab | 16 +- .../Resources/UI/Prefab/Home/UserInfo.prefab | 63 ++-- Assets/Resources/UI/Prefab/MainNav.prefab | 160 +++++----- .../UI/Prefab/Panel/BigMapPanel.prefab | 19 +- .../UI/Prefab/Panel/DevicePanel.prefab | 25 +- .../UI/Prefab/Panel/HomePanel.prefab | 72 +---- .../UI/Prefab/Panel/MapListPanel.prefab | 275 +++++++++--------- .../UI/Prefab/Panel/SettingModal.prefab | 13 + Assets/Scenes/MainScene.unity | 46 ++- Assets/Scripts/Apis/ApiBase.cs | 4 +- Assets/Scripts/Scenes/MainController.cs | 3 +- Assets/Scripts/UI/Prefab/MainNav.cs | 32 +- .../UI/Prefab/Panel/BigMapController.cs | 15 +- .../UI/Prefab/Panel/DeviceController.cs | 10 + .../UI/Prefab/Panel/EditUserController.cs | 9 +- .../Scripts/UI/Prefab/Panel/HomeController.cs | 25 +- .../UI/Prefab/Panel/MapListController.cs | 16 +- .../UI/Prefab/Panel/UserInfoController.cs | 10 +- Assets/Scripts/UI/Prefab/SettingContoller.cs | 21 +- Assets/Scripts/UIManager.cs | 5 +- Assets/StreamingAssets.meta | 8 + 28 files changed, 606 insertions(+), 373 deletions(-) create mode 100644 Assets/Resources/Images/quit.png create mode 100644 Assets/Resources/Images/quit.png.meta rename Assets/{Mapbox/User.meta => Resources/Sound.meta} (77%) create mode 100644 Assets/StreamingAssets.meta diff --git a/Assets/Resources/Images/quit.png b/Assets/Resources/Images/quit.png new file mode 100644 index 0000000000000000000000000000000000000000..1178fc9cfa768eb762e804f537ea042afa12dc5e GIT binary patch literal 5035 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 Bnw9_n literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/quit.png.meta b/Assets/Resources/Images/quit.png.meta new file mode 100644 index 00000000..d5ba62d4 --- /dev/null +++ b/Assets/Resources/Images/quit.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 1e2c7b5fb99d8e447bd477903c5b129e +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 + 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/Mapbox/User.meta b/Assets/Resources/Sound.meta similarity index 77% rename from Assets/Mapbox/User.meta rename to Assets/Resources/Sound.meta index 4b9b954f..1bdeea03 100644 --- a/Assets/Mapbox/User.meta +++ b/Assets/Resources/Sound.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 102e792eaf910f74e9acb0b9a6182219 +guid: 95a41acefc4f5e04a9a456f8ce06938e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/UI/Prefab/BigMap/Item.prefab b/Assets/Resources/UI/Prefab/BigMap/Item.prefab index 11383004..84c5223d 100644 --- a/Assets/Resources/UI/Prefab/BigMap/Item.prefab +++ b/Assets/Resources/UI/Prefab/BigMap/Item.prefab @@ -355,7 +355,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -433,7 +433,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -661,7 +661,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, + objectReference: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} @@ -827,7 +827,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, + objectReference: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} diff --git a/Assets/Resources/UI/Prefab/BigMap/Tips.prefab b/Assets/Resources/UI/Prefab/BigMap/Tips.prefab index 8926c5a9..6978ad9f 100644 --- a/Assets/Resources/UI/Prefab/BigMap/Tips.prefab +++ b/Assets/Resources/UI/Prefab/BigMap/Tips.prefab @@ -213,7 +213,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -291,7 +291,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -440,7 +440,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -617,7 +617,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -769,7 +769,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -1021,7 +1021,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 18 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab index f8a803ca..1819100d 100644 --- a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab +++ b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab @@ -232,7 +232,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -384,7 +384,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab b/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab index 57f01259..ce51a2f6 100644 --- a/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab +++ b/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab @@ -217,7 +217,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bb4c2b248704c75488b5f24a63a5f370, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 16 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/Resources/UI/Prefab/Device/DeviceView.prefab b/Assets/Resources/UI/Prefab/Device/DeviceView.prefab index a5a1f38b..cf312ad1 100644 --- a/Assets/Resources/UI/Prefab/Device/DeviceView.prefab +++ b/Assets/Resources/UI/Prefab/Device/DeviceView.prefab @@ -240,7 +240,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -435,7 +435,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -513,7 +513,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -692,7 +692,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -770,7 +770,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -799,7 +799,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} @@ -955,7 +955,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, + objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} @@ -1096,7 +1096,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} diff --git a/Assets/Resources/UI/Prefab/Home/UserInfo.prefab b/Assets/Resources/UI/Prefab/Home/UserInfo.prefab index 005b4e82..66a8899b 100644 --- a/Assets/Resources/UI/Prefab/Home/UserInfo.prefab +++ b/Assets/Resources/UI/Prefab/Home/UserInfo.prefab @@ -153,7 +153,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -305,7 +305,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3} + m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 @@ -383,7 +383,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -609,7 +609,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -687,7 +687,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3} + m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 @@ -812,7 +812,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3} + m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 @@ -862,12 +862,12 @@ RectTransform: - {fileID: 2589794477207137385} - {fileID: 2589794478217614881} - {fileID: 4566599627632401656} - - {fileID: 1517891333614586015} - {fileID: 4566599627557342350} - {fileID: 4566599628192613341} - {fileID: 4566599629016508004} - {fileID: 7275502706204060242} - {fileID: 3459981280928128198} + - {fileID: 1517891333614586015} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1045,7 +1045,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1197,7 +1197,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -1275,7 +1275,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -1400,7 +1400,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1412,7 +1412,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'W/KG + m_Text: 'FTP/KG ' --- !u!1 &2589794479001532657 @@ -1520,7 +1520,7 @@ RectTransform: - {fileID: 4566599628726290540} - {fileID: 4566599627765202923} m_Father: {fileID: 2589794478191162465} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1600,7 +1600,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1752,9 +1752,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 32 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 @@ -1904,9 +1904,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 32 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 @@ -1948,7 +1948,7 @@ RectTransform: - {fileID: 4566599628729395001} - {fileID: 4566599628157169631} m_Father: {fileID: 2589794478191162465} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2102,7 +2102,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -2180,7 +2180,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -2258,9 +2258,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 32 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 @@ -2302,7 +2302,7 @@ RectTransform: - {fileID: 4566599627569075062} - {fileID: 4566599628863875598} m_Father: {fileID: 2589794478191162465} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2347,7 +2347,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2589794478191162465} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2411,7 +2411,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 9 + value: 14 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2521,7 +2521,12 @@ PrefabInstance: - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_FontData.m_FontStyle - value: 1 + value: 0 + 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} @@ -2551,7 +2556,7 @@ PrefabInstance: - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} @@ -2672,7 +2677,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: bb4c2b248704c75488b5f24a63a5f370, + objectReference: {fileID: 12800000, guid: dc2b8edfb87f74143913c268624f8711, type: 3} - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} diff --git a/Assets/Resources/UI/Prefab/MainNav.prefab b/Assets/Resources/UI/Prefab/MainNav.prefab index 288c8493..de2e3cda 100644 --- a/Assets/Resources/UI/Prefab/MainNav.prefab +++ b/Assets/Resources/UI/Prefab/MainNav.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1028020832802249258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1582560070593925475} + - component: {fileID: 8575928801610675534} + - component: {fileID: 7589916435901445193} + m_Layer: 5 + m_Name: Exit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1582560070593925475 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028020832802249258} + 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: 2638424933752433027} + 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: 10, y: 0} + m_SizeDelta: {x: 44, y: 44} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &8575928801610675534 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028020832802249258} + m_CullTransparentMesh: 0 +--- !u!114 &7589916435901445193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028020832802249258} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1e2c7b5fb99d8e447bd477903c5b129e, 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 &2638424933752433026 GameObject: m_ObjectHideFlags: 0 @@ -32,16 +106,16 @@ RectTransform: m_Children: - {fileID: 2638424934229131700} - {fileID: 2638424934527142483} - - {fileID: 2638424935285544537} - {fileID: 2638424934187802374} - {fileID: 2638424935390494092} + - {fileID: 1582560070593925475} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 280, y: 64} + m_SizeDelta: {x: 226, y: 64} m_Pivot: {x: 0, y: 1} --- !u!222 &2638424933752433029 CanvasRenderer: @@ -122,11 +196,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2638424933752433027} - m_RootOrder: 3 + m_RootOrder: 2 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: 172, y: 0} + m_AnchoredPosition: {x: 118, y: 0} m_SizeDelta: {x: 44, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2638424934187802376 @@ -314,80 +388,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2638424935285544536 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2638424935285544537} - - component: {fileID: 2638424935285544539} - - component: {fileID: 2638424935285544538} - m_Layer: 5 - m_Name: Wifi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2638424935285544537 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2638424935285544536} - 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: 2638424933752433027} - m_RootOrder: 2 - 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: 118, y: 0} - m_SizeDelta: {x: 44, y: 44} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &2638424935285544539 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2638424935285544536} - m_CullTransparentMesh: 0 ---- !u!114 &2638424935285544538 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2638424935285544536} - 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_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: efa4a8392a2c3d0449bf07063abea38b, 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 &2638424935390494091 GameObject: m_ObjectHideFlags: 0 @@ -418,11 +418,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2638424933752433027} - m_RootOrder: 4 + 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} - m_AnchoredPosition: {x: 226, y: 0} + m_AnchoredPosition: {x: 172, y: 0} m_SizeDelta: {x: 44, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2638424935390494094 diff --git a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab index f247d31e..8d95f704 100644 --- a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab @@ -324,7 +324,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -425,6 +425,7 @@ GameObject: - component: {fileID: 2939070211320469820} - component: {fileID: 1142354303720505027} - component: {fileID: 3867589268337371586} + - component: {fileID: 8564967389594868555} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -517,6 +518,18 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!225 &8564967389594868555 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2446724330781706966} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &2518104292931613363 GameObject: m_ObjectHideFlags: 0 @@ -1081,7 +1094,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: 360, y: -30} + m_AnchoredPosition: {x: 306, y: -30} m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0, y: 1} --- !u!222 &4997743358586351338 @@ -1431,7 +1444,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_SizeDelta.x - value: 280 + value: 226 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab b/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab index 9db283b3..b59042b2 100644 --- a/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab @@ -402,6 +402,7 @@ GameObject: - component: {fileID: 4032660314221060953} - component: {fileID: 454099902603697846} - component: {fileID: 1179195837213364712} + - component: {fileID: 3695202901511441468} m_Layer: 5 m_Name: DevicePanel m_TagString: Untagged @@ -485,6 +486,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &3695202901511441468 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4032660314221060955} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &5023905775086954472 GameObject: m_ObjectHideFlags: 0 @@ -595,7 +608,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -673,7 +686,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -943,7 +956,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -972,7 +985,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} @@ -1128,7 +1141,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} @@ -1669,7 +1682,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab index 00084127..ef0b891d 100644 --- a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1777885814862178517} - component: {fileID: 787256587561520313} - component: {fileID: 958233340109605464} + - component: {fileID: 248175241253817336} m_Layer: 5 m_Name: HomePanel m_TagString: Untagged @@ -62,49 +63,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1777885814862178516} m_CullTransparentMesh: 0 ---- !u!114 &4666630721626389153 -MonoBehaviour: +--- !u!225 &248175241253817336 +CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4110286610393964380} + m_GameObject: {fileID: 1777885814862178516} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - 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_Alpha: 1 m_Interactable: 1 - m_TargetGraphic: {fileID: 4110286610393964382} - m_OnClick: - m_PersistentCalls: - m_Calls: [] + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1001 &1777885815653005510 PrefabInstance: m_ObjectHideFlags: 0 @@ -241,19 +211,19 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - target: {fileID: 3324359234025609929, guid: 0cf36a704cf17794aab167386641cf2a, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - target: {fileID: 3324359234272836253, guid: 0cf36a704cf17794aab167386641cf2a, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - target: {fileID: 3324359234648502169, guid: 0cf36a704cf17794aab167386641cf2a, type: 3} @@ -348,7 +318,7 @@ PrefabInstance: - target: {fileID: 3324359234648502174, guid: 0cf36a704cf17794aab167386641cf2a, type: 3} propertyPath: m_AnchoredPosition.y - value: -261 + value: -230 objectReference: {fileID: 0} - target: {fileID: 3324359234648502174, guid: 0cf36a704cf17794aab167386641cf2a, type: 3} @@ -435,7 +405,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_SizeDelta.x - value: 280 + value: 226 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -510,21 +480,3 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2132237384658419801} m_PrefabAsset: {fileID: 0} ---- !u!1 &4110286610393964380 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2638424934187802373, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - m_PrefabInstance: {fileID: 2132237384658419801} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4110286610393964382 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2638424934187802375, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - m_PrefabInstance: {fileID: 2132237384658419801} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4110286610393964380} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab index 82fca217..371ae4cf 100644 --- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab @@ -2322,7 +2322,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: 360, y: -30} + m_AnchoredPosition: {x: 306, y: -30} m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0, y: 1} --- !u!222 &8343395811988274841 @@ -3198,6 +3198,7 @@ GameObject: - component: {fileID: 3875008516619180971} - component: {fileID: 6799029054918475999} - component: {fileID: 6799029054918475996} + - component: {fileID: 4631699736552807878} m_Layer: 5 m_Name: MapListPanel m_TagString: Untagged @@ -3217,7 +3218,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8931608246266398584} - - {fileID: 2905060696191417379} + - {fileID: 243684882420699873} - {fileID: 726549195090357672} - {fileID: 5499711730237207362} - {fileID: 5284463610994455041} @@ -3297,6 +3298,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &4631699736552807878 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5779676824674420566} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &5014623458251111798 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4631,131 +4644,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 726549194336560541} m_PrefabAsset: {fileID: 0} ---- !u!1001 &922472870509598112 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5779676824674420565} - m_Modifications: - - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_Name - value: MainNav - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_SizeDelta.x - value: 280 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_SizeDelta.y - value: 64 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -30 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} ---- !u!224 &2905060696191417379 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - m_PrefabInstance: {fileID: 922472870509598112} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2277129673863769977 PrefabInstance: m_ObjectHideFlags: 0 @@ -4913,6 +4801,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} +--- !u!1 &1048332570473065360 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabAsset: {fileID: 0} --- !u!1 &2835369396092332516 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, @@ -4949,9 +4843,128 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} ---- !u!1 &1048332570473065360 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, +--- !u!1001 &2881229966191197026 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5779676824674420565} + m_Modifications: + - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_Name + value: MainNav + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_SizeDelta.x + value: 226 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_SizeDelta.y + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} +--- !u!224 &243684882420699873 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} - m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabInstance: {fileID: 2881229966191197026} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Panel/SettingModal.prefab b/Assets/Resources/UI/Prefab/Panel/SettingModal.prefab index b7cfea27..7bb36f9e 100644 --- a/Assets/Resources/UI/Prefab/Panel/SettingModal.prefab +++ b/Assets/Resources/UI/Prefab/Panel/SettingModal.prefab @@ -259,6 +259,7 @@ GameObject: - component: {fileID: 1018732089903226588} - component: {fileID: 1018732089903226589} - component: {fileID: 1018732089903226591} + - component: {fileID: 8084789863929639026} m_Layer: 5 m_Name: SettingModal m_TagString: Untagged @@ -335,6 +336,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1304d873aa16cd641a83b889e9a1f3af, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!225 &8084789863929639026 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1018732089903226587} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1018732090860767023 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 3092f0bf..6cef8fe3 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -146,12 +146,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154299661} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 273807004} - m_RootOrder: 2 + m_Father: {fileID: 1378474436} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -178,7 +178,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -293,7 +293,7 @@ RectTransform: m_Children: - {fileID: 730655536} - {fileID: 1985738406} - - {fileID: 154299662} + - {fileID: 1378474436} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -710,6 +710,42 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1378474435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1378474436} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1378474436 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378474435} + 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: 154299662} + m_Father: {fileID: 273807004} + m_RootOrder: 2 + 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: 1600, y: 900} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1962586925 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Apis/ApiBase.cs b/Assets/Scripts/Apis/ApiBase.cs index 5e4bd8e6..6fc05d48 100644 --- a/Assets/Scripts/Apis/ApiBase.cs +++ b/Assets/Scripts/Apis/ApiBase.cs @@ -40,7 +40,7 @@ namespace Assets.Scripts.Apis httpClientHandler.Proxy = WebRequest.DefaultWebProxy; httpClientHandler.CookieContainer = _cookieCollection; httpClientHandler.UseCookies = true; - httpClientHandler.CookieContainer.Add(new Uri(ConfigHelper.Host), new Cookie("PowerFun.AUTH", "E1F130A03C0C2F01DF465A17AAA4740E9C44FC5F7C5077AF5A09B5ED29F0CF4FABE44329111C0BDBC6D97A28E7C7C188250265B37D2E6A849D7F0CAC606490648F17DC7FB9C8778BE7217991EBB6304BD543CFEE55084E54CCD634B49F26A751","/")); + //httpClientHandler.CookieContainer.Add(new Uri(ConfigHelper.Host), new Cookie("PowerFun.AUTH", "E1F130A03C0C2F01DF465A17AAA4740E9C44FC5F7C5077AF5A09B5ED29F0CF4FABE44329111C0BDBC6D97A28E7C7C188250265B37D2E6A849D7F0CAC606490648F17DC7FB9C8778BE7217991EBB6304BD543CFEE55084E54CCD634B49F26A751","/")); httpClient = new System.Net.Http.HttpClient(httpClientHandler); httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); @@ -446,7 +446,7 @@ namespace Assets.Scripts.Apis //} request.UserAgent = httpClient.DefaultRequestHeaders.UserAgent.ToString(); request.Accept = "application/json"; - request.Headers.Add("Language", "Zh-cn"); + request.Headers.Add("Language", "en"); request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate; request.CookieContainer = new CookieContainer(); foreach (Cookie item in cookies) diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 5e4e54af..1dfe7828 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -10,8 +10,9 @@ public class MainController : MonoBehaviour private Text Version; private void Awake() { - Version = this.transform.Find("Version").GetComponent(); + Version = this.transform.Find("GameObject").Find("Version").GetComponent(); Version.text = "Version:"+App.AppVersion; + } // Start is called before the first frame update diff --git a/Assets/Scripts/UI/Prefab/MainNav.cs b/Assets/Scripts/UI/Prefab/MainNav.cs index a393b572..717f73c9 100644 --- a/Assets/Scripts/UI/Prefab/MainNav.cs +++ b/Assets/Scripts/UI/Prefab/MainNav.cs @@ -6,6 +6,8 @@ using UnityEngine.UI; public class MainNav : MonoBehaviour { + private GameObject exit; + private GameObject home; private void Awake() { var material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); @@ -14,18 +16,32 @@ public class MainNav : MonoBehaviour material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0)); this.GetComponent().material = material; - var wifi = this.transform.Find("Wifi"); - UIManager.AddEvent(wifi.gameObject, EventTriggerType.PointerClick, x => + var device = this.transform.Find("Device"); + UIManager.AddEvent(device.gameObject, EventTriggerType.PointerClick, x => { - Debug.Log("click wifi"); + Debug.Log("click device"); UIManager.ShowDevicePanel(); }); - var home = this.transform.Find("Home"); - UIManager.AddEvent(home.gameObject, EventTriggerType.PointerClick, x => + home = this.transform.Find("Home").gameObject; + UIManager.AddEvent(home, EventTriggerType.PointerClick, x => { UIManager.ShowHomePanel(); }); + + exit = this.transform.Find("Exit").gameObject; + exit.SetActive(false); + + + UIManager.AddEvent(exit, EventTriggerType.PointerClick, (e) => + { + Application.Quit(); + }); + + UIManager.AddEvent(transform.Find("Setting").gameObject, EventTriggerType.PointerClick, x => + { + UIManager.ShowSettingModal(); + }); } // Start is called before the first frame update @@ -39,4 +55,10 @@ public class MainNav : MonoBehaviour { } + + public void ShowExit() + { + exit.SetActive(true); + home.SetActive(false); + } } diff --git a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs index 535fdbdb..ea891d89 100644 --- a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs @@ -15,6 +15,7 @@ using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.SceneManagement; using Mapbox.Examples; +using DG.Tweening; public class BigMapController : PFUIPanel { @@ -33,6 +34,10 @@ public class BigMapController : PFUIPanel int timer = 0; protected override void Awake() { + var cg = this.transform.Find("Canvas").GetComponent(); + cg.alpha = 0; + + mapApi = new MapApi(); mapboxApi = new MapBoxApi(); @@ -384,13 +389,21 @@ public class BigMapController : PFUIPanel //timer += Time.deltaTime; } + public override void Show() + { + var cg = this.transform.Find("Canvas").GetComponent(); + cg.alpha = 0; + base.Show(); + + cg.DOFade(1f, 0.3f); + } public override void Close() { //base.Close(); DestroyImmediate(this.gameObject); - } + } class LineItem { diff --git a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs index b951c1bb..5847a925 100644 --- a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using UnityEngine; using UnityEngine.UI; using UnityEngine.EventSystems; +using DG.Tweening; public class DeviceController : PFUIPanel { @@ -89,6 +90,15 @@ public class DeviceController : PFUIPanel } } + public override void Show() + { + var cg = this.GetComponent(); + cg.alpha = 0; + base.Show(); + + cg.DOFade(1f, 0.3f); + } + private void OnApplicationQuit() { AntConnector.Instance().Dispose(); diff --git a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs index dbe000d0..168dc58e 100644 --- a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs @@ -156,11 +156,10 @@ public class EditUserController : PFUIPanel } async Task LoadDataSync() { - if (!App.FromLogin) - { - await Login(); - } - + //if (!App.FromLogin) + //{ + // await Login(); + //} var currentUser = App.CurrentUser; if (currentUser == null) return; diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index 5857ecf7..83892691 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -25,10 +25,15 @@ public class HomeController : PFUIPanel //[SerializeField] Button More; [SerializeField] Button BtnRide; [SerializeField] Transform userInfo; + + private MainNav mainNav; // Start is called before the first frame update protected override void Start() { base.Start(); + + mainNav = this.transform.Find("MainNav").GetComponent(); + mainNav.ShowExit(); //var parent = Utils.FindUpParent(gameObject.transform); //if (parent.Find("ToastContainer") == null) //{ @@ -45,10 +50,8 @@ public class HomeController : PFUIPanel BtnRide.onClick.AddListener(GoRide); var avatar = userInfo.Find("Avatar").GetComponent(); - var material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); - var rect = ((RectTransform)avatar.transform).rect; - material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0)); - avatar.material = material; + var rect = ((RectTransform)avatar.transform).rect; + SetRounded(avatar.transform, rect.height); UIManager.AddEvent(avatar.gameObject, EventTriggerType.PointerClick, x => { @@ -59,10 +62,6 @@ public class HomeController : PFUIPanel { UIManager.ShowAlert("test"); }); - UIManager.AddEvent(transform.Find("MainNav").Find("Setting").gameObject, EventTriggerType.PointerClick, x => - { - UIManager.ShowSettingModal(); - }); GetSummary(); } @@ -99,16 +98,17 @@ public class HomeController : PFUIPanel userInfo.Find("NickName").GetComponent().text = App.CurrentUser.Nickname; userInfo.Find("GroupTop").Find("FtpContainer").Find("FtpValue").GetComponent().text = App.CurrentUser.FTP.ToString(); userInfo.Find("GroupTop").Find("WeightContainer").Find("WeightValue").GetComponent().text = App.CurrentUser.Weight.ToString(); - userInfo.Find("GroupTop").Find("WKGContainer").Find("WKGValue").GetComponent().text = $"{App.CurrentUser.Weight}kg/{App.CurrentUser.BicycleWeight}kg"; + userInfo.Find("GroupTop").Find("WKGContainer").Find("WKGValue").GetComponent().text = $"{ (App.CurrentUser.FTP/ App.CurrentUser.Weight).ToString("0.0") }"; userInfo.Find("CaloriesContainer").Find("CaloriesValue").GetComponent().text = summary.Kcal +" KCAL"; userInfo.Find("KMContainer").Find("KMValue").GetComponent().text = summary.TotalDistance.ToString("0") +" KM"; userInfo.Find("ClimbContainer").Find("ClimbValue").GetComponent().text = summary.TotalClimb +" M"; - userInfo.Find("IDText").GetComponent().text = "ID:"+App.CurrentUser.Id; + userInfo.Find("IDText").GetComponent().text = "ID:"+App.CurrentUser.Id.ToString("000000"); //var user = ConfigHelper.CurrentUser; //Ftp.text = summary.Ftp.ToString(); //Weight.text = user.Weight.ToString(); //WKG.text = $"{user.Weight}KG/{user.BicycleWeight}KG"; //NickName.text = user.Nickname; + Utils.DisplayImage(StartCoroutine, userInfo.Find("Avatar").GetComponent(), App.CurrentUser.WxHeadImg); } async void GetSummary() @@ -152,6 +152,11 @@ public class HomeController : PFUIPanel public override void Show() { + var cg = this.GetComponent(); + cg.alpha = 0; base.Show(); + + cg.DOFade(1f, 0.3f); + } } diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index 2ae59d22..5923f318 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -2,6 +2,7 @@ using Assets.Scripts.Apis; using Assets.Scripts.Apis.Models; using Assets.Scripts.UI.Prefab.MapList; +using DG.Tweening; using System; using System.Collections; using System.Collections.Generic; @@ -197,10 +198,10 @@ public class MapListController : PFUIPanel var rect = ((RectTransform)headImage.transform).rect; material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0)); headImage.material = material; - if (App.FromLogin) - { + //if (App.FromLogin) + //{ Utils.DisplayImage(StartCoroutine, headImage, App.CurrentUser.WxHeadImg); - } + //} UIManager.AddEvent(headImage.gameObject, EventTriggerType.PointerClick, (e) => @@ -294,4 +295,13 @@ public class MapListController : PFUIPanel { } + + public override void Show() + { + var cg = this.GetComponent(); + cg.alpha = 0; + base.Show(); + + cg.DOFade(1f, .3f); + } } diff --git a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs index 8e0fa1c5..579a0725 100644 --- a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs @@ -46,11 +46,11 @@ public class UserInfoController : PFUIPanel } async void Load() { - if (!App.FromLogin) - { - var result = await userApi.Login("15651831367", "123456", ""); - App.CurrentUser = result.data; - } + //if (!App.FromLogin) + //{ + // var result = await userApi.Login("15651831367", "123456", ""); + // App.CurrentUser = result.data; + //} var r = userApi.GetSummary(); if (r.result) { diff --git a/Assets/Scripts/UI/Prefab/SettingContoller.cs b/Assets/Scripts/UI/Prefab/SettingContoller.cs index 3776320c..3577ff40 100644 --- a/Assets/Scripts/UI/Prefab/SettingContoller.cs +++ b/Assets/Scripts/UI/Prefab/SettingContoller.cs @@ -1,7 +1,9 @@ -using System.Collections; +using DG.Tweening; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using UnityEngine.EventSystems; public class SettingContoller : PFUIPanel { @@ -12,13 +14,17 @@ public class SettingContoller : PFUIPanel exit = transform.Find("Main").Find("Exit"); if (exit != null) { - exit.GetComponent