Merge branch 'master' of git@gitlab.sd-zeus.com:1649090050/zeushub_unity.git

# Conflicts:
#	Assets/_预设/UI/首页/右栏/产品卡片.prefab

Assets/Plugins/Aliyun.OSS.pdb.meta

+fileFormatVersion: 2
+guid: 4d5b1535ee5b5974d81860ad5c93faaf
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset

@@ -166,4 +166,14 @@ MonoBehaviour:
     - {fileID: 11400000, guid: 1f5786cba7bb56f4095b58a2db83e2b2, type: 2}
     - {fileID: 2800000, guid: 216c87436b09fd04998ec2e365782ee8, type: 3}
     - {fileID: 21300000, guid: 216c87436b09fd04998ec2e365782ee8, type: 3}
-    _Values: 7b3984e6e3131c3a2e49df665222b669a5d1ff93488b6f208275de66676a6f2a3297fea26c99d37b5f6558d8b0bed82cbea35bd209153c3462a700097cdd197717c4ca9ade77460a16cfbdab362de15b9c3ef3f1bdb1da47792e1234cebd647e7d3db6ff7c40f74678a45b442ff4ca65eb8322b064113c576b3f2ef877e2de5ab8536b930c5f1019eb9a31e79dfa066baa29636123cc2714ae529505ab0dfa0643c4ef012d48034b12eab983bfa43907ec4025594774ad61149bf2acc84f4e40346ea6edacc2804cfea435af0078bf35fa0e8f4f3993417e4c7148f47eab4d03266ad1444771bd4ea8d6dd783747cc2627daa9b6ade36f4f7f786684684780134b95c902679676474753a4b216befe5f67c078c096edfc792264fa94d7c1447c0adfd78de286e13c395a77638d4b653311e995ccf73e542e05846f04dc1d3e02bf1667b8b6fc5f024563f6801123770fa8dac044943be61ca2cb062f657a432f2f121c9bd402292548d4d8d02970b20142702d94d01cb8495bf320942acd6860d1be231066f800596387dacb10ef072aac12101209321b0406dd61c476c787227bd7713e70b4c34c8b8c271065e5520c6c5acee908699d2919d03a1c8a169751bf75b2d1b5b1532c5a0606e98b452518caf9be0ff564075cc01184cfb739c457407e1284cd53700b5bf3fcb3febebc381356cd32406a5103cd7613ef32c03255609aeef6eed6a0299dd9309c93a1014f0dc4616c6361f3161f0a47dad3390f1e2022e8a381b8cd10d3234a62e864ee35ac19063d3871085f41403aa66eeabf2727debe92be3aaa4da082f321cfa2383419a44dd9d599e024263c6b846b0ea63605cba1af82d04062bfa562912531a432e9b1431071385b3781affa2e6113011dc6cd3507e2734c38e793fdf8f176be3d95a96fa6fb856f15d1547508100df31d9fd999e9b42ff56c32bf6e6500e4994fc0792a8e5e81435042a0dcf1ae67d07b1063f67d859d2418fab6216bdcbe3b39abfce24929a1cf21c3ba7914e65bc0010543a8cf4a055f531d7e76ba9be4fc5a019d2d0b9b383158d86bc405de7ac62a675059f56a4c4667b73fb70730d631549ca88d136dd83c2ce2cd703f1da12f529d18231c5d295f2c7b0f806754d9f23707359307d35e25714a61a9040aa9c307a4fa73cc7cc08119611423c5eec601242d78ac6dabefc75c1e9956fae2707c53406a80e932292f5e1dbc40301a12976bf5ffae1670b18f4d1e7363f58768983131c138127f4d6406bce190f0d00d236f3b522e8f28cc6a08b719f5f5bf306848ea316308ed321552276c2adcd464a10665a66eba5190e30b992e04cde141b839859d0d5dd68ff85e2f18455ab34e0b1f4fe7fb20bdc2411adf506d817dd1082c27796c86c64fd319c2af55a3a296ad228f21fd0aaa4ab63371bdf9624d3b0868f13523c461af862e3e84a38fbe964b75036f0da32b027d22c23814085670cc0348414d938c163f3e59d433d959d98a24718364bc48ab9412495fb882b6471718b04c4b57cfa3c8643dc6692cf3ef4563ad3b4b8e9dda02364f0191fa20076e4691ff3a43f6ccae7f548443b7efa183305fe781f1251ed114608afed968eef577c8f602537adab25939710bf0d112cc59f3a11123a8ccae51d14ee36bcdd417647034100660d04a3a3ef6e3c2629ce720644f113d4743794239c2d740eafae64e
+    - {fileID: 2800000, guid: df0730c3d4450b146b8bf110403860f6, type: 3}
+    - {fileID: 21300000, guid: df0730c3d4450b146b8bf110403860f6, type: 3}
+    - {fileID: 2800000, guid: e9a7f6493ca51e94c82ddca344fcb8c9, type: 3}
+    - {fileID: 21300000, guid: e9a7f6493ca51e94c82ddca344fcb8c9, type: 3}
+    - {fileID: 2800000, guid: e702b7c30af756342ae7ca005810fcb7, type: 3}
+    - {fileID: 21300000, guid: e702b7c30af756342ae7ca005810fcb7, type: 3}
+    - {fileID: 2800000, guid: cc759db8cf719ae48ab26df020bb3920, type: 3}
+    - {fileID: 21300000, guid: cc759db8cf719ae48ab26df020bb3920, type: 3}
+    - {fileID: 2800000, guid: 7fe85ee8b621ee94eb95dbee37c5ea66, type: 3}
+    - {fileID: 21300000, guid: 7fe85ee8b621ee94eb95dbee37c5ea66, type: 3}
+    _Values: 7b3984e6e3131c3a2e49df665222b669a5d1ff93488b6f208275de66676a6f2a3297fea26c99d37b5f6558d8b0bed82cbea35bd209153c3462a700097cdd197717c4ca9ade77460a16cfbdab362de15b9c3ef3f1bdb1da47792e1234cebd647e7d3db6ff7c40f74678a45b442ff4ca65eb8322b064113c576b3f2ef877e2de5ab8536b930c5f1019eb9a31e79dfa066baa29636123cc2714ae529505ab0dfa0643c4ef012d48034b12eab983bfa43907ec4025594774ad61149bf2acc84f4e40346ea6edacc2804cfea435af0078bf35fa0e8f4f3993417e4c7148f47eab4d03266ad1444771bd4ea8d6dd783747cc2627daa9b6ade36f4f7f786684684780134b95c902679676474753a4b216befe5f67c078c096edfc792264fa94d7c1447c0adfd78de286e13c395a77638d4b653311e995ccf73e542e05846f04dc1d3e02bf1667b8b6fc5f024563f6801123770fa8dac044943be61ca2cb062f657a432f2f121c9bd402292548d4d8d02970b20142702d94d01cb8495bf320942acd6860d1be231066f800596387dacb10ef072aac12101209321b0406dd61c476c787227bd7713e70b4c34c8b8c271065e5520c6c5acee908699d2919d03a1c8a169751bf75b2d1b5b1532c5a0606e98b452518caf9be0ff564075cc01184cfb739c457407e1284cd53700b5bf3fcb3febebc381356cd32406a5103cd7613ef32c03255609aeef6eed6a0299dd9309c93a1014f0dc4616c6361f3161f0a47dad3390f1e2022e8a381b8cd10d3234a62e864ee35ac19063d3871085f41403aa66eeabf2727debe92be3aaa4da082f321cfa2383419a44dd9d599e024263c6b846b0ea63605cba1af82d04062bfa562912531a432e9b1431071385b3781affa2e6113011dc6cd3507e2734c38e793fdf8f176be3d95a96fa6fb856f15d1547508100df31d9fd999e9b42ff56c32bf6e6500e4994fc0792a8e5e81435042a0dcf1ae67d07b1063f67d859d2418fab6216bdcbe3b39abfce24929a1cf21c3ba7914e65bc0010543a8cf4a055f531d7e76ba9be4fc5a019d2d0b9b383158d86bc405de7ac62a675059f56a4c4667b73fb70730d631549ca88d136dd83c2ce2cd703f1da12f529d18231c5d295f2c7b0f806754d9f23707359307d35e25714a61a9040aa9c307a4fa73cc7cc08119611423c5eec601242d78ac6dabefc75c1e9956fae2707c53406a80e932292f5e1dbc40301a12976bf5ffae1670b18f4d1e7363f58768983131c138127f4d6406bce190f0d00d236f3b522e8f28cc6a08b719f5f5bf306848ea316308ed321552276c2adcd464a10665a66eba5190e30b992e04cde141b839859d0d5dd68ff85e2f18455ab34e0b1f4fe7fb20bdc2411adf506d817dd1082c27796c86c64fd319c2af55a3a296ad228f21fd0aaa4ab63371bdf9624d3b0868f13523c461af862e3e84a38fbe964b75036f0da32b027d22c23814085670cc0348414d938c163f3e59d433d959d98a24718364bc48ab9412495fb882b6471718b04c4b57cfa3c8643dc6692cf3ef4563ad3b4b8e9dda02364f0191fa20076e4691ff3a43f6ccae7f548443b7efa183305fe781f1251ed114608afed968eef577c8f602537adab25939710bf0d112cc59f3a11123a8ccae51d14ee36bcdd417647034100660d04a3a3ef6e3c2629ce720644f113d4743794239c2d740eafae64eb1caccd600f92349bae7f10241dfc649c42af76da5675a0b41418db901fa274653b33160f2da4f6812005b3706eec36d59b98443a1e108179e45483c3fdc8c48cc20d17ce48a28793b4f3b6726fe9f40

