Browse Source

解决登录问题

胡佳骏 1 year ago
parent
commit
5921bf4e7c

+ 1 - 1
Assets/FrameWork.meta

@@ -4,5 +4,5 @@ folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: framework
   assetBundleVariant: 

+ 8 - 2
Assets/HotUpdate/Scripts/LoginManager.cs

@@ -171,18 +171,24 @@ public class LoginManager : MonoSingleton<LoginManager>
 
         if (obj["code"].ToString() == "200")
         {
+            isTongxun = true;
             string token = obj["data"]["token"].ToString();
             login.UserInfo.Instance.Token = token;
             HttpEdustryAction.Token = token;
 
-            isTongxun = true;
 
             RoomFileMinio.Instance.islogin = true; 
             testOk();
         }
         else
         {
-            WindowsManager.Instance.show(WindowConfig.windowType.Tip2, false, obj["code"].ToString());
+            ShowInfoTipManager.Instance.showTip("登录失败");
+            LoginPassWordManager.Instance.toError();
+            TimerMgr.Instance.CreateTimer(()=> {
+                ShowInfoTipManager.Instance.closeTip();
+                isTongxun = true;
+            },1f);
+            // WindowsManager.Instance.show(WindowConfig.windowType.Tip2, false, obj["code"].ToString());
         }
     }
 

+ 3 - 0
Assets/HybridCLRGenerate/AOTGenericReferences.cs

@@ -224,8 +224,11 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// Unity.Collections.NativeArray.ReadOnly.Enumerator<byte>
 	// Unity.Collections.NativeArray.ReadOnly<byte>
 	// Unity.Collections.NativeArray<byte>
+	// UnityEngine.Events.InvokableCall<UnityEngine.Vector2>
 	// UnityEngine.Events.InvokableCall<int>
+	// UnityEngine.Events.UnityAction<UnityEngine.Vector2>
 	// UnityEngine.Events.UnityAction<int>
+	// UnityEngine.Events.UnityEvent<UnityEngine.Vector2>
 	// UnityEngine.Events.UnityEvent<int>
 	// XRTool.Util.Singleton<object>
 	// }}

+ 3 - 0
Assets/HybridCLRGenerate/link.xml

@@ -204,6 +204,7 @@
     <type fullname="UnityEngine.EventSystems.IPointerEnterHandler" preserve="all" />
     <type fullname="UnityEngine.EventSystems.IPointerExitHandler" preserve="all" />
     <type fullname="UnityEngine.EventSystems.PointerEventData" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.UIBehaviour" preserve="all" />
     <type fullname="UnityEngine.UI.Button" preserve="all" />
     <type fullname="UnityEngine.UI.Button/ButtonClickedEvent" preserve="all" />
     <type fullname="UnityEngine.UI.ContentSizeFitter" preserve="all" />
@@ -214,6 +215,8 @@
     <type fullname="UnityEngine.UI.LayoutGroup" preserve="all" />
     <type fullname="UnityEngine.UI.MaskableGraphic" preserve="all" />
     <type fullname="UnityEngine.UI.RawImage" preserve="all" />
+    <type fullname="UnityEngine.UI.ScrollRect" preserve="all" />
+    <type fullname="UnityEngine.UI.ScrollRect/ScrollRectEvent" preserve="all" />
     <type fullname="UnityEngine.UI.Selectable" preserve="all" />
     <type fullname="UnityEngine.UI.Slider" preserve="all" />
     <type fullname="UnityEngine.UI.Text" preserve="all" />

+ 1 - 1
Assets/LocalAsset/LocalAsset.prefab.meta

@@ -3,5 +3,5 @@ guid: 4a3da7bb0173eb44db488cafe5da8c60
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: localasset
+  assetBundleName: 
   assetBundleVariant: