diff --git a/Assets/Scripts/Mobile/LoginControllerMobile.cs b/Assets/Scripts/Mobile/LoginControllerMobile.cs index 1791c362..28c2f115 100644 --- a/Assets/Scripts/Mobile/LoginControllerMobile.cs +++ b/Assets/Scripts/Mobile/LoginControllerMobile.cs @@ -19,6 +19,8 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp void Awake() { + transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Wechat") + .gameObject.SetActive(App.weChatController.IsWeChatAppInstalled()); loginScrollView = transform.Find("Panel/LoginContainer/LoginScrollView").GetComponent(); thirdLoginPage = loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer-third"); //UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer/BtnThirdLogin").gameObject, @@ -93,6 +95,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp } App.WorkoutsUrl = r.data.Value("Apk").Value("Url"); #elif UNITY_IOS + //var sw = r.data.Value("ThirdPartSwitch"); //transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/BtnThirdLogin") // .gameObject.SetActive(sw.Equals("on") && App.weChatController.IsWeChatAppInstalled()); diff --git a/Assets/Scripts/Mobile/WeChatController.cs b/Assets/Scripts/Mobile/WeChatController.cs index 0634a51a..859fcc78 100644 --- a/Assets/Scripts/Mobile/WeChatController.cs +++ b/Assets/Scripts/Mobile/WeChatController.cs @@ -89,10 +89,14 @@ public class WeChatController /// public bool IsWeChatAppInstalled() { +#if !UNITY_EDITOR #if UNITY_ANDROID return mainActivityClass.CallStatic("IsWeChatInstalled"); #elif UNITY_IOS return IsWechatInstalled_iOS(); +#else + return false; +#endif #else return false; #endif diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index 1576b98a..74a64e7a 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -94,7 +94,7 @@ public class MapListController : PFUIPanel UIManager.AddEvent(transform.Find("Upload").gameObject, EventTriggerType.PointerClick, b => { UIManager.ShowConfirm(App.GetLocalLanguage()=="zh"?"上传线路":"Upload Route", - App.GetLocalLanguage() == "zh"? @"复制www.powerfun.com至电脑端登录后点击""上传活动""按钮上传你的.fit或者.gpx文件": @"Copy www.powerfun.com to the computer and log in and click the ""Upload Activity"" button to upload your .fit or .gpx file", () => + App.GetLocalLanguage() == "zh"? @"复制www.powerfun.com至电脑端,登录后点击""上传活动""按钮上传你的.fit或者.gpx文件" : @"Copy www.powerfun.com to the computer, then log in and click the button ""Upload an Activity"" to upload your .fit or .gpx file", () => { UnityEngine.GUIUtility.systemCopyBuffer = "http://www.powerfun.com"; UIManager.CloseConfirm(); diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 9b996cb4..4706883c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,7 +38,6 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}