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-07-30 18:08:31 +08:00
parent 07a7a95aa8
commit ea70e04ec0
12 changed files with 2740 additions and 2737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Resources/UI/Prefab/Match/CompetitionRankingPanel.prefab
View File

@ -860,7 +860,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:

2
Assets/Resources/UI/Prefab/Match/CompetitionResultPanel.prefab
View File

@ -4049,7 +4049,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &9162128331779673185 --- !u!224 &9162128331779673185
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

2
Assets/Resources/UI/Prefab/Match/WatcherPanel.prefab
View File

@ -857,7 +857,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.5058824, g: 0.5058824, b: 0.54901963, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:

5448
Assets/Scenes/Ride.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
View File

@ -172,7 +172,7 @@ namespace Assets.Scenes.Ride.Scripts
//平均破度 //平均破度
slope.text = Math.Round(route.AverageGrade, 2).ToString() + "%"; slope.text = Math.Round(route.AverageGrade, 2).ToString() + "%";
//比赛开始时间 //比赛开始时间
StartTime.text = competition.StartTime.ToLocalTime().ToString()+" TO "+ competition.EndApplyTime.ToLocalTime().ToString(); StartTime.text = competition.StartTime.ToLocalTime().ToString()+" TO "+ competition.EndTime.ToLocalTime().ToString();
//比赛结束时间 //比赛结束时间
// EndTime.text = competition.EndTime.ToLocalTime().ToString(); // EndTime.text = competition.EndTime.ToLocalTime().ToString();
//比赛状态 //比赛状态

1
Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingItem.cs
View File

@ -58,6 +58,7 @@ namespace Assets.Scenes.Ride.Scripts
} }
else else
{ {
Distance.color = selectedColor;
Background.color = unselectedColor; Background.color = unselectedColor;
} }
} }

2
Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs
View File

@ -250,7 +250,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
{ {
if (result.result && Directory.Exists(path)) if (result.result && Directory.Exists(path))
{ {
//Helper.DelectDir(path); Helper.DelectDir(path);
} }
} }
catch (Exception e) catch (Exception e)

2
Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs
View File

@ -309,7 +309,7 @@ namespace Assets.Scenes.Ride.Scripts
if (point == null) return null; if (point == null) return null;
var dict = new List<System.Tuple<double, OnlineUser>>(); var dict = new List<System.Tuple<double, OnlineUser>>();
var allOnlineUsers = onlineUserHelper.OnlineUsers; var allOnlineUsers = onlineUserHelper.OnlineUsers.Where(c=>c.CompetitionId == 0);
foreach (var item in allOnlineUsers) foreach (var item in allOnlineUsers)
{ {
if (item.Id == App.CurrentUser.Id) if (item.Id == App.CurrentUser.Id)

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

@ -120,6 +120,7 @@ namespace Assets.Scenes.Ride.Scripts
//graph = graphObject.GetComponent<GraphChartBase>(); //graph = graphObject.GetComponent<GraphChartBase>();
chartDataSourceScript = mainController.chartDataSourceScript; chartDataSourceScript = mainController.chartDataSourceScript;
graph = mainController.graph; graph = mainController.graph;
cyclingExcutor = mainController.cyclingController;
} }
IEnumerator TestExcute() IEnumerator TestExcute()
{ {
@ -195,11 +196,12 @@ namespace Assets.Scenes.Ride.Scripts
} }
} }
} }
if (totalDistance > mapData.TotalDistance) if (totalDistance >= mapData.TotalDistance && !stopRecord)
{ {
distance = totalDistance - mapData.TotalDistance; distance = totalDistance - mapData.TotalDistance;
totalDistance = mapData.TotalDistance; totalDistance = mapData.TotalDistance;
stopRecord = true; stopRecord = true;
mainController.cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime();
StartCoroutine("LateUpload"); StartCoroutine("LateUpload");
} }

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

@ -650,6 +650,7 @@ public class CyclingController : DeviceServiceMonoBase
//} //}
isStart = false; isStart = false;
isQuit = true; isQuit = true;
cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime();
} }
#endregion #endregion
@ -676,7 +677,7 @@ public class CyclingController : DeviceServiceMonoBase
public void Save(double totalDistance) public void Save(double totalDistance)
{ {
cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime(); //cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime();
isQuit = true; isQuit = true;
isStart = false; isStart = false;
string recordId = Guid.NewGuid().ToString(); string recordId = Guid.NewGuid().ToString();

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

@ -303,7 +303,7 @@ namespace Assets.Scenes.Ride.Scripts
{ {
head.gameObject.SetActive(true); head.gameObject.SetActive(true);
headPanel.GetComponent<Image>().color = blue; headPanel.GetComponent<Image>().color = blue;
rect.DOScale(new Vector3(1.5f, 1.5f, 1.5f), 0.5f); rect.DOScale(new Vector3(1.2f, 1.2f, 1.2f), 0.5f);
} }
else else
{ {

7
Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
View File

@ -55,10 +55,9 @@ namespace Assets.Scenes.Ride.Scripts
cadance = mainController.UpdateCadence(); cadance = mainController.UpdateCadence();
weight = App.CurrentUser.Weight; weight = App.CurrentUser.Weight;
bicycleWeight = App.CurrentUser.BicycleWeight; bicycleWeight = App.CurrentUser.BicycleWeight;
//#if UNITY_EDITOR #if UNITY_EDITOR
System.Random rd = new System.Random(); power = 2000;
power = 2000; //rd.Next(150, 300);//测试功率 #endif
//#endif
mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100); mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
} }
catch (Exception ex) catch (Exception ex)