lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
CaiYanPeng 2021-11-03 09:52:51 +08:00
commit e8a12452ca
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scenes/Ride.unity
View File

@ -388,7 +388,7 @@ MonoBehaviour:
latitudeLongitude: 37.784179, -122.401583 latitudeLongitude: 37.784179, -122.401583
zoom: 15 zoom: 15
extentOptions: extentOptions:
extentType: 0 extentType: 2
defaultExtents: defaultExtents:
cameraBoundsOptions: cameraBoundsOptions:
camera: {fileID: 234181019} camera: {fileID: 234181019}

17
Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
View File

@ -492,7 +492,9 @@ public class CyclingController : DeviceServiceMonoBase
public void GameStart() public void GameStart()
{ {
var check = CheckAnt(); var check = CheckAnt();
#if UNITY_EDITOR
check = true;
#endif
if (check) if (check)
{ {
singleUIManager.StartRide(); singleUIManager.StartRide();
@ -669,10 +671,6 @@ public class CyclingController : DeviceServiceMonoBase
public bool Is3dView; public bool Is3dView;
public void ChangeMapImageStyle(GameObject arrowGameObj) public void ChangeMapImageStyle(GameObject arrowGameObj)
{ {
//var playerController = player.GetComponent<PlayerController>();
//var trailRenderer = player.GetComponent<TrailRenderer>();
//trailRenderer.time = 0;
var trailRendererList = transform.GetComponentsInChildren<TrailRenderer>(); var trailRendererList = transform.GetComponentsInChildren<TrailRenderer>();
foreach (var item in trailRendererList) foreach (var item in trailRendererList)
{ {
@ -719,13 +717,16 @@ public class CyclingController : DeviceServiceMonoBase
arrowGameObj.SetActive(true); arrowGameObj.SetActive(true);
Is3dView = false; Is3dView = false;
} }
if (competitionId > 0)
ChangeCurrentPlayer(currentPlayer.UserId); {
ChangeCurrentPlayer(currentPlayer.UserId);
}
} }
private bool lockView = false; private bool lockView = false;
private void Map_OnTileFinished(Mapbox.Unity.MeshGeneration.Data.UnityTile obj) private void Map_OnTileFinished(Mapbox.Unity.MeshGeneration.Data.UnityTile obj)
{ {
if (!lockView) { if (!lockView)
{
var playerController = player.GetComponent<PlayerController>(); var playerController = player.GetComponent<PlayerController>();
player.transform.localScale = new Vector3(3f, 3f, 3f); player.transform.localScale = new Vector3(3f, 3f, 3f);

7
Assets/Scripts/UI/Prefab/MapList/MapItem.cs
View File

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