搜索面板条件关闭重新打开重置

Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs

@@ -45,11 +45,13 @@ namespace Assets.Scenes.Ride.Scripts
         MapApi mapApi;
         Sprite down;
         Sprite up;
+        Transform parent;
         private void Awake()
         {
             mapApi = new MapApi();
             cyclingController = FindObjectOfType<CyclingController>();
             //分页查询当前路数排行榜选手成绩列表
+            parent = transform.Find("Panel/PlayerList/Scroll View/Viewport/Content");
             prefab = Resources.Load<GameObject>("UI/Prefab/Ride/SelectPlayerItem");
             down  = Resources.Load<Sprite>("Images/DOWN");
             up = Resources.Load<Sprite>("Images/UP");
@@ -111,6 +113,11 @@ namespace Assets.Scenes.Ride.Scripts
                     OnEndDrag(null);
                 }
             }
+            if (Input.GetKeyDown(KeyCode.Return))
+            {
+                Search(null);
+            }
+
             bool enabled = gameObjects.Where(c => c.GetComponent<SeletedPlayerScript>().isUsed).Count() > 0;
             rideButton.enabled = enabled;
             rideButton.interactable = enabled;
@@ -193,14 +200,38 @@ namespace Assets.Scenes.Ride.Scripts
             reviewPanel.SetActive(false);
             selectPanel.SetActive(true);
             nearPanel.SetActive(false);
+            Reset();
+        }
+
+        private void Reset()
+        {
+            inputField.text = string.Empty;
+            startValue.text = string.Empty;
+            endValue.text = string.Empty;
+
+            pageIndex = 0;
+            pageSize = 8;
+            totalPages = 0;
+            seachName = string.Empty;
+
+            _startValue = 0;
+            _endValue = 0;
+
+            foreach (var item in gameObjects)
+            {
+                item.GetComponent<SeletedPlayerScript>().Reset();
+            }
+            parent.DestroyChildren();
+            sort = 0;
+            sortImage.sprite = down;
         }
         private void Start()
         {
             //CreateGameObject(cyclingController.mapRouteRankingList);
-            Refresh();
+            //Refresh();
         }
 
-        private void Refresh()
+        public void Refresh()
         {
             var list = mapApi.GetShadowList(App.RouteIdParam, seachName, pageIndex, pageSize);
             totalPages = list.data.TotalPages;
@@ -225,7 +256,7 @@ namespace Assets.Scenes.Ride.Scripts
         }
         private void CreateGameObject(List<MapRouteRanking> list)
         {
-            var parent = transform.Find("Panel/PlayerList/Scroll View/Viewport/Content");
+           
             int index = 0;
             foreach (var item in list)
             {

Assets/Scenes/Ride/Scripts/SingleUIManager.cs

@@ -189,19 +189,6 @@ namespace Assets.Scenes.Ride.Scripts
             //小地图进度
             miniMapProcess = transform.Find("Panel/MiniMap/Process").GetComponent<Image>();
             miniMapProcessText = transform.Find("Panel/MiniMap/Process/Text").GetComponent<Text>();
-            //开发者视角调整
-            cameraSlider = transform.Find("Panel/CameraSlider").GetComponent<Slider>();
-            Text Cameray = transform.Find("Panel/CameraSlider/Text").GetComponent<Text>();
-            string[] phoneList = new string[] { "18120141032", "15651831367", "13115011550","15261826280" };
-            if (phoneList.Contains(App.CurrentUser.Phone)) 
-            {
-                cameraSlider.gameObject.SetActive(true);
-                cameraSlider.onValueChanged.AddListener((f) =>
-                {
-                    cameraY = f;
-                    Cameray.text = f.ToString("f0");
-                });
-            }
 
             UIManager.AddEvent(startBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, StartRide);
             UIManager.AddEvent(simpleBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, ClearPanel);
@@ -290,6 +277,21 @@ namespace Assets.Scenes.Ride.Scripts
                 cameraY = float.Parse(cameraArr[1]);
                 cameraZ = float.Parse(cameraArr[2]);
             }
+            //开发者视角调整
+            cameraSlider = transform.Find("Panel/CameraSlider").GetComponent<Slider>();
+            Text CameraText = transform.Find("Panel/CameraSlider/Text").GetComponent<Text>();
+            string[] phoneList = new string[] { "18120141032", "15651831367", "13115011550", "15261826280" };
+            if (phoneList.Contains(App.CurrentUser.Phone))
+            {
+                cameraSlider.gameObject.SetActive(true);
+                cameraSlider.value = cameraY;
+                CameraText.text = cameraY.ToString("f0");
+                cameraSlider.onValueChanged.AddListener((f) =>
+                {
+                    cameraY = f;
+                    CameraText.text = f.ToString("f0");
+                });
+            }
             //路书基本信息绑定
             mapName.text = routeInstance.Name;
             totalDistance.text = Math.Round(mainController.GetMapData().TotalDistance, 1).ToString() + "KM";//总里程
@@ -390,7 +392,11 @@ namespace Assets.Scenes.Ride.Scripts
                     if (count == 0)
                     {
                         mainController.SetStart();
-                        countDownTxt.transform.GetComponent<CanvasGroup>().DOFade(0, 1);
+                        var canvasGroup = countDownTxt.transform.GetComponent<CanvasGroup>();
+                        canvasGroup.DOFade(0, 1).onComplete+=()=> {
+                            countDownTxt.gameObject.SetActive(false);
+                            canvasGroup.alpha = 1;
+                        };
                     }
                     if (count == 1 && mainController.cyclingModel == CyclingModel.Single)
                     {
@@ -474,6 +480,7 @@ namespace Assets.Scenes.Ride.Scripts
             selectPanel.SetActive(false);
             //显示影子选手骑行列表
             selectPlayer.SetActive(true);
+            selectPlayer.GetComponent<SelectPlayerFactory>().Refresh();
             //显示附近的人列表
             nearByPanel.SetActive(true);
         }