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

按钮&设置&退出界面调整

Browse Source
This commit is contained in:
lishuo 2021-04-29 22:16:32 +08:00
parent 8eb201d0ee
commit 82997480fe
8 changed files with 4145 additions and 3153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -81,3 +81,4 @@ Assets/Chart And Graph
Assets/NuGet Assets/NuGet
Assets/NuGet.meta Assets/NuGet.meta
Assets/earth.meta Assets/earth.meta
Assets/MapWorkoutRecords.meta

14
Assets/Resources/UI/Prefab/Ride/Alert.prefab
View File

@ -312,7 +312,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "Please connect device\uFF01" m_Text: "Please connect the device\uFF01"
--- !u!1 &2030232658984377931 --- !u!1 &2030232658984377931
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -573,7 +573,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: OK m_Text:
--- !u!1 &2030232659739562301 --- !u!1 &2030232659739562301
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -611,7 +611,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -44, y: -44} m_AnchoredPosition: {x: -44, y: -44}
m_SizeDelta: {x: 28, y: 28} m_SizeDelta: {x: 38, y: 38}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2030232659739562297 --- !u!222 &2030232659739562297
CanvasRenderer: CanvasRenderer:
@ -640,7 +640,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 53264eaf25f88774badeae189c5a3f77, type: 3} m_Sprite: {fileID: 21300000, guid: 5cbb2a1813e35d143a8939fc60814d38, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -670,9 +670,9 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 1
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_PressedColor: {r: 0.078431375, g: 0.078431375, b: 0.09019608, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1 m_ColorMultiplier: 1

7261
Assets/Scenes/Ride/Ride.unity
View File

File diff suppressed because it is too large Load Diff

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

@ -58,7 +58,10 @@ public class CyclingController : DeviceServiceMonoBase
void Awake() void Awake()
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
if (App.CurrentUser == null)
{
Login(); Login();
}
#endif #endif
//获取路书信息 //获取路书信息
mapApi = ConfigHelper.mapApi; mapApi = ConfigHelper.mapApi;

2
Assets/Scenes/Ride/Scripts/Helper.cs
View File

@ -376,7 +376,7 @@ namespace Assets.Scenes.Ride.Scripts
var polyline = Encode(result); var polyline = Encode(result);
var encodeline = UnityWebRequest.EscapeURL(polyline); //HttpUtility.UrlEncode(polyline); var encodeline = UnityWebRequest.EscapeURL(polyline); //HttpUtility.UrlEncode(polyline);
//获取封面图片 //获取封面图片
var url = $"https://api.mapbox.com/styles/v1/juzetest/ckmkdjwsa1nvt17nr1ps4fqgs/static/path-4+fff-1({encodeline})/auto/1280x1280?access_token={App.MapBoxAccessToken}&padding=300&pitch=30"; var url = $"https://api.mapbox.com/styles/v1/juzetest/ckmkdjwsa1nvt17nr1ps4fqgs/static/path-4+fff-1({encodeline})/auto/1280x768?access_token={App.MapBoxAccessToken}&padding=200&pitch=30";
return url; return url;
} }
} }

2
Assets/Scenes/Ride/Scripts/LoadingController.cs
View File

@ -202,7 +202,7 @@ namespace Assets.Scenes.Ride.Scripts
#region 绑定路书基本信息 #region 绑定路书基本信息
mapName.text = route.Name; mapName.text = route.Name;
level.text = route.Hard; level.text = route.Hard;
elevaction.text = Math.Round(route.EleDifference, 0).ToString() + "M"; elevaction.text = Math.Round(route.TotalClimb.GetValueOrDefault(0), 2).ToString() + "M";
slope.text = Math.Round(route.AverageGrade, 2).ToString() + "%"; slope.text = Math.Round(route.AverageGrade, 2).ToString() + "%";
rideNum.text = route.TheHeat.ToString(); rideNum.text = route.TheHeat.ToString();
distance.text = route.Distance.ToString("f1") + "KM"; distance.text = route.Distance.ToString("f1") + "KM";

4
Assets/Scenes/Ride/Scripts/RideSettingScript.cs
View File