Assets/Scripts/EasySave/ButtonComponents.cs

@@ -66,7 +66,18 @@ public class ButtonComponents : MonoBehaviour
                 PlayerPrefs.DeleteKey("name");
                 PlayerPrefs.DeleteKey("password");
                 PlayerPrefs.DeleteKey("ison");
+               
+
                 btn_compent[0].SetActive(true);
+                btn_compent[1].GetComponentInChildren<Toggle>().isOn = false;
+                btn_compent[2].SetActive(false);
+                btn_compent[3].SetActive(false);
+                btn_compent[4].SetActive(false);
+                btn_compent[4].GetComponentInChildren<Button>().GetComponent<SmsButton>().timer = -1;
+
+                msg.text = "重置密码成功";
+
+                /*btn_compent[0].SetActive(true);
                 var input_texts= btn_compent[0].GetComponentsInChildren<TMP_Text>();
                 if (input_texts != null && input_texts.Length > 0)
                 {
@@ -79,8 +90,8 @@ public class ButtonComponents : MonoBehaviour
                     }
                 }
                 btn_compent[0].GetComponentInChildren<Toggle>().isOn = false;
-                msg.text = "重置密码成功";
-                btn_compent[1].SetActive(false);
+               
+                btn_compent[1].SetActive(false);*/
             }
             else if(code.Equals(1))
             {

Assets/Scripts/EasySave/ZeusHub_Manager.cs

@@ -149,10 +149,17 @@ public class ZeusHub_Manager : MonoBehaviour
 
             Debug.Log("token"+manager.token);
 
+            Debug.Log(smscode);
+
             msg.text = "";
-            smscode.GetComponentInParent<TMP_InputField>().text= "";
 
-            sms_btn.GetComponentInChildren<TMP_Text>().text = "获取验证码";
+            if (smscode.gameObject.active)
+            {
+                smscode.GetComponentInParent<TMP_InputField>().text = "";
+
+                sms_btn.GetComponentInChildren<TMP_Text>().text = "获取验证码";
+            }
+
 
             //控制
             manager.SceneceAddress[1].SetActive(true);

Assets/Scripts/Model/ProductioRowData.cs

@@ -92,7 +92,7 @@ public class ProductioRowData : MonoBehaviour
                         production.OnReceiveMsg = OnReceiveMsg;
                         production.OnReceiveMsg.AddListener(production._onReceiveMsg);
                         production.downloadUntily = new DownloadUntily();
-
+                        production.aliyunOSSDownLoad = new AliyunOSS.AliyunOSSDownLoad();
                         if (type == 1)
                         {
                             production.set_btn(true);

Assets/Scripts/Model/Production.cs

@@ -7,6 +7,7 @@ using UnityEngine.Networking;
 using LitJson;
 using System.Text;
 using System;
+using AliyunOSS;
 
 public class Production : MonoBehaviour
 {
@@ -33,25 +34,59 @@ public class Production : MonoBehaviour
 
     public DownloadUntily downloadUntily;
 
+    public AliyunOSSDownLoad aliyunOSSDownLoad;
+
     public GameObject progress_side;
 
     public Image preset_image;
 
+    public float fill_data=0;
+
     [Header("收到服务器信息事件")]
     public ReceiveMsgEvent<object, string> OnReceiveMsg;
 
+    public delegate void UpdateUIText(float progress);
+
+    public UpdateUIText updateUIText;
+
     public void Start()
     {
+        updateUIText = new UpdateUIText(UpdateText);  
         //this.OnReceiveMsg.AddListener(_onReceiveMsg);
     }
 
+    void  LateUpdate()
+    {
+        StartCoroutine(update_progress());
+    }
+
+    public IEnumerator update_progress()
+    {
+        if (progress_side.active)
+        {
+            preset_image.fillAmount = fill_data;
+            if (fill_data == 1f)
+            {
+                fill_data = 0;
+                progress_side.SetActive(false);
+            }
+        }
+        else
+        {
+            if (fill_data > 0 && fill_data < 1)
+            {
+                progress_side.SetActive(true);
+            }
+        }
+        yield return new WaitForSeconds(1f);
+    }
+
 
     //启动按钮
     public void startProgress()
     {
         string json = "{\"productionid\":"+id+",\"code\":"+RobotCode.getMNum()+"}";
         //请求校验，获取注册机码
-        
 
         StartCoroutine(request_post(Setting.IP + "/zeus/zeushub/getRobotCode?"+ "productionid="+id+"&code="+RobotCode.getMNum(), json, 1));
 
@@ -70,7 +105,8 @@ public class Production : MonoBehaviour
         }*/
         if (url != null && !url.Equals(""))
         {
-            StartCoroutine(downloadUntily.DownOss(url, id, appname, this));
+            //StartCoroutine(aliyunOSSDownLoad.DownLoad(url, id, appname, this));
+            aliyunOSSDownLoad.DownLoad(url, id, appname, this);
         }
     }
 
@@ -91,19 +127,14 @@ public class Production : MonoBehaviour
         {
             if (jd["id"].ToString().Equals(id))
             {
-                if (!progress_side.active)
-                { 
-                    progress_side.SetActive(true);
-                }
-                else
+                Debug.Log(jd["id"]);
+                Debug.Log(jd["jiedi"]);
+                float present = float.Parse(jd["jiedi"].ToString());
+                preset_image.fillAmount = present;
+                if (present == 1f)
                 {
-                    float present = float.Parse(jd["jiedi"].ToString()) / 100f;
-                    preset_image.fillAmount = present;
-                    if (present == 1f)
-                    {
-                        preset_image.fillAmount = 0;
-                        progress_side.SetActive(false);
-                    }
+                    preset_image.fillAmount = 0;
+                    progress_side.SetActive(false);
                 }
             }          
         }else if (parameter.Equals("savepath"))
@@ -217,6 +248,11 @@ public class Production : MonoBehaviour
         }
     }
 
