AR演示版本调优

Assets/Scripts/UI/Prefab/GameRoom/GameRoomMapItem.cs

@@ -18,7 +18,7 @@ using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 
-public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, IPointerUpHandler,IProgress<float>
+public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, IPointerUpHandler
 {
     public class PropNames
     {
@@ -78,7 +78,21 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
             downloading.SetActive(true);
             downloadTxt.SetActive(false);
             slider.gameObject.SetActive(true);
-            Loom.Download(map);
+            var progress = Progress.Create<float>(x =>
+            {
+                Loom.DownLoadTaskList[map.FileName] = x;
+                slider.value = x;
+                LayoutRebuilder.ForceRebuildLayoutImmediate((RectTransform)this.slider.transform);
+                if (x == 1)
+                {
+                    transform.Find("DownLoadModal").gameObject.SetActive(false);
+                }
+                else
+                {
+                    transform.Find("DownLoadModal").gameObject.SetActive(true);
+                }
+            });
+            Loom.Download(map, progress);
         });
 
         transform.Find("Name").GetComponent<Text>().text = myMap.Name;
@@ -303,24 +317,4 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
     {
         Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
     }
-
-    public void Report(float value)
-    {
-        if (gameObject != null)
-            slider.value = value;
-        if (Loom.DownLoadTaskList.ContainsKey(map.FileName))
-        {
-            Loom.DownLoadTaskList[map.FileName] = value;
-        }
-        else
-        {
-            Loom.DownLoadTaskList.Add(map.FileName, value);
-        }
-
-        if (value == 100)
-        {
-            Ride();
-            transform.Find("DownLoadModal").gameObject.SetActive(false);
-        }
-    }
 }

Assets/Scripts/UI/Prefab/MapList/MapItem.cs

@@ -79,7 +79,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         var diff = tabContainer.Find("Diff");
         diff.Find("Text").GetComponent<Text>().text = myMap.Hard;
         tabContainer.Find("3d").gameObject.SetActive(!myMap.EnableAR && myMap.Enable3D);
-        tabContainer.Find("AR").gameObject.SetActive(myMap.EnableAR);
+        tabContainer.Find("AR")?.gameObject.SetActive(myMap.EnableAR);
         tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(myMap.CountryCode);
         transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
         transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(Collect);

Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs

@@ -274,13 +274,18 @@ public class GameRoomListController : PFUIPanel
         //LOOM中取数据渲染下载当前下载进度
         var downLoadList = transform.Find("DownLoadList").gameObject;
         var downloadPanel = transform.Find("DownloadPanel").gameObject;
-        if (!downLoadList.activeSelf && !downloadPanel.activeSelf)
+        if (Loom.DownLoadTaskList.Count>0)
         {
             var content = downLoadList.transform.Find("Viewport/Content");
+            var taskList = FindObjectsOfType<GameRoomDownloadTask>();
             foreach (var item in Loom.DownLoadTaskList)
             {
-                var newtask = Instantiate(_downLoadTask, content);
-                newtask.GetComponent<GameRoomDownloadTask>().Init(0, item.Key, downloadPanel);
+                var done = taskList.Where(c => c.FileName.Equals(item.Key)).Any();
+                if (!done)
+                {
+                    var newtask = Instantiate(_downLoadTask, content);
+                    newtask.GetComponent<GameRoomDownloadTask>().Init(0, item.Key, downloadPanel);
+                }
                 downLoadList.SetActive(true);
             }
         }