pc暂存

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

@@ -128,12 +128,12 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         Utils.DisplayImageTempDict(transform.Find("MapHBImg").GetComponent<RawImage>(), myMap.AltitudeGraph, this.caches);
 
         SetActive4Button(false);
-#if UNITY_ANDROID || UNITY_IOS
+
         var isRecent = App.CurrentRouteType == "Recent Routes" && myMap.RecentRecord != null && myMap.RecentRecord.ContinueCyclingParam != null && !isModal;
         transform.Find("BtnContinue").gameObject.SetActive(isRecent);
         transform.Find("BtnReride").gameObject.SetActive(isRecent);
         transform.Find("MapHBImg").gameObject.SetActive(!isRecent);
-        if (isRecent) 
+        if (isRecent)
         {
             transform.Find("BtnContinue").GetComponent<Button>().onClick.RemoveAllListeners();
             transform.Find("BtnReride").GetComponent<Button>().onClick.RemoveAllListeners();
@@ -148,7 +148,6 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
             });
             transform.Find("BtnReride").GetComponent<Button>().onClick.AddListener(Ride);
         }
-#endif
     }
 
     private void Ride()
@@ -185,6 +184,10 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
 
     public void OnPointerExit(PointerEventData eventData)
     {
+        if (isModal)
+        {
+            return;
+        }
 #if !(UNITY_ANDROID || UNITY_IOS)
         if (localY != null)
         {
@@ -196,14 +199,15 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         //SetActive4Button(false);
         SetColor(false);
 #else
-        if (!isModal)
-        {
-            transform.Find("Shadow").GetComponent<Image>().DOFade(0, 0.3f);
-        }
+        transform.Find("Shadow").GetComponent<Image>().DOFade(0, 0.3f);
 #endif
     }
     public void OnPointerEnter(PointerEventData eventData)
     {
+        if (isModal)
+        {
+            return;
+        }
 #if !(UNITY_ANDROID || UNITY_IOS)
         if (localY == null)
         {
@@ -216,10 +220,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         //SetActive4Button(true);
         SetColor(true);
 #else
-        if (!isModal) 
-        {
-            transform.Find("Shadow").GetComponent<Image>().DOFade(1, 0.3f);
-        }
+        transform.Find("Shadow").GetComponent<Image>().DOFade(1, 0.3f);
 #endif
     }
     void SetActive4Button(bool b)

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

@@ -318,11 +318,11 @@ public class MapListController : PFUIPanel
         mc.gameObject.SetActive(true);
         mc.GetComponent<CanvasGroup>().alpha = 0;
         mc.GetComponent<CanvasGroup>().DOFade(1, 0.3f);
-#endif
         if (isFocusSearch) 
         {
             topRect.Find("SearchInput").GetComponent<InputField>().OnPointerClick(new PointerEventData(EventSystem.current));
         }
+#endif
     }
     void onEndEdit() 
     {