Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release

This commit is contained in:
Caiyanpeng committed 2021-11-03 09:52:51 +08:00
commit e8a12452ca
3 files changed
+15 -11

No files matched your search

+5 -2
View File
@@ -218,6 +218,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
map.IsFavorite = !map.IsFavorite;
transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite =
UIManager.Instance.collectDict[map.IsFavorite];
this.model.IsFavorite = map.IsFavorite;
//SetColor(map.IsFavorite);
}
else
@@ -225,10 +226,11 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
UIManager.ShowAlert(r.errMsg);
}
}
NearRouteModel model { get; set; }
public void Show(Vector3 position, NearRouteModel model)
{
this.model = model;
//if(position.y > position.z)
//{
// position.y = position.z;
@@ -251,7 +253,8 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
AverageGrade = model.AverageGrade,
CountryCode = model.CountryCode,
AltitudeGraph = model.AltitudeGraph,
Distance = model.Distance
Distance = model.Distance,
IsFavorite = model.IsFavorite,
});
}