Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane

Assets/StreamingAssets/IPPort.txt

@@ -1 +1 @@
-172.20.10.5:48888
+127.0.0.1:48888

Assets/StreamingAssets/confing.txt

@@ -1 +1 @@
-172.20.10.5
+127.0.0.1

Assets/Temp/Scripts/Main_interface_Panel.cs

@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using XFrame.Core.UI;
-using static InterfaceManager;
 
 public class Main_interface_Panel : XUIPanel
 {
@@ -25,38 +24,14 @@ public class Main_interface_Panel : XUIPanel
         fanhui_btn = this.transform.Find("UPBG/Back_bton").GetComponent<Button>();
         fanhui_btn.onClick.AddListener(() =>
         {
-
+            UIBootstrap.Instance.OnLogout();
+            SceneManager.LoadScene("SampleScene");
         });
         ShowPanel<View_Panel2>();
-        this.transform.Find("UPBG/Back_bton").GetComponent<Button>().onClick.AddListener(() =>
-        {
-            GameObject obj = GameObject.Find("Canvas");
-            if (obj != null)
-            {
-                Login_panl login_panl = obj.GetComponent<Login_panl>();
-                if (login_panl != null)
-                {
-                    login_panl.AddGetString(true);
-                }
        
-            }
-            
-        });
         replay.onClick.AddListener(() => { ReplayPanel(); });
         train.onClick.AddListener(() => { TrainPanel(); });
-        appQuet.onClick.AddListener(() => {
+        appQuet.onClick.AddListener(() => { Application.Quit();
-            GameObject obj = GameObject.Find("Canvas");
-            if (obj != null)
-            {
-                Login_panl login_panl = obj.GetComponent<Login_panl>();
-                if (login_panl != null)
-                {
-                    login_panl.AddGetString(false);
-                  
-                }
-
-            }
-            
             //Debug.Log("退出");
         });
     }

Assets/Zion/Scripts/Adam/UIBootstrap.cs

@@ -163,4 +163,17 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
         Debug.Log("OnDestory");
         AdamSync.SyncCreateRoom.leaveRoomRequset -= OnLeaveRoomInfo;
     }
+
+    public void OnLogout()
+    {
+        Dictionary<string, string> replaceInfoDic = new Dictionary<string, string>();
+        replaceInfoDic.Add("login_name", GlobalFlag.currentUser.login_name);
+        StartCoroutine(AsyncWebReq.PostData2(Url_LoginCheck, replaceInfoDic));
+        Debug.Log("OnLogout");
+    }
+
+    private void OnApplicationQuit()
+    {
+        OnLogout();
+    }
 }

Assets/Zion/Scripts/Adam/Utility/Net/AsyncWebReq.cs

@@ -79,9 +79,9 @@ public static class AsyncWebReq
         else
         {
             if (!string.IsNullOrEmpty(request.downloadHandler.text))
-                action(request.downloadHandler.text);
+                action?.Invoke(request.downloadHandler.text);
             else
-                action(null);
+                action?.Invoke(null);
         }
     }
 

Assets/Zion/Scripts/InterfaceManager.cs

@@ -35,6 +35,10 @@ public static class InterfaceManager
 
 
     #region 接口
+    /// <summary>
+    /// 登出接口 Handler/User.ashx?action=exit&login_name=test0001
+    /// </summary>
+    public static string Url_LoginCheck { get => IpAddress + "/Handler/User.ashx?action=exit&"; }
 
     /// <summary>
     /// 想定Wbe接口