+    void UpdateText(float progress)
+    {
+        fill_data = progress;
+    }
+
     public void set_btn(bool flag)
     {
         foreach(Button item in button)
@@ -225,4 +261,6 @@ public class Production : MonoBehaviour
         }
     }
 
+    
+
 }

Assets/Scripts/unit/AliyunOSSDownLoad.cs

+using System;
+using System.Threading;
+using Aliyun.OSS;
+using Aliyun.OSS.Common;
+using System.IO;
+using System.Collections;
+using UnityEngine;
+using LitJson;
+using System.IO.Compression;
+using System.Text.RegularExpressions;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEditor.Events;
+
+namespace AliyunOSS
+{
+    public class AliyunOSSDownLoad
+    {
+        // 创建OssClient实例。
+        static OssClient client = new OssClient(Setting.endpoint, Setting.accessKeyId, Setting.accessKeySecret);
+
+        private bool isdown = false;
+
+        private string id;
+
+        private string url;
+
+       delegate void UpdateUIText(Production production,JsonData js_data);
+
+        public void DownLoad(string downloadingUrl, string id, string appname, Production production)
+        {
+            if (!isdown)
+            {
+                JsonData js_data = new JsonData();
+                this.id = id;
+                if (!Directory.Exists("D://DownloadDemo"))
+                {
+                    Directory.CreateDirectory("D://DownloadDemo");
+                }
+
+                downloadingUrl = Uri.UnescapeDataString(downloadingUrl);
+
+                // 填写Object完整路径，完整路径中不能包含Bucket名称，例如exampledir/exampleobject.txt。
+                var objectName = downloadingUrl.Substring(downloadingUrl.LastIndexOf("/") + 1);
+                // 填写本地文件的完整路径，例如D:\\localpath\\examplefile.txt。
+                var downloadFilename = "D://DownloadDemo/" + objectName;
+
+                Debug.Log(downloadingUrl);
+                if (downloadingUrl.IndexOf("https://") < 0)
+                {
+                    js_data["msg"] = "下载路径不合法，请联系管理员";
+                    production.OnReceiveMsg.Invoke(js_data, "msg");
+                    isdown = false;
+                }
+                else
+                {
+                    if (!Directory.Exists("D://DownloadDemo/" + downloadFilename.Substring(downloadFilename.LastIndexOf("/") + 1, downloadFilename.LastIndexOf(".") - (downloadFilename.Substring(0, downloadFilename.LastIndexOf("/") + 1).Length)) + "/"))
+                        PutObjectWithProcessByThread(objectName, downloadFilename, js_data, production, isdown, id, appname);
+                }
+            }
+            
+        }
+
+        private void PutObjectWithProcessByThread(string fullFilePath, string downloadFilename, JsonData js_data, Production production, bool isdown, string id, string appname)
+        {
+            isdown = true;
+            Thread thread = null;
+            thread = new Thread(()=>{
+                try
+                {
+                    float TotalByte = 0;
+                    var len = 0;
+
+                    var getObjectRequest = new GetObjectRequest(Setting.bucketName, fullFilePath);
+
+                    UpdateUIText updateUIText = new UpdateUIText(UpdateText);
+
+                    //下载进度
+                    getObjectRequest.StreamTransferProgress += (obg, args) =>
+                    {
+                        float putProcess = (args.TransferredBytes * 100 / args.TotalBytes);
+                        TotalByte += putProcess;
+
+                        float present = putProcess / 100f;
+
+                        production.updateUIText.BeginInvoke(present, null,null);
+
+                        /*production.preset_image.fillAmount = present;
+                        if (present == 1f)
+                        {
+                            production.preset_image.fillAmount = 0;
+                            production.progress_side.SetActive(false);
+                        }
+
+
+                        if (putProcess >= 1)
+                        {
+                            getObjectRequest.StreamTransferProgress = null;
+                        }*/
+                    };
+
+
+                    // 下载文件到流。OssObject包含了文件的各种信息，如文件所在的存储空间、文件名、元信息以及一个输入流。
+                    var obj = client.GetObject(getObjectRequest);
+                    using (var requestStream = obj.Content)
+                    {
+                        byte[] buf = new byte[1024];
+                        var fs = File.Open(downloadFilename, FileMode.OpenOrCreate);
+
+                        // 通过输入流将文件的内容读取到文件或者内存中。
+                        while ((len = requestStream.Read(buf, 0, 1024)) != 0)
+                        {
+                            fs.Write(buf, 0, len);
+                        }
+                        fs.Close();
+
+                        //解压
+                        //ZipFile.ExtractToDirectory(downloadFilename, "D://DownloadDemo/");
+
+                        Debug.Log("解压前：" + downloadFilename.Substring(downloadFilename.LastIndexOf('/') + 1, downloadFilename.LastIndexOf('.') - downloadFilename.LastIndexOf('/') - 1));
+
+
+                        UnZip(downloadFilename, "D://DownloadDemo/", downloadFilename.Substring(downloadFilename.LastIndexOf('/') + 1, downloadFilename.LastIndexOf('.') - downloadFilename.LastIndexOf('/') - 1));
+
+                        //删除文件
+                        File.Delete(downloadFilename);
+
+
+
+                        //string json = "{\"code\":\"" + RobotCode.getMNum() + "\",\"productionid\":\"" + id + "\"}";
+                        js_data = new JsonData();
+                        js_data["apppath"] = "D://DownloadDemo/" + downloadFilename.Substring(downloadFilename.LastIndexOf("/") + 1, downloadFilename.LastIndexOf(".") - (downloadFilename.Substring(0, downloadFilename.LastIndexOf("/") + 1).Length)) + "/" + appname;
+                        js_data["productionid"] = id;
+                        js_data["code"] = RobotCode.getMNum();
+                        //保存
+                        //production.OnReceiveMsg.Invoke(js_data, "savepath");
+
+                        updateUIText.BeginInvoke(production,js_data, null, null);
+
+                        isdown = false;
+                        //browser.CallFunction("msg", "D://DownloadDemo/" + downloadFilename.Substring(downloadFilename.LastIndexOf("/") + 1, downloadFilename.LastIndexOf(".") - (downloadFilename.Substring(0, downloadFilename.LastIndexOf("/") + 1).Length)) + "/" + appname, id, 1);
+                    }
+                }
+                catch (OssException e)
+                {
+                    Console.WriteLine("下载错误：" + e);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine("下载错误：" + e);
+                }
+                finally
+                {
+                    thread.Abort();
+                }
+            });
+            thread.Start();
+        }
+
+        // 定义一个函数，用于在UI线程中更新UI元素
+        void UpdateText(Production production,JsonData js_data)
+        {
+            production.OnReceiveMsg.Invoke(js_data, "sendProcess");
+        }
+
+        /// <summary>
+        /// 解压zip文件，并覆盖保存到指定的目标路径文件下         
+        /// </summary>
+        /// <param name="zipFilePath">将要解压缩的zip文件的路径</param>
+        /// <param name="unZipDir">解压后将zip中的文件存储到磁盘的目标路径</param>
+        /// <returns></returns>
+        public static bool UnZip(string zipFilePath, string unZipDir, string directoryName)
+        {
+            bool result;
+            try
+            {
+                unZipDir = unZipDir.EndsWith(@"\") ? unZipDir : unZipDir + @"\";
+                var directoryinfo = new DirectoryInfo(unZipDir);
+                if (!directoryinfo.Exists) directoryinfo.Create();
+
+                var fileinfo = new FileInfo(zipFilePath);
+                if (!fileinfo.Exists) return false;
+
+                using (var zipToOpen = new FileStream(zipFilePath, FileMode.Open, FileAccess.ReadWrite, FileShare.Read))
+                {
+                    using (var archive = new ZipArchive(zipToOpen, ZipArchiveMode.Read))
+                    {
+
+                        foreach (var zipArchiveEntry in archive.Entries)
+                        {
+                            if (!zipArchiveEntry.FullName.EndsWith("/"))
+                            {
+                                //中文出现乱码问题，截取中文段部分后把自定义的directoryName，拼接到前面
+                                var entryFilePath = directoryName + '/' + Regex.Replace(zipArchiveEntry.FullName.Substring(zipArchiveEntry.FullName.IndexOf('/') + 1).Replace("/", @"\"), @"^\\*", "");
+
+                                // Debug.Log("zipArchiveEntry.FullName=" +zipArchiveEntry.FullName);
+
+                                // Debug.Log("entryFilePath=" + entryFilePath);
+                                var filePath = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(directoryinfo + entryFilePath));
+                                var content = new byte[zipArchiveEntry.Length];
+                                zipArchiveEntry.Open().Read(content, 0, content.Length);
+
+                                var greatFolder = Directory.GetParent(filePath);
+                                if (!greatFolder.Exists)
+                                    greatFolder.Create();
+                                File.WriteAllBytes(filePath, content);
+                            }
+                        }
+                    }
+                }
+                result = true;
+            }
+            catch (Exception e)
+            {
+                Debug.Log(e);
+                result = false;
+            }
+            return result;
+        }
+    }
+}

Assets/Scripts/unit/AliyunOSSDownLoad.cs.meta

+fileFormatVersion: 2
+guid: 8ed2a6b6c6d1e41468fe154e67c95f4a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/unit/DownloadUntily.cs

@@ -232,12 +232,9 @@ public class DownloadUntily
                     isdown = false;
                     //browser.CallFunction("msg", "已存在项目", null, 2);
                 }
-            }
-
-
-            
+            } 
     }
