From 0fe5b3a953753a140cb89ddc788e1fa29018d71e Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Wed, 29 Dec 2021 19:48:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=88=86=E4=BA=AB=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Android/UnityCallWechatShare-release.aar | Bin 109338 -> 109749 bytes Assets/Scenes/MainScene.unity | 432 ++++++++++++------ Assets/Scripts/App.cs | 2 +- Assets/Scripts/Mobile/WeChatController.cs | 2 +- .../Scenes/Ride/Scripts/PlayerController.cs | 4 +- .../Scenes/Ride/Scripts/ResultPanelScript.cs | 4 +- Assets/Scripts/UIManager.cs | 6 +- 7 files changed, 313 insertions(+), 137 deletions(-) diff --git a/Assets/Plugins/Android/UnityCallWechatShare-release.aar b/Assets/Plugins/Android/UnityCallWechatShare-release.aar index 7fbed2fd27c3581b1332169fe7a30627ea9dd2ee..f5cda6bfd8f9ab44c874f58d27fe770ed4a93ba8 100644 GIT binary patch delta 8407 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 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index c9e9419f..40f30df4 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -121,6 +121,92 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!21 &94439478 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0} --- !u!1 &154299661 GameObject: m_ObjectHideFlags: 0 @@ -378,8 +464,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 730655536} - - {fileID: 1985738406} - {fileID: 1378474436} + - {fileID: 1985738406} - {fileID: 684809390} m_Father: {fileID: 0} m_RootOrder: 3 @@ -992,6 +1078,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!1 &873388893 GameObject: m_ObjectHideFlags: 0 @@ -1085,92 +1172,6 @@ Transform: m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: -30, z: 0} --- !u!21 &1180006863 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0} ---- !u!21 &1233766911 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -1287,7 +1288,7 @@ RectTransform: - {fileID: 1426339559} - {fileID: 575234470} m_Father: {fileID: 273807004} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1454,7 +1455,46 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1426339558} m_PrefabAsset: {fileID: 0} ---- !u!21 &1522437971 +--- !u!1 &1565405865 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, + type: 3} + m_PrefabInstance: {fileID: 1426339558} + m_PrefabAsset: {fileID: 0} +--- !u!223 &1565405866 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565405865} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!225 &1565405867 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565405865} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!21 &1611774150 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -1540,45 +1580,6 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 26, g: 26, b: 26, a: 0} ---- !u!1 &1565405865 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, - type: 3} - m_PrefabInstance: {fileID: 1426339558} - m_PrefabAsset: {fileID: 0} ---- !u!223 &1565405866 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1565405865} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!225 &1565405867 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1565405865} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!21 &1651577591 Material: serializedVersion: 6 @@ -1665,6 +1666,92 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0} +--- !u!21 &1656986731 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 26, g: 26, b: 26, a: 0} --- !u!1 &1726804851 GameObject: m_ObjectHideFlags: 0 @@ -1743,6 +1830,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726804851} m_CullTransparentMesh: 0 +--- !u!21 &1769269435 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0} --- !u!21 &1824930348 Material: serializedVersion: 6 @@ -1903,7 +2076,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 273807004} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1922,6 +2095,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!1 &2038446772 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 154ffd7b..e58fe742 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -193,7 +193,7 @@ public static class App //Host = "http://192.168.0.101:5085/"; //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000); //TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001); - Debug.unityLogger.logEnabled = false; + //Debug.unityLogger.logEnabled = false; #endif if (!FB.IsInitialized) { diff --git a/Assets/Scripts/Mobile/WeChatController.cs b/Assets/Scripts/Mobile/WeChatController.cs index 73bc4e1e..0634a51a 100644 --- a/Assets/Scripts/Mobile/WeChatController.cs +++ b/Assets/Scripts/Mobile/WeChatController.cs @@ -120,7 +120,7 @@ public class WeChatController /// 网页链接 /// 标题 /// 描述 - public void ShareWebpageToWX(int scene, string url, string title, string description,byte[] image) + public void ShareWebpageToWX(int scene, string url, string title, string description, byte[] image) { #if UNITY_ANDROID mainActivityClass.CallStatic("ShareWebpageToWX", scene, url, title, description, image); diff --git a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs index 11a97273..718b9f92 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs @@ -60,9 +60,9 @@ namespace Assets.Scenes.Ride.Scripts cadance = mainController.UpdateCadence(); weight = App.CurrentUser.Weight; bicycleWeight = App.CurrentUser.BicycleWeight; -//#if UNITY_EDITOR +#if UNITY_EDITOR power = 1443; -//#endif +#endif mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100); } catch (Exception ex) diff --git a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs index 3be1eb8a..0d5cd8dc 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs @@ -93,7 +93,7 @@ namespace Assets.Scenes.Ride.Scripts { if (App.weChatController.IsWeChatAppInstalled()) { - App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}", cyclingController.mapRoute.NickName, "By " + App.CurrentUser.Nickname,null); + App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}", cyclingController.mapRoute.Name, "By " + App.CurrentUser.Nickname,null); } else { @@ -105,7 +105,7 @@ namespace Assets.Scenes.Ride.Scripts { if (App.weChatController.IsWeChatAppInstalled()) { - App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}", cyclingController.mapRoute.NickName, "By " + App.CurrentUser.Nickname,null); + App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}", cyclingController.mapRoute.Name, "By " + App.CurrentUser.Nickname,null); } else { diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index de039d59..d0d4b4d9 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -589,8 +589,10 @@ public class UIManager : MonoBehaviour { return; } - - App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.HomePanel); + if (parent == UIManager.Instance.MainPanel) + { + App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.HomePanel); + } if (modal) {