AR视频direction文件相关调整

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

@@ -58,6 +58,7 @@ class GameRoomDownloadTask : MonoBehaviour
             {
                 slider.gameObject.SetActive(false);
                 gameObject.Destroy();
+                Loom.DownLoadTaskList.Remove(FileName);
             };
         }
     }

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

@@ -29,24 +29,34 @@ class GameRoomPlayerPanel : MonoBehaviour
 
     public bool NotUse { get; private set; }
 
+    public bool IsOwner { get; private set; }
+
     private void Start()
     {
         var manager = FindObjectOfType<GameRoomDetailController>();
         var inviteBtn = inviteModal.transform.Find("InviteBtn").gameObject;
         UIManager.AddEvent(inviteBtn,EventTriggerType.PointerClick,(e)=> {
-            Utils.CopyToClipboard($"GameRoom/{manager.GameRoom.RoomId}");
+            var encryptCode = EncrypHelper.Encrypt($"GameRoom/{App.CurrentUser.Nickname}/{manager.GameRoom.Name}/{manager.GameRoom.RoomId}");
+            Utils.CopyToClipboard(encryptCode);
             Utils.showToast(transform.parent.gameObject, App.GetLocalString("copy to clipboard successfully!"));
         });
+      
         UIManager.AddEvent(gameObject, EventTriggerType.PointerClick, (e) =>
         {
+            if (App.gameRoomDetail.UserId  != App.CurrentUser.Id)
+                return;
             kickModal.SetActive(true);
         });
-        UIManager.AddEvent(cancelBtn, EventTriggerType.PointerExit, (e) =>
+        UIManager.AddEvent(cancelBtn, EventTriggerType.PointerClick, (e) =>
         {
+            if (App.gameRoomDetail.UserId != App.CurrentUser.Id)
+                return;
             kickModal.SetActive(false);
         });
         UIManager.AddEvent(kickBtn, EventTriggerType.PointerClick, (e) =>
         {
+            if (App.gameRoomDetail.UserId != App.CurrentUser.Id)
+                return;
             MapUDPService.SendGameRoomKick(App.gameRoomDetail.RoomId, UserId, App.CurrentUser.Id);
         });
     }
@@ -63,7 +73,7 @@ class GameRoomPlayerPanel : MonoBehaviour
         ftpTxt.text = ftp.ToString();
         me.SetActive(App.CurrentUser.Id == userId);
         owner.SetActive(isOwner);
-        //Show ready
+        IsOwner = isOwner;
         ready.SetActive(!isOwner && Status == 1);
     }
 
@@ -77,14 +87,10 @@ class GameRoomPlayerPanel : MonoBehaviour
         ftpTxt.text = ftp.ToString();
         me.SetActive(App.CurrentUser.Id == userId);
         owner.SetActive(isOwner);
+        IsOwner = isOwner;
         ready.SetActive(!isOwner && Status == 1);
     }
 
-    private void Update()
-    {
-        
-    }
-
     public void Ready()
     {
         ready.SetActive(true);

Assets/Scripts/UI/Prefab/NewRoute/NewRouteItemController.cs

@@ -27,9 +27,10 @@ public class NewRouteItemController : MonoBehaviour
         GetComponent<Button>().onClick.RemoveAllListeners();
         GetComponent<Button>().onClick.AddListener(() =>
         {
-            UIManager.ShowNewRouteDetailPanel(area.Id);
+            UIManager.ShowNewRouteDetailPanel(area.Id,area.CoverImage);
         });
-        StartCoroutine(displayImage(area, caches));
+        Utils.DisplayImage(GetComponent<RawImage>(), area.CoverImage);
+        //StartCoroutine(displayImage(area, caches));
     }
 
     IEnumerator displayImage(MapRouteAreaItem area, Dictionary<string, Texture> caches = null)

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

@@ -42,7 +42,10 @@ public class GameRoomCountDownController : PFUIPanel
             {
                 gameObject.SetActive(false);
             }
-            count.text = Seconds.ToString();
+            else
+            {
+                count.text = Seconds.ToString();
+            }
             Seconds--;
             timer += 1f;
         }

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