-  
+
 
     public void PutOss(string base64,string localFilename)
     {

Assets/Scripts/unit/MainThreadDispatcher.cs

+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using UnityEngine;
+
+public class MainThreadDispatcher : MonoBehaviour
+{
+    private static MainThreadDispatcher instance;
+    private static readonly Queue<Action> actions = new Queue<Action>();
+    private static readonly object lockObject = new object();
+
+    public static MainThreadDispatcher Instance
+    {
+        get
+        {
+            if (instance == null)
+            {
+                instance = FindObjectOfType<MainThreadDispatcher>();
+
+                if (instance == null)
+                {
+                    var go = new GameObject("MainThreadDispatcher");
+                    instance = go.AddComponent<MainThreadDispatcher>();
+                }
+            }
+
+            return instance;
+        }
+    }
+
+    private void Awake()
+    {
+        DontDestroyOnLoad(gameObject);
+    }
+
+    private void Update()
+    {
+        lock (lockObject)
+        {
+            while (actions.Count > 0)
+            {
+                actions.Dequeue().Invoke();
+            }
+        }
+    }
+
+    public void Enqueue(Action action)
+    {
+        lock (lockObject)
+        {
+            actions.Enqueue(action);
+        }
+    }
+
+    public void Enqueue(IEnumerator coroutine)
+    {
+        lock (lockObject)
+        {
+            actions.Enqueue(() => StartCoroutine(coroutine));
+        }
+    }
+
+    public static void RunOnMainThread(Action action)
+    {
+        Instance.Enqueue(action);
+    }
+
+    public static void RunOnMainThread(IEnumerator coroutine)
+    {
+        Instance.Enqueue(coroutine);
+    }
+}

Assets/Scripts/unit/MainThreadDispatcher.cs.meta

+fileFormatVersion: 2
+guid: 0218216871585ca4e8d439729945037e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/unit/UnityMainThreadDispatcher.cs

+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Events;
+
+public class UnityMainThreadDispatcher : MonoBehaviour
+{
+    private static UnityMainThreadDispatcher instance;
+    private readonly Queue<System.Action> queue = new Queue<System.Action>();
+
+    public UnityEvent UpdateEvent = new UnityEvent();
+
+    public static UnityMainThreadDispatcher Instance()
+    {
+        if (!instance)
+        {
+            instance = FindObjectOfType<UnityMainThreadDispatcher>();
+            if (!instance)
+            {
+                var obj = new GameObject("UnityMainThreadDispatcher");
+                instance = obj.AddComponent<UnityMainThreadDispatcher>();
+            }
+        }
+        return instance;
+    }
+
+    private void Update()
+    {
+        lock (queue)
+        {
+            while (queue.Count > 0)
+            {
+                queue.Dequeue().Invoke();
+            }
+        }
+    }
+
+    public void Enqueue(System.Action action)
+    {
+        lock (queue)
+        {
+            queue.Enqueue(action);
+        }
+    }
+}

Assets/Scripts/unit/UnityMainThreadDispatcher.cs.meta

+fileFormatVersion: 2
+guid: f54d8078cfe456741b214573c98c0eef
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_预设/UI/登录页/btn-登录.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 2696282727431504715}
   - component: {fileID: 591200660947188219}
   - component: {fileID: 1683193665052784579}
