登录bug&影子选手bug修复

Assets/Resources/UI/Prefab/Ride/SelectPlayerItem.prefab

@@ -89,9 +89,9 @@ GameObject:
   - component: {fileID: 7990214424076100056}
   - component: {fileID: 7990214424076100059}
   - component: {fileID: 7990214424076100058}
-  - component: {fileID: 7990214424076100057}
   - component: {fileID: 7990214424076100036}
   - component: {fileID: 6761916324276017367}
+  - component: {fileID: 7243281697451373151}
   m_Layer: 5
   m_Name: SelectPlayerItem
   m_TagString: Untagged
@@ -149,8 +149,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -159,19 +159,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &7990214424076100057
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7990214424076100063}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  radius: 20
 --- !u!114 &7990214424076100036
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -206,7 +193,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 1, g: 0.45490196, b: 0.52156866, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
     m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
@@ -228,6 +215,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7243281697451373151
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7990214424076100063}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 20
 --- !u!1 &7990214424621459035
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/Ride/Scripts/PlayerController.cs

@@ -39,14 +39,10 @@ namespace Assets.Scenes.Ride.Scripts
 #if UNITY_EDITOR
             power = 2000;//测试功率
 #endif
-            Debug.Log(currentSlope.ToString() + "==" + App.rideSetting.sensitivity.ToString());
-			//mainController.CheckAnt();
 			mainController.TrackResistance(currentSlope * App.rideSetting.sensitivity/100);
 			speed = Helper.CalculateSpeed(elevation, currentSlope, power, weight, bicycleWeight);
 			distance = mainController.UpdateDistance(speed);
 			totalDistance += distance;
-
-			//preDistance EndDistance
 		
 			if (!stopRecord)
 			{

Assets/Scenes/Ride/Scripts/ReviewFactory.cs

@@ -1,5 +1,6 @@
 using Assets.Scenes.Ride.Scripts.Model;
 using Assets.Scripts.Apis;
+using Assets.Scripts.Apis.Models;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -53,7 +54,7 @@ namespace Assets.Scenes.Ride.Scripts
                     break;
                 case Model.CyclingModel.Review:
                     singleArea.SetActive(false);
-                    InitReview();
+                    //InitReview();
                     break;
             }
         }
@@ -77,12 +78,12 @@ namespace Assets.Scenes.Ride.Scripts
                 item.SetSiblingIndex(i);
             }
         }
-        private void InitReview()
+        public void SetReview(List<MapRecordRanking> rankingList)
         {
             reviewScrollView.SetActive(true);
-            if (cyclingController.selectParamModel.RankingsId.Count > 0)
+            if (rankingList.Count > 0)
             {
-                var rankingList = mapApi.GetRecordFileFromServer(cyclingController.selectParamModel.RankingsId);
+                //var rankingList = mapApi.GetRecordFileFromServer(cyclingController.selectParamModel.RankingsId);
                 foreach (var item in rankingList)
                 {
                     GameObject newObj = (GameObject)Instantiate(reviewItem, content.transform);

Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using UnityEditor.Events;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
@@ -143,6 +144,9 @@ namespace Assets.Scenes.Ride.Scripts
                     cyclingController.selectParamModel.RankingsId.Add(seletedPlayerScript.GetRankingId());
                 }
             }
+            //查询选中人员的骑行记录
+            var rankingList = mapApi.GetRecordFileFromServer(cyclingController.selectParamModel.RankingsId);
+
             cyclingController.SetCyclingModel(CyclingModel.Review);
             if (!reviewPanel.activeSelf)
             {
@@ -150,7 +154,9 @@ namespace Assets.Scenes.Ride.Scripts
             }
             else
             {
-                reviewPanel.GetComponent<ReviewFactory>().Refresh();
+               var reviewFactory = reviewPanel.GetComponent<ReviewFactory>();
+               reviewFactory.Refresh();
+               reviewFactory.SetReview(rankingList);
             }
             reviewPanel.transform.Find("ReviewArea").gameObject.SetActive(true);
             reviewPanel.transform.Find("SingleArea").gameObject.SetActive(false);
@@ -205,8 +211,10 @@ namespace Assets.Scenes.Ride.Scripts
                 noRecord.SetActive(false);
             }
             var parent = transform.Find("Panel/PlayerList/Scroll View/Viewport/Content");
+            int index = 0;
             foreach (var item in list)
             {
+                index++;
                 GameObject newObj = (GameObject)Instantiate(prefab, parent);
                 var selectPlayerItemScript = newObj.GetComponent<SelectPlayerItemScript>();
                 selectPlayerItemScript.SetRankingId(item.Id.ToString());
@@ -215,23 +223,24 @@ namespace Assets.Scenes.Ride.Scripts
                 selectPlayerItemScript.SetWeightKg(item.WeightKg.ToString());
                 selectPlayerItemScript.SetHeadImage(item.WxHeadImg);
                 selectPlayerItemScripts.Add(selectPlayerItemScript);
-                UIManager.AddEvent(selectPlayerItemScript.GetButton().gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, OnSelectClick);
+                //UIManager.AddEventWithoutCursor(selectPlayerItemScript.GetButton().gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, OnSelectClick);
+                selectPlayerItemScript.GetButton().onClick.AddListener(delegate () { this.OnSelectClick(selectPlayerItemScript); });
             }
         }