@@ -103,7 +103,10 @@ public class GameRoomDetailController : PFUIPanel
                 if (detail.RoomList != null)
                 {
                     GameRoom = detail.RoomList.Where(c => c.RoomId == GameRoom.RoomId).FirstOrDefault();
-                    DataSourceChanged = true;
+                    if (GameRoom != null)
+                    {
+                        DataSourceChanged = true;
+                    }
                 }
             }
         }
@@ -134,11 +137,11 @@ public class GameRoomDetailController : PFUIPanel
         d3.SetActive(enable3d);
         ar.SetActive(GameRoom.EnableAR);
 
-        //DataSourceChanged = true;
         MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, 0, 1, GameRoom.RoomId.ToString());
-        readyBtn.SetActive(true);
-        cancelBtn.SetActive(false);
-        startBtn.SetActive(false);
+        var isOwner = GameRoom.UserId == App.CurrentUser.Id;
+        readyBtn.SetActive(!isOwner);
+        cancelBtn.SetActive(!isOwner);
+        startBtn.SetActive(isOwner);
 
         idText.text = GameRoom.RoomId.ToString().PadLeft(7, '0');
         roomName.text = GameRoom.Name;
@@ -170,21 +173,21 @@ public class GameRoomDetailController : PFUIPanel
             }
         }
     }
-
+    private bool isOwner { get; set; } = true;
     private void TcpHandler()
     {
         if (DataSourceChanged)
         {
             var playerList = FindObjectsOfType<GameRoomPlayerPanel>();
             var list = GameRoom.RoomPlayerList;
-            //自己
+            //自己是否是房主
             var mine = list.Where(c => c.UserId == App.CurrentUser.Id).FirstOrDefault();
-            if (mine != null)
+            if (mine != null && isOwner != mine.IsOwner)
             {
-                //是否是房主
-                var owner = mine.IsOwner;
-                readyBtn.SetActive(!owner);
-                startBtn.SetActive(owner);
+                isOwner = mine.IsOwner;
+                readyBtn.SetActive(!isOwner);
+                startBtn.SetActive(isOwner);
+                cancelBtn.SetActive(!isOwner);
             }
             //新增/更新
             foreach (var item in list)

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

@@ -30,7 +30,7 @@ public class GameRoomListController : PFUIPanel
     private Transform searchInput;
 
     private string sort = "", sortDire = "";
-    private bool isFav;
+    private bool isEnableAR { get; set; }
     private int pageSize = 10;
     private string ftname = "";
     private string distance = "";
@@ -276,6 +276,7 @@ public class GameRoomListController : PFUIPanel
             UIManager.ShowGameRoomDetailPanel();
         }
     }
