Browse Source

1.ios 中文版
2.修改ios微信登录判断,增加判断图标按钮显示限制

slambb 2 years ago
parent
commit
b2e9d5b557

+ 4 - 2
Assets/BowArrow/Scripts/Manager/LoginMgr/LoginView.cs

@@ -45,7 +45,6 @@ public class LoginView : MonoBehaviour
         {
             transform.Find("Input Contain/GameObject/BtnForgetPWD").gameObject.SetActive(false); //隐藏忘记密码
         }
-        transform.Find("Input Contain/otherLogin/BtnWxLogin").gameObject.SetActive(CommonConfig.AppArea == 0);
     }
 
     void Start()
@@ -55,6 +54,9 @@ public class LoginView : MonoBehaviour
 
         //设置苹果按钮状态
         appleButton.SetActive(AppleLoginHelper.ins.bSupportedPlatform);
+        //设置微信登录状态按钮
+        transform.Find("Input Contain/otherLogin/BtnWxLogin").gameObject.SetActive(CommonConfig.AppArea == 0 && WeChatLoginHelper.IsWechatInstalled());
+
     }
 
     void OnDestroy() {
@@ -260,7 +262,7 @@ public class LoginView : MonoBehaviour
             PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("请阅读并同意App协议"));
             return;
         }
-        if (throttlerLoginWX.CanPass() == false)
+        if (throttlerLoginApple.CanPass() == false)
         {
             PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("操作过于频繁"));
             return;

+ 11 - 1
Assets/BowArrow/Scripts/Manager/LoginMgr/WeChatLoginHelper.cs

@@ -6,7 +6,17 @@ using System;
 using AOT;
 public class WeChatLoginHelper
 {
-   
+    public static bool IsWechatInstalled() {
+#if UNITY_ANDROID
+       return true;
+#endif
+
+#if UNITY_IPHONE
+       return IsWechatInstalled_iOS();
+#endif
+    }
+
+
     public static void Login()
     {
 #if UNITY_ANDROID

+ 4 - 4
ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: JssF
-  productName: WONDER FITTER
+  productName: "WONDER FITTER \u8FD0\u52A8"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.1.0
+  bundleVersion: 1.3.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -286,7 +286,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: 5a86b450fbbf31f4d9269beac3ccd441, type: 3}
+      m_Icon: {fileID: 2800000, guid: e1485575cd9962247a6d7cc46fd6d6a9, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0
@@ -843,7 +843,7 @@ PlayerSettings:
   allowUnsafeCode: 0
   useDeterministicCompilation: 1
   enableRoslynAnalyzers: 1
-  selectedPlatform: 2
+  selectedPlatform: 3
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
   gcIncremental: 1