-        private void OnSelectClick(BaseEventData baseEventData)
+        private void OnSelectClick(SelectPlayerItemScript selectPlayerItemScript)
         {
-            var selectPlayerItemScript = baseEventData.selectedObject.GetComponent<SelectPlayerItemScript>();
+            var seletedScriptList = FindObjectsOfType<SeletedPlayerScript>();
-            foreach (var item in gameObjects)
+            var exisitList = seletedScriptList.Where(c => c.GetRankingId().Equals(selectPlayerItemScript.GetRankingId()));
+            if(exisitList.Count() == 0)
             {
-                var seletedPlayerScript = item.GetComponent<SeletedPlayerScript>();
+                var seletedPlayerScript = seletedScriptList.Where(c=>!c.isUsed).OrderBy(c=>c.transform.GetSiblingIndex()).FirstOrDefault();
-                if (!seletedPlayerScript.isUsed && !selectPlayerItemScript.isSelected)
+                if (seletedPlayerScript != null)
                 {
                     seletedPlayerScript.SetHead(selectPlayerItemScript.GetImageTexture(), true);
                     seletedPlayerScript.SetName(selectPlayerItemScript.GetName());
                     seletedPlayerScript.SetRankingId(selectPlayerItemScript.GetRankingId());
                     UIManager.AddEvent(seletedPlayerScript.GetButton().gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, OnCloseClick);
                     selectPlayerItemScript.isSelected = true;
-                    break;
                 }
             }
         }
@@ -256,7 +265,8 @@ namespace Assets.Scenes.Ride.Scripts
                     Refresh();
                 }
             }
-            if (scrollrect.verticalNormalizedPosition >= 1)
+
+            if (scrollrect.verticalNormalizedPosition >= (pageIndex == 0 ? 1.2 : 1))
             {
                 if (pageIndex >0)
                 {

Assets/Scenes/Ride/Scripts/SelectPlayerItemScript.cs

@@ -1,12 +1,14 @@
 using Assets.Scripts;
+using DG.Tweening;
 using System.Collections;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.Networking;
 using UnityEngine.UI;
 
 namespace Assets.Scenes.Ride.Scripts
 {
-    public class SelectPlayerItemScript:MonoBehaviour
+    public class SelectPlayerItemScript:MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, IPointerUpHandler
     {
         private string Id ;
         private RawImage Head;
@@ -17,10 +19,6 @@ namespace Assets.Scenes.Ride.Scripts
         public bool isSelected;
         private void Awake()
         {
-            
-
-            
-           
             selectbutton = transform.GetComponent<Button>();
         }
         private void Start()
@@ -87,5 +85,29 @@ namespace Assets.Scenes.Ride.Scripts
             if (!App.TextureCache.ContainsKey(url))
                 App.TextureCache.Add(url, Head.texture);
         }
+        float? localY = null;
+        public void OnPointerExit(PointerEventData eventData)
+        {
+            //if (localY != null)
+            //{
+            //    transform.DOLocalMoveY(localY.Value, 0.3f);
+            //}
+            Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
+        }
+
+        public void OnPointerEnter(PointerEventData eventData)
+        {
+            //if (localY == null)
+            //{
+            //    localY = transform.localPosition.y;
+            //}
+            //transform.DOLocalMoveY(localY.Value + 5, 0.3f);
+            Cursor.SetCursor(Resources.Load<Texture2D>("Images/PointerButtonHover"), Vector2.zero, CursorMode.Auto);
+        }
+
+        public void OnPointerUp(PointerEventData eventData)
+        {
+            Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
+        }
     }
 }

Assets/Scenes/Ride/Scripts/SeletedPlayerScript.cs

@@ -13,7 +13,7 @@ namespace Assets.Scenes.Ride.Scripts
         private RawImage Head;
         private Button Close;
         private Text Name;
-        private string RankingId;
+        private string RankingId = string.Empty;
         public bool isUsed = false;
 
         private void Awake()

Assets/Scripts/Scenes/MainController.cs

@@ -47,19 +47,17 @@ public class MainController : MonoBehaviour
         //{
         //    UIManager.ShowHomePanel();
         //});
-        if (App.MainSceneParam.ContainsKey("Name"))
+        if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"]) )
         {
             UIManager.PushHome();
             if (App.MainSceneParam["Name"] == "MapListPanel")
             {
                 UIManager.ShowMapListPanel();
-                App.MainSceneParam["Name"] = string.Empty;
             }
 
             if (App.MainSceneParam["Name"] == "UserInfoPanel")
             {
                 UIManager.ShowUserInfoPanel();
-                App.MainSceneParam["Name"] = string.Empty;
             }
         }
         else

ProjectSettings/EditorBuildSettings.asset

@@ -6,7 +6,7 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/1-Login.unity
+    path: Assets/Scenes/Login.unity
     guid: 6dce3e17997730b4492f91dd8fede429
   - enabled: 1
     path: Assets/Scenes/MainScene.unity