+
     private void InitStep1()
     {
         sort = "Near";
@@ -286,6 +287,7 @@ public class GameRoomListController : PFUIPanel
         scroll = transform.Find("MapList/Modal/Right/Scroll View").gameObject;
         if (scroll != null)
         {
+            UIManager.RemoveEvent(scroll, UnityEngine.EventSystems.EventTriggerType.EndDrag);
             UIManager.AddEvent(scroll, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
         }
 
@@ -296,6 +298,7 @@ public class GameRoomListController : PFUIPanel
             distanceOptions.GetComponent<Dropdown>().value = 0;
             var dDropdown = distanceOptions.GetComponent<Dropdown>();
             dDropdown.options = MapFilterOptions.distances;
+            dDropdown.onValueChanged.RemoveAllListeners();
             dDropdown.onValueChanged.AddListener(ChangeDistance);
         }
 
@@ -307,6 +310,7 @@ public class GameRoomListController : PFUIPanel
             var g = tdContainer.Find("Gou").gameObject;
             g.SetActive(false);
             is3d = false;
+            UIManager.RemoveEvent(tdContainer.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick);
             UIManager.AddEvent(tdContainer.gameObject, EventTriggerType.PointerClick, (b) =>
             {
                 var gou = tdContainer.Find("Gou").gameObject;
@@ -321,13 +325,13 @@ public class GameRoomListController : PFUIPanel
         {
             var g = favContainer.Find("Gou").gameObject;
             g.SetActive(false);
-            isFav = false;
-            UIManager.AddEvent(favContainer.gameObject, EventTriggerType.PointerClick, (b) =>
-            {
-                var gou = favContainer.Find("Gou").gameObject;
+            isEnableAR = false;
+            UIManager.RemoveEvent(favContainer.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick);
+            UIManager.AddEvent(favContainer.gameObject, EventTriggerType.PointerClick, (e)=> {
+                var gou = e.selectedObject.transform.Find("Gou").gameObject;
                 bool v = !gou.activeSelf;
                 gou.SetActive(v);
-                isFav = v;
+                isEnableAR = v;
                 Refresh();
             });
         }
@@ -337,12 +341,13 @@ public class GameRoomListController : PFUIPanel
         {
             searchInput.GetComponent<InputField>().text = "";
             ftname = "";
+            searchInput.GetComponent<InputField>().onEndEdit.RemoveAllListeners();
             searchInput.GetComponent<InputField>().onEndEdit.AddListener((s) =>
             {
                 var t = searchInput.GetComponent<InputField>().text;
                 ftname = t;
             });
-
+            UIManager.RemoveEvent(searchInput.Find("Button").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick);
             UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
             {
                 onEndEdit();
@@ -362,6 +367,7 @@ public class GameRoomListController : PFUIPanel
                 ColorUtility.TryParseHtmlString("#23232D", out Color cc);
                 image.color = cc;
                 text.color = new Color(1, 1, 1, 1);
+                UIManager.RemoveEvent(button.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick);
                 UIManager.AddEvent(button.gameObject, EventTriggerType.PointerClick, (b) =>
                 {
                     ColorUtility.TryParseHtmlString("#23232D", out Color c1);
@@ -391,6 +397,7 @@ public class GameRoomListController : PFUIPanel
             var drop = sorts.GetComponent<Dropdown>();
             drop.options = MapFilterOptions.sorts;
             drop.value = 0;
+            drop.onValueChanged.RemoveAllListeners();
             drop.onValueChanged.AddListener((int index) =>
             {
                 var text = drop.options[index].text;
@@ -420,6 +427,7 @@ public class GameRoomListController : PFUIPanel
         if (sortDir)
         {
             var image = sortDir.Find("Image").GetComponent<Image>();
+            UIManager.RemoveEvent(sortDir.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick);
             UIManager.AddEvent(sortDir.gameObject, EventTriggerType.PointerClick, (b) =>
             {
                 if (image.sprite.name == "DOWN")
@@ -454,22 +462,22 @@ public class GameRoomListController : PFUIPanel
 
         right = transform.Find("MapList/Modal/Right").gameObject;
         right2 = transform.Find("MapList/Modal/Right2").gameObject;
-
+        UIManager.RemoveEvent(cancel, UnityEngine.EventSystems.EventTriggerType.PointerClick);
         UIManager.AddEvent(cancel, EventTriggerType.PointerClick, (e) =>
         {
             MapList.SetActive(false);
         });
-
+        UIManager.RemoveEvent(next, UnityEngine.EventSystems.EventTriggerType.PointerClick);
         UIManager.AddEvent(next, EventTriggerType.PointerClick, (e) =>
         {
             HandleStepBtn(next.name);
         });
-
+        UIManager.RemoveEvent(previous, UnityEngine.EventSystems.EventTriggerType.PointerClick);
         UIManager.AddEvent(previous, EventTriggerType.PointerClick, (e) =>
         {
             HandleStepBtn(previous.name);
         });
-
+        UIManager.RemoveEvent(create, UnityEngine.EventSystems.EventTriggerType.PointerClick);
         UIManager.AddEvent(create, EventTriggerType.PointerClick, (e) =>
         {
            MapUDPService.SendCreateGameRoom(RoomName, selectedRouteId, Roompwd, UIManager.Now.GetDateTime(), CloseTime, Members, Map.AverageGrade, (Map.TotalClimb ?? 0), Map.Distance, Map.Enable3D, Map.EnableAR, Map.Name, Map.FileName, Map.Url, Map.AltitudeGraph);
@@ -506,12 +514,14 @@ public class GameRoomListController : PFUIPanel
         HandleFormInput();
         HandleCloseTimeBtnClick(0, "");
         HandleMembersBtnClick(0, "");
+        roomNameInputField.onValueChanged.RemoveAllListeners();
         //房间名
         roomNameInputField.onValueChanged.AddListener((e) => {
             RoomName = e;
             HandleFormInput();
         });
         //房间密码
+        passwordInputField.onValueChanged.RemoveAllListeners();
         passwordInputField.onValueChanged.AddListener((e) => {
             Roompwd = e;
             HandleFormInput();
@@ -537,12 +547,14 @@ public class GameRoomListController : PFUIPanel
             HandleCloseTimeBtnClick(60, btn60.name);
         });
         //小时
+        hourInputField.onValueChanged.RemoveAllListeners();
         hourInputField.onValueChanged.AddListener((e) => {
             hours = Convert.ToInt32(e);
             CloseTime = hours * 60 + mins;
             HandleCloseTimeBtnClick(CloseTime, hourInputField.name);
         });
         //分钟
+        minInputField.onValueChanged.RemoveAllListeners();
         minInputField.onValueChanged.AddListener((e) => {
             mins = Convert.ToInt32(e);
             CloseTime = hours * 60 + mins;
@@ -829,7 +841,7 @@ public class GameRoomListController : PFUIPanel
     private async void GetList()
     {
         if (isEnd) return;
-        var res = await ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname, distance, string.Join(",", hands), is3d, sort, sortDire);
+        var res = await ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname, distance, string.Join(",", hands), is3d, sort, sortDire, isEnableAR:isEnableAR);
         if (res.result)
         {
             if (res.data.Count == 0)

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

@@ -131,10 +131,12 @@ public class HomeController : PFUIPanel
     private void GoGameRoom(BaseEventData e)
     {
 #if UNITY_STANDALONE_WIN
+        OnExit(e);
         var pe = (PointerEventData)e;
+        if (pe == null)
+            return;
         var parent = pe.pointerEnter.transform.parent;
         UIManager.ShowGameRoomListPanel();
-        OnExit(e);
 #endif
     }
     private void GoRide(BaseEventData e)

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

@@ -134,12 +134,12 @@ public class NewRouteDetailController : PFUIPanel
     MapRouteAreaDetail area;
     int pageIndex = 0, pageSize = 12;
     bool isEnd = false, startMouse = false;
-    public async void Initial(int areaId)
+    public async void Initial(int areaId,string coverImage)
     {
         isEnd = false;
         pageIndex = 0;
         var left = transform.Find("Container/Left");
-        left.Find("Icon").GetComponent<RawImage>().texture = null;
+        Utils.DisplayImageTempDict(transform.Find("Container/Left/Icon").GetComponent<RawImage>(), coverImage, caches , b =>{ });
         scroll.content.DestroyChildren();
         transform.Find("Container/Left/RideContainer/Text").GetComponent<Text>()
                 .text = string.Empty;
@@ -151,8 +151,6 @@ public class NewRouteDetailController : PFUIPanel
             .text = string.Empty;
         transform.Find("Container/Left/DescScroll/Viewport/Content/Desc").GetComponent<Text>()
             .text = string.Empty;
-        
-        
         await GetData(areaId);
         GetList();
         

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

@@ -170,6 +170,8 @@ public class NewRouteOverviewController: PFUIPanel
             }
             group.SetParent(collectionContent);
             group.localScale = Vector3.one;
+            //获取数据后需要重绘
+            LayoutRebuilder.ForceRebuildLayoutImmediate(collectionContent);
         }
         //for (int i = 0; i < 10; i++)
         //{
@@ -182,8 +184,7 @@ public class NewRouteOverviewController: PFUIPanel
         //    group.SetParent(collectionContent);
         //    group.localScale = Vector3.one;
         //}
-        //获取数据后需要重绘
-        LayoutRebuilder.ForceRebuildLayoutImmediate(collectionContent);
+        
     }
     void MoveBanner(bool right) 
     {

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

@@ -101,6 +101,7 @@ public class UserInfoController : PFUIPanel
         //    var result = await userApi.Login("15651831367", "123456", "");
         //    App.CurrentUser = result.data;
         //}
+        Utils.DisplayHead(infoPanel.Find("Avatar").GetComponent<RawImage>(), App.CurrentUser.WxHeadImg);
         var r = await ConfigHelper.userApi.GetSummary();
         if (r.result) 
         {

Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs

@@ -250,7 +250,7 @@ public class ResultListController : PFUIPanel
                     obj.GetComponent<RouteItem>().Initial(item.ToObject<RowerResultModel>(), index, transform,true);
                 }
                 //obj.SendMessage("Initial", );
-                obj.transform.parent = content;
+                obj.transform.SetParent(content);
                 obj.transform.localScale = new Vector3(1, 1, 1);
             }
         }