@ -33,12 +33,12 @@ namespace Assets.Scenes.Ride.Scripts
private void Cancel(BaseEventData baseEventData) private void Cancel(BaseEventData baseEventData)
{ {
transform.gameObject.SetActive(false); transform.parent.gameObject.SetActive(false);
} }
private void Save(BaseEventData baseEventData) private void Save(BaseEventData baseEventData)
{ {
App.rideSetting.sensitivity = Math.Round(slider.value,0) /100; App.rideSetting.sensitivity = Math.Round(slider.value,0) /100;
transform.gameObject.SetActive(false); transform.parent.gameObject.SetActive(false);
} }
} }
} }

11
Assets/Scenes/Ride/Scripts/SingleUIManager.cs
View File

@ -140,10 +140,10 @@ namespace Assets.Scenes.Ride.Scripts
singleArea = transform.Find("Panel/ReviewPanel/SingleArea").gameObject; singleArea = transform.Find("Panel/ReviewPanel/SingleArea").gameObject;
addButton = transform.Find("Panel/ReviewPanel/SingleArea/AddButton").GetComponent<Button>(); addButton = transform.Find("Panel/ReviewPanel/SingleArea/AddButton").GetComponent<Button>();
saveButton = transform.Find("Panel/QuitPanel/SaveButton").GetComponent<Button>(); saveButton = transform.Find("Panel/QuitPanel/QuitPanel/SaveButton").GetComponent<Button>();
cancelQuitButton = transform.Find("Panel/QuitPanel/CancelButton").GetComponent<Button>(); cancelQuitButton = transform.Find("Panel/QuitPanel/QuitPanel/CancelButton").GetComponent<Button>();
closeQuitButton = transform.Find("Panel/QuitPanel/CloseButton").GetComponent<Button>(); closeQuitButton = transform.Find("Panel/QuitPanel/QuitPanel/CloseButton").GetComponent<Button>();
abandonButton = transform.Find("Panel/QuitPanel/AbandonButton").GetComponent<Button>(); abandonButton = transform.Find("Panel/QuitPanel/QuitPanel/AbandonButton").GetComponent<Button>();
viewButton =transform.Find("Panel/ViewButton").GetComponent<Button>(); viewButton =transform.Find("Panel/ViewButton").GetComponent<Button>();
altitudeGraph = transform.Find("Panel/TitlePanel/AltitudeGraph").GetComponent<RawImage>(); altitudeGraph = transform.Find("Panel/TitlePanel/AltitudeGraph").GetComponent<RawImage>();
@ -462,6 +462,9 @@ namespace Assets.Scenes.Ride.Scripts
leftPanel.transform.DOLocalMove(new Vector3(leftPanel.transform.localPosition.x + isSimple * -430f, leftPanel.transform.localPosition.y, leftPanel.transform.localPosition.z), 1); 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 * 200f, titlePanel.transform.localPosition.z), 1); titlePanel.transform.DOLocalMove(new Vector3(titlePanel.transform.localPosition.x, titlePanel.transform.localPosition.y + isSimple * 200f, titlePanel.transform.localPosition.z), 1);
miniMap.transform.DOLocalMove(new Vector3(miniMap.transform.localPosition.x , miniMap.transform.localPosition.y + isSimple * 260f, miniMap.transform.localPosition.z), 1); miniMap.transform.DOLocalMove(new Vector3(miniMap.transform.localPosition.x , miniMap.transform.localPosition.y + isSimple * 260f, miniMap.transform.localPosition.z), 1);
nextSlopePanel.transform.DOLocalMove(new Vector3(nextSlopePanel.transform.localPosition.x, nextSlopePanel.transform.localPosition.y + isSimple * 260f, nextSlopePanel.transform.localPosition.z), 1);
currentSlopePanel.transform.DOLocalMove(new Vector3(currentSlopePanel.transform.localPosition.x, currentSlopePanel.transform.localPosition.y + isSimple * 260f, currentSlopePanel.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 += () => nearByPanel.transform.DOLocalMove(new Vector3(nearByPanel.transform.localPosition.x + isSimple * 330f, nearByPanel.transform.localPosition.y, nearByPanel.transform.localPosition.z), 1).onComplete += () =>
{ {
clearLock = true; clearLock = true;