新版骑行页面前备份
This commit is contained in:
1 parent
4896fab824
commit
e7ad9473a5
85 files changed
+6816
-5424
No files matched your search
@@ -35,7 +35,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
protected Vector2d nextlatlong; //下一个点的坐标
|
||||
protected Vector2d currentlatlong; //当前坐标
|
||||
//protected bool isStart;//开始或者暂停
|
||||
public bool isQuit;//true 中途退出 或者到达终点
|
||||
//public bool isQuit;//true 中途退出 或者到达终点
|
||||
protected bool isMajor;//是否是主人公
|
||||
protected MapDataModel mapData;
|
||||
protected int userId;
|
||||
@@ -92,7 +92,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
protected BaseCycling cyclingExcutor;
|
||||
protected virtual void Init()
|
||||
{
|
||||
//characterAnimator = GetComponentInChildren<Animator>();
|
||||
characterAnimator = GetComponentInChildren<Animator>();
|
||||
mainController = transform.parent.GetComponent<CyclingController>();
|
||||
map = transform.parent.Find("Map").GetComponent<AbstractMap>();
|
||||
mapData = mainController.GetMapData();//获取路书信息
|
||||
@@ -113,7 +113,16 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
protected virtual void Run()
|
||||
{
|
||||
ComputeNextSlope();//计算下一个坡度相关数据
|
||||
|
||||
//人物动画控制
|
||||
if (characterAnimator != null && mapData != null)
|
||||
{
|
||||
characterAnimator.SetFloat("Speed", (float)speed);
|
||||
if (totalDistance >= mapData.TotalDistance)
|
||||
{
|
||||
characterAnimator.SetBool("ReachEnd", true);//到达终点
|
||||
}
|
||||
}
|
||||
//开始骑行
|
||||
if (mainController.isStart)
|
||||
{
|
||||
if (index > 0)
|
||||
@@ -131,14 +140,12 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
}
|
||||
ticks++;
|
||||
Compute();//接受蓝牙设备数据计算
|
||||
//characterAnimator.SetBool("IsRide", false);//初始化动画状态
|
||||
|
||||
if (totalDistance > mapData.TotalDistance)
|
||||
{
|
||||
distance = totalDistance - mapData.TotalDistance;
|
||||
totalDistance = mapData.TotalDistance;
|
||||
//characterAnimator.SetBool("ReachEnd", true);//到达终点
|
||||
StartCoroutine("LateUpload");
|
||||
isQuit = true;
|
||||
}
|
||||
|
||||
//数据处理
|
||||
@@ -147,10 +154,9 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
nextPos.y += 0.6f;//提高y轴让人物站在地图上面
|
||||
prePos = transform.localPosition;//当前点
|
||||
thisRotation = transform.localRotation;
|
||||
//动画控制
|
||||
//移动动画控制
|
||||
if (distance > 0)
|
||||
{
|
||||
//characterAnimator.SetBool("IsRide", true);//开始移动动画
|
||||
StartCoroutine(MoveTo());//移动
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ using GeoJSON.Net.Geometry;
|
||||
using TurfCS;
|
||||
using Mapbox.Utils;
|
||||
using Assets.Scripts;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
public class CyclingController : DeviceServiceMonoBase
|
||||
{
|
||||
@@ -42,11 +43,20 @@ public class CyclingController : DeviceServiceMonoBase
|
||||
public bool isPause;
|
||||
#endregion
|
||||
GameObject loadingcanvas;
|
||||
|
||||
private async Task Login()
|
||||
{
|
||||
var result = await new UserApi().Login("13115011550", "laozhong", "");
|
||||
App.CurrentUser = result.data;
|
||||
}
|
||||
void Awake()
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
Login();
|
||||
#endif
|
||||
//获取路书信息
|
||||
mapApi = ConfigHelper.mapApi;
|
||||
RouteId = App.RouteIdParam > 0? App.RouteIdParam : 376;
|
||||
RouteId = App.RouteIdParam > 0? App.RouteIdParam : 5492;
|
||||
MapDataModel result = mapApi.GetData(RouteId);
|
||||
mapRoute = GetNewInstace(RouteId);//获取一个路书所有的数据
|
||||
MapUDPService.Init();//初始化TCP
|
||||
@@ -101,6 +111,7 @@ public class CyclingController : DeviceServiceMonoBase
|
||||
UIObject.SetActive(true);
|
||||
}
|
||||
|
||||
//设置骑行模式
|
||||
public void SetCyclingModel(CyclingModel mode)
|
||||
{
|
||||
this.cyclingModel = mode;
|
||||
@@ -116,6 +127,33 @@ public class CyclingController : DeviceServiceMonoBase
|
||||
}
|
||||
}
|
||||
|
||||
#region
|
||||
public bool Is3dView;
|
||||
public void ChangeMapImageStyle(GameObject arrowGameObj)
|
||||
{
|
||||
if (!Is3dView)
|
||||
{
|
||||
map.Terrain.ExaggerationFactor = 1.5f;
|
||||
map.Terrain.SetElevationType(ElevationLayerType.TerrainWithElevation);
|
||||
map.ImageLayer.SetLayerSource(ImagerySourceType.Custom);
|
||||
//map.SetTileMaterial(new Material());
|
||||
player.transform.localScale = new Vector3(3f, 3f, 3f);
|
||||
Is3dView = true;
|
||||
arrowGameObj.SetActive(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
map.Terrain.ExaggerationFactor = 0f;
|
||||
map.Terrain.SetElevationType(ElevationLayerType.FlatTerrain);
|
||||
map.ImageLayer.SetLayerSource(ImagerySourceType.MapboxDark);
|
||||
player.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
|
||||
Is3dView = false;
|
||||
arrowGameObj.SetActive(true);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 游戏状态控制
|
||||
//开始骑行
|
||||
public void SetStart()
|
||||
|
||||
@@ -12,7 +12,21 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
{
|
||||
public class InitMiniMapProvider : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
[SerializeField]
|
||||
GameObject cude1;
|
||||
[SerializeField]
|
||||
GameObject cude2;
|
||||
[SerializeField]
|
||||
GameObject cude3;
|
||||
[SerializeField]
|
||||
GameObject cude4;
|
||||
[SerializeField]
|
||||
GameObject center;
|
||||
|
||||
|
||||
|
||||
|
||||
[SerializeField]
|
||||
AbstractMap _map;
|
||||
[SerializeField]
|
||||
Camera _minicamera;
|
||||
@@ -27,18 +41,18 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
playerController = FindObjectOfType<PlayerController>();
|
||||
if (cyclingCotroller != null)
|
||||
{
|
||||
var mapdata = cyclingCotroller.GetMapData();
|
||||
//初始化map
|
||||
//var point = cyclingCotroller.GetCenterCoordinate();
|
||||
if (_map != null && mapdata !=null)
|
||||
var mapdata = cyclingCotroller.GetMapData();
|
||||
//初始化map
|
||||
//var point = cyclingCotroller.GetCenterCoordinate();
|
||||
if (_map != null && mapdata !=null)
|
||||
{
|
||||
_map.OnInitialized += _map_OnInitialized;
|
||||
_map.OnUpdated += _map_OnUpdated;
|
||||
_map.Initialize(new Vector2d(mapdata.Center[0], mapdata.Center[1]), 12);
|
||||
var bbox = mapdata.Bbox;
|
||||
var targetbounds = new Vector2dBounds(new Vector2d(bbox[0], bbox[1]), new Vector2d(bbox[2], bbox[3]));
|
||||
var targetbounds = new Vector2dBounds(new Vector2d(bbox[1], bbox[0]), new Vector2d(bbox[3], bbox[2]));
|
||||
var screenBounds = GetScreenBounds();
|
||||
SetZoomToFitBounds(targetbounds, screenBounds);
|
||||
var z = SetZoomToFitBounds(targetbounds, screenBounds);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -53,7 +67,15 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
private void _map_OnInitialized()
|
||||
{
|
||||
init = true;
|
||||
|
||||
var visualizer = _map.MapVisualizer;
|
||||
visualizer.OnMapVisualizerStateChanged += (s) =>
|
||||
{
|
||||
if (s == ModuleState.Finished)
|
||||
{
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#region Camera 自适应
|
||||
@@ -62,7 +84,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
/// </summary>
|
||||
/// <param name="targetBounds">路线的边界</param>
|
||||
/// <param name="screenBounds">小地图边界</param>
|
||||
private void SetZoomToFitBounds(Vector2dBounds targetBounds, Vector2dBounds screenBounds)
|
||||
private int SetZoomToFitBounds(Vector2dBounds targetBounds, Vector2dBounds screenBounds)
|
||||
{
|
||||
var targetLonDelta = targetBounds.East - targetBounds.West;
|
||||
var targetLatDelta = targetBounds.North - targetBounds.South;
|
||||
@@ -78,18 +100,18 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
|
||||
var zoom = (float)(_map.Zoom + Math.Min(latZoom, lonZoom));
|
||||
|
||||
_map.SetZoom((float)Math.Floor(zoom));
|
||||
_map.UpdateMap();
|
||||
_map.SetZoom((float)Math.Floor(zoom));
|
||||
_map.UpdateMap();
|
||||
return (int)Math.Floor(zoom);
|
||||
}
|
||||
private Vector2dBounds GetScreenBounds()
|
||||
{
|
||||
var screenWidth = UnityEngine.Screen.width;
|
||||
var screenHeight = UnityEngine.Screen.height;
|
||||
|
||||
var sw_world = _minicamera.ViewportToWorldPoint(new Vector3(0, 0, 180));
|
||||
var sw_world = _minicamera.ViewportToWorldPoint(new Vector3(0, 0, 90));
|
||||
var sw = _map.WorldToGeoPosition(sw_world);
|
||||
|
||||
var ne_world = _minicamera.ViewportToWorldPoint(new Vector3(1f, 1f, 180));
|
||||
var ne_world = _minicamera.ViewportToWorldPoint(new Vector3(1f, 1f, 90));
|
||||
var ne = _map.WorldToGeoPosition(ne_world);
|
||||
|
||||
return new Vector2dBounds(new Vector2d(sw.x, sw.y), new Vector2d(ne.x, ne.y));
|
||||
@@ -135,16 +157,17 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
_mipMapRoute = new GameObject("MiniMapRoute");
|
||||
_mipMapRoute.transform.parent = transform;
|
||||
var lineRender = _mipMapRoute.AddComponent<LineRenderer>();
|
||||
lineRender.material = new Material(Shader.Find("Sprites/Default"));
|
||||
|
||||
lineRender.material = Instantiate(Resources.Load<Material>("UI/Material/Round10"));
|
||||
var dat = feat.Points[0];
|
||||
lineRender.endColor = Color.white;
|
||||
lineRender.startColor = Color.white;
|
||||
//设置宽度
|
||||
lineRender.startWidth = 1f;
|
||||
lineRender.endWidth = 1f;
|
||||
lineRender.startWidth = 5f;
|
||||
lineRender.endWidth = 5f;
|
||||
lineRender.positionCount = dat.Count;
|
||||
lineRender.SetPositions(feat.Points[0].ToArray());
|
||||
lineRender.numCornerVertices = 0;
|
||||
lineRender.numCornerVertices = 60;
|
||||
lineRender.loop = false;
|
||||
_mipMapRoute.layer = 9;
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
GameObject loadingPanel;
|
||||
private void Start()
|
||||
{
|
||||
int routeId = App.RouteIdParam;
|
||||
int routeId = App.RouteIdParam >0? App.RouteIdParam : 5492;
|
||||
mapApi = new MapApi();
|
||||
|
||||
panel = transform.Find("Panel").gameObject;
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
private void Start()
|
||||
{
|
||||
Title = transform.Find("Title").GetComponent<Text>();
|
||||
OnlineUserNum = transform.Find("OnlineUserNum").GetComponent<Text>();
|
||||
OnlineUserNum = transform.Find("NearByView/OnlineUserNum").GetComponent<Text>();
|
||||
}
|
||||
float t = 1;
|
||||
private void Update()
|
||||
|
||||
@@ -14,8 +14,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
totalDistance = mainController.selectParamModel.EndDistance;
|
||||
currentlatlong = mainController.GetCenterCoordinate();
|
||||
TrailRenderer trail = FindObjectOfType<TrailRenderer>();
|
||||
trail.startWidth = 0.6f;
|
||||
trail.endWidth = 0.6f;
|
||||
trail.startWidth = 1f;
|
||||
trail.endWidth = 1f;
|
||||
trail.startColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 0.65f);
|
||||
trail.endColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 0.65f);
|
||||
}
|
||||
@@ -34,7 +34,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
bicycleWeight = App.CurrentUser.BicycleWeight;
|
||||
|
||||
#if UNITY_EDITOR
|
||||
power = 2000;//测试功率
|
||||
power = Random.Range(1,2000);//测试功率
|
||||
#endif
|
||||
mainController.TrackResistance(currentSlope);//TODO
|
||||
speed = Helper.CalculateSpeed(elevation, currentSlope, power, weight, bicycleWeight);
|
||||
|
||||
@@ -118,11 +118,11 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
//前后取50个点
|
||||
decimal diff = i - playerController.CurrentIndex;
|
||||
decimal diffAbs = Math.Abs(diff);
|
||||
if (diffAbs <= 50)
|
||||
if (diffAbs <= 200)
|
||||
{
|
||||
dat.Add(item);
|
||||
}
|
||||
if (diff < 0 && diff > -100)
|
||||
if (diff < 0 && diff > -200)
|
||||
{
|
||||
item.y += 0.30001f;
|
||||
path.Add(item);
|
||||
@@ -131,7 +131,11 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
var feat = new VectorFeatureUnity();
|
||||
feat.Points.Add(dat);
|
||||
//处理海拔高度的问题
|
||||
//SnapModifier.Run(feat, meshData, tile);
|
||||
//bool foundTile = _map.MapVisualizer.ActiveTiles.TryGetValue(Conversions.LatitudeLongitudeToTileId(_map.CenterLatitudeLongitude.x, _map.CenterLatitudeLongitude.y, (int)_map.Zoom), out tile);
|
||||
//if (foundTile)
|
||||
//{
|
||||
// SnapModifier.Run(feat, meshData, tile);
|
||||
//}
|
||||
CreatMapRoute(feat);//创建路线
|
||||
CreatPathRoute(path);//创建骑行过的线路
|
||||
}
|
||||
@@ -194,8 +198,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
lineRender.startColor = new Color(1, 1, 1, 0.65f);
|
||||
|
||||
//设置宽度
|
||||
lineRender.startWidth = 0.6f;
|
||||
lineRender.endWidth = 0.6f;
|
||||
lineRender.startWidth = 1f;
|
||||
lineRender.endWidth = 1f;
|
||||
lineRender.positionCount = dat.Count;
|
||||
lineRender.SetPositions(feat.Points[0].ToArray());
|
||||
lineRender.loop = false;
|
||||
@@ -220,8 +224,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
lineRender.startColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 0.65f);
|
||||
|
||||
//设置宽度
|
||||
lineRender.startWidth = 0.61f;
|
||||
lineRender.endWidth = 0.61f;
|
||||
lineRender.startWidth = 1f;
|
||||
lineRender.endWidth = 1f;
|
||||
lineRender.positionCount = feat.Count;
|
||||
lineRender.SetPositions(feat.ToArray());
|
||||
lineRender.loop = false;
|
||||
|
||||
@@ -17,6 +17,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
{
|
||||
GameObject prefab;
|
||||
GameObject scroll;
|
||||
GameObject selectPanel;
|
||||
GameObject nearPanel;
|
||||
Transform content;
|
||||
Button rideButton;
|
||||
Button cancelButton;
|
||||
@@ -46,12 +48,21 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
searchButton = transform.Find("Panel/SearchButton").GetComponent<Button>();
|
||||
inputField = transform.Find("Panel/InputField").GetComponent<InputField>();
|
||||
reviewPanel = transform.parent.Find("ReviewPanel").gameObject;
|
||||
selectPanel = transform.parent.Find("SelectPanel").gameObject;
|
||||
nearPanel = transform.parent.Find("NearPanel").gameObject;
|
||||
|
||||
inputField.onValueChanged.AddListener(InputTextChanged);
|
||||
rideButton.onClick.AddListener(PreStart);
|
||||
cancelButton.onClick.AddListener(Cancel);
|
||||
closeButton.onClick.AddListener(Cancel);
|
||||
searchButton.onClick.AddListener(Search);
|
||||
//rideButton.onClick.AddListener(PreStart);
|
||||
//cancelButton.onClick.AddListener(Cancel);
|
||||
//closeButton.onClick.AddListener(Cancel);
|
||||
//searchButton.onClick.AddListener(Search);
|
||||
|
||||
UIManager.AddEvent(rideButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, PreStart);
|
||||
UIManager.AddEvent(cancelButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, Cancel);
|
||||
UIManager.AddEvent(closeButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, Cancel);
|
||||
UIManager.AddEvent(searchButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, Search);
|
||||
|
||||
|
||||
UIManager.AddEvent(scroll, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
|
||||
|
||||
gameObjects.Add(transform.Find("Panel/Player1").gameObject);
|
||||
@@ -65,13 +76,13 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
{
|
||||
seachName = input;
|
||||
}
|
||||
private void Search()
|
||||
private void Search(BaseEventData baseEventData)
|
||||
{
|
||||
Utils.DestroyChildren(content);
|
||||
Refresh();
|
||||
}
|
||||
//开始伴侣骑行的面板
|
||||
private void PreStart()
|
||||
private void PreStart(BaseEventData baseEventData)
|
||||
{
|
||||
transform.gameObject.SetActive(false);
|
||||
foreach (var item in gameObjects)
|
||||
@@ -93,14 +104,16 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
}
|
||||
reviewPanel.transform.Find("ReviewArea").gameObject.SetActive(true);
|
||||
reviewPanel.transform.Find("SingleArea").gameObject.SetActive(false);
|
||||
|
||||
nearPanel.SetActive(true);
|
||||
}
|
||||
//取消和关闭都进入单人骑行界面
|
||||
private void Cancel()
|
||||
private void Cancel(BaseEventData baseEventData)
|
||||
{
|
||||
cyclingController.cyclingModel = CyclingModel.Single;
|
||||
//cyclingController.cyclingModel = CyclingModel.Single;
|
||||
transform.gameObject.SetActive(false);
|
||||
reviewPanel.SetActive(true);
|
||||
reviewPanel.SetActive(false);
|
||||
selectPanel.SetActive(true);
|
||||
nearPanel.SetActive(false);
|
||||
}
|
||||
private void Start()
|
||||
{
|
||||
|
||||
@@ -21,8 +21,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
{
|
||||
#region UI control
|
||||
GameObject target;
|
||||
GameObject rightPanel;//右边列表
|
||||
GameObject leftPanel;//左边列表
|
||||
GameObject nearByPanel;//附近的人列表
|
||||
GameObject leftPanel;//伴侣骑行列表
|
||||
GameObject nextSlopePanel;//下一个坡度面板
|
||||
GameObject currentSlopePanel;//当前坡度面板
|
||||
GameObject selectPanel;//骑行模式选择
|
||||
@@ -53,6 +53,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
Button pauseButton;//暂停按钮
|
||||
Button settingButton;//设置那妞
|
||||
Button deviceButton;//设备按钮
|
||||
Button viewButton;//视角按钮
|
||||
Button exitButton;//退出按钮
|
||||
Button singleButton;//单人骑行按钮
|
||||
Button shadowButton;//影子选手按钮
|
||||
@@ -63,6 +64,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
|
||||
LineChart elevationChart;//海拔图
|
||||
RawImage img;//海拔图头像
|
||||
RawImage miniMap;//小地图
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -84,10 +86,10 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
arrow = transform.Find("Panel/Arrow").GetComponent<Image>();
|
||||
map = transform.parent.Find("Map").GetComponent<AbstractMap>();
|
||||
leftPanel = transform.Find("Panel/ReviewPanel").gameObject;
|
||||
rightPanel = transform.Find("Panel/NearPanel").gameObject;
|
||||
nearByPanel = transform.Find("Panel/NearPanel").gameObject;
|
||||
startBtn = transform.Find("Panel/StartButton").GetComponent<Button>();
|
||||
simpleBtn = transform.Find("Panel/SimpleButton").GetComponent<Button>();
|
||||
ditance = transform.Find("Panel/CyclingComputerPanel/Distance").GetComponent<Text>();
|
||||
ditance = transform.Find("Panel/ComputerPanel/DistanceView/Distance").GetComponent<Text>();
|
||||
titlePanel = transform.Find("Panel/TitlePanel").gameObject;
|
||||
totalDistance = transform.Find("Panel/TitlePanel/TotalDistance").GetComponent<Text>();
|
||||
candance = transform.Find("Panel/PowerPanel/Cadance").GetComponent<Text>();
|
||||
@@ -99,14 +101,16 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
currentSlopeText = transform.Find("Panel/CurrentSlopePanel/CurrentSlopeText").GetComponent<Text>();
|
||||
currentSlopeDistanceText = transform.Find("Panel/CurrentSlopePanel/CurrentSlopeDistance").GetComponent<Text>();
|
||||
currentSlopeToatalDistanceText = transform.Find("Panel/CurrentSlopePanel/TotalSlopeDistance").GetComponent<Text>();
|
||||
speedTxt = transform.Find("Panel/CyclingComputerPanel/Speed").GetComponent<Text>();
|
||||
speedTxt = transform.Find("Panel/ComputerPanel/SpeedView/Speed").GetComponent<Text>();
|
||||
powerTxt = transform.Find("Panel/PowerPanel/Power").GetComponent<Text>();
|
||||
timerTxt = transform.Find("Panel/CyclingComputerPanel/Timer").GetComponent<Text>();
|
||||
timerTxt = transform.Find("Panel/ComputerPanel/Timer").GetComponent<Text>();
|
||||
countDownTxt = transform.Find("Panel/CountDown").GetComponent<Text>();
|
||||
mapName = transform.Find("Panel/TitlePanel/MapName").GetComponent<Text>();
|
||||
totalClimb = transform.Find("Panel/CyclingComputerPanel/TotalClimb").GetComponent<Text>();
|
||||
totalClimb = transform.Find("Panel/ComputerPanel/TotalClimbView/TotalClimb").GetComponent<Text>();
|
||||
elevationChart = transform.Find("Panel/ElevationChart").GetComponent<LineChart>();
|
||||
img = transform.Find("Panel/ElevationChart/HeadImage").GetComponent<RawImage>();
|
||||
miniMap = transform.Find("Panel/MiniMap").GetComponent<RawImage>();
|
||||
|
||||
selectPanel = transform.Find("Panel/SelectPanel").gameObject;
|
||||
selectPlayer = transform.Find("Panel/SelectPlayer").gameObject;
|
||||
reviewPanel = transform.Find("Panel/ReviewPanel").gameObject;
|
||||
@@ -122,6 +126,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
saveButton = transform.Find("Panel/QuitPanel/SaveButton").GetComponent<Button>();
|
||||
cancelQuitButton = transform.Find("Panel/QuitPanel/CancelButton").GetComponent<Button>();
|
||||
closeQuitButton = transform.Find("Panel/QuitPanel/CloseButton").GetComponent<Button>();
|
||||
viewButton =transform.Find("Panel/ViewButton").GetComponent<Button>();
|
||||
|
||||
target = transform.parent.Find("Target").gameObject;
|
||||
|
||||
@@ -137,7 +142,9 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
UIManager.AddEvent(saveButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, SaveRide);
|
||||
UIManager.AddEvent(cancelQuitButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, CancelQuit);
|
||||
UIManager.AddEvent(closeQuitButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, CloseQuit);
|
||||
UIManager.AddEvent(viewButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, ChangeView);
|
||||
|
||||
|
||||
//startBtn.onClick.AddListener(StartRide);
|
||||
//simpleBtn.onClick.AddListener(ClearPanel);
|
||||
//pauseButton.onClick.AddListener(PauseRide);
|
||||
@@ -177,6 +184,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
mainController.SetCyclingModel(CyclingModel.Single);
|
||||
selectPanel.SetActive(false);
|
||||
}
|
||||
//显示附近的人面板
|
||||
nearByPanel.SetActive(true);
|
||||
}
|
||||
}
|
||||
// Update is called once per frame
|
||||
@@ -227,10 +236,15 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
}
|
||||
if (target != null)
|
||||
{
|
||||
|
||||
target.transform.position = playerController.transform.position; //new Vector3((float)Math.Round(player.transform.position.x,1), 0, (float)Math.Round(player.transform.position.z,1));
|
||||
//target.transform.rotation = playerController.transform.rotation;//new Quaternion(playerController.transform.rotation.x, playerController.transform.rotation.y +1f, playerController.transform.rotation.z, playerController.transform.rotation.w);
|
||||
target.transform.eulerAngles = new Vector3(0, playerController.transform.eulerAngles.y + 180f, 0);
|
||||
if (!mainController.Is3dView)
|
||||
{ //target.transform.rotation = playerController.transform.rotation;//new Quaternion(playerController.transform.rotation.x, playerController.transform.rotation.y +1f, playerController.transform.rotation.z, playerController.transform.rotation.w);
|
||||
target.transform.eulerAngles = new Vector3(0, playerController.transform.eulerAngles.y + 155f, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
target.transform.eulerAngles = new Vector3(0, -65f, 0);
|
||||
}
|
||||
//控制照片移动
|
||||
((RectTransform)arrow.transform).position = Camera.main.WorldToScreenPoint(target.transform.position);
|
||||
}
|
||||
@@ -242,6 +256,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
mainController.SetCyclingModel(CyclingModel.Single);
|
||||
//显示单人骑行列表
|
||||
reviewPanel.SetActive(true);
|
||||
//显示附近的人列表
|
||||
nearByPanel.SetActive(true);
|
||||
}
|
||||
private void ShadowRide(BaseEventData baseEventData)
|
||||
{
|
||||
@@ -249,6 +265,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
selectPanel.SetActive(false);
|
||||
//显示影子选手骑行列表
|
||||
selectPlayer.SetActive(true);
|
||||
//显示附近的人列表
|
||||
nearByPanel.SetActive(true);
|
||||
}
|
||||
private void ShowSelectPlayer(BaseEventData baseEventData)
|
||||
{
|
||||
@@ -293,6 +311,12 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
{
|
||||
quitPanel.SetActive(false);
|
||||
}
|
||||
|
||||
//切换到3d视角
|
||||
private void ChangeView(BaseEventData baseEventData)
|
||||
{
|
||||
mainController.ChangeMapImageStyle(arrow.gameObject);
|
||||
}
|
||||
//结束游戏
|
||||
private void StopRide(BaseEventData baseEventData)
|
||||
{
|
||||
@@ -324,10 +348,13 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
clearLock = false;
|
||||
leftPanel.transform.DOLocalMove(new Vector3(leftPanel.transform.localPosition.x + isSimple * -430f, leftPanel.transform.localPosition.y, leftPanel.transform.localPosition.z), 1);
|
||||
titlePanel.transform.DOLocalMove(new Vector3(titlePanel.transform.localPosition.x, titlePanel.transform.localPosition.y + isSimple * 180f, titlePanel.transform.localPosition.z), 1);
|
||||
rightPanel.transform.DOLocalMove(new Vector3(rightPanel.transform.localPosition.x + isSimple * 330f, rightPanel.transform.localPosition.y, rightPanel.transform.localPosition.z), 1).onComplete += () =>
|
||||
miniMap.transform.DOLocalMove(new Vector3(miniMap.transform.localPosition.x , miniMap.transform.localPosition.y + isSimple * 260f, miniMap.transform.localPosition.z), 1);
|
||||
nearByPanel.transform.DOLocalMove(new Vector3(nearByPanel.transform.localPosition.x + isSimple * 330f, nearByPanel.transform.localPosition.y, nearByPanel.transform.localPosition.z), 1).onComplete += () =>
|
||||
{
|
||||
clearLock = true;
|
||||
isSimple *= -1;
|
||||
simpleBtn.targetGraphic = simpleBtn.image;
|
||||
simpleBtn.image.sprite = isSimple == -1? Resources.Load<Sprite>("Images/Ride/full") : Resources.Load<Sprite>("Images/Ride/simple");
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace Assets.Scenes.Ride.Scripts
|
||||
{
|
||||
public class VersionScript : MonoBehaviour
|
||||
{
|
||||
void Start()
|
||||
{
|
||||
var appVersion = transform.GetComponent<Text>();
|
||||
if (appVersion != null)
|
||||
{
|
||||
appVersion.text = App.AppVersion;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 018a34a6daa7a33468a5a66fb6680451
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in new issue
Block a user