+  - component: {fileID: 8036959978569993474}
   m_Layer: 5
   m_Name: "btn-\u767B\u5F55"
   m_TagString: Untagged
@@ -119,6 +120,25 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8036959978569993474
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1317000047387169438}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9bf367b2811e3f548892ea3e5ae8cd0d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  username: {fileID: 0}
+  password: {fileID: 0}
+  smscode: {fileID: 0}
+  msg: {fileID: 0}
+  remember_me: {fileID: 0}
+  load: {fileID: 0}
+  welBorews: {fileID: 0}
 --- !u!1 &5177113194901782628
 GameObject:
   m_ObjectHideFlags: 0

Assets/_预设/UI/登录页/登录输入框.prefab

@@ -318,8 +318,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0.5, y: 0}
+  m_SizeDelta: {x: -1, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6056045121607370805
 CanvasRenderer:

Assets/_预设/UI/验证.meta

+fileFormatVersion: 2
+guid: 179d30774b871b243b216cc702e1eed2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_预设/产品.prefab

@@ -994,7 +994,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 460.5, y: -501.08337}
+  m_AnchoredPosition: {x: 547.5, y: -594.8571}
   m_SizeDelta: {x: 500, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6928409732293149083
@@ -1557,6 +1557,7 @@ MonoBehaviour:
   manager: {fileID: 0}
   progress_side: {fileID: 5184067287142128276}
   preset_image: {fileID: 8565227069874954852}
+  fill_data: 0
 --- !u!114 &2801718033762222592
 MonoBehaviour:
   m_ObjectHideFlags: 0

Log/log.txt

@@ -7191,3 +7191,5 @@
 2023/4/4 11:28:57  api:http://8.134.114.12:11011/zeus/zeushub/getRobotCode?productionid=12877&code=54bce43eff19b4720e1f58fe  HTTP/1.1 502 Bad Gateway
 2023/4/7 16:10:13  api:http://8.134.114.12:11011/oauth/token  Cannot connect to destination host
 2023/4/10 14:04:19  api:http://8.134.114.12:11011/oauth/token  Cannot connect to destination host
+2023/5/4 8:33:07  api:http://8.134.114.12:11011/oauth/token  Cannot connect to destination host
+2023/5/5 15:13:40  api:http://8.134.114.12:11011/oauth/token  HTTP/1.1 401 Unauthorized