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

Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp

Browse Source
This commit is contained in:
CaiYanPeng 2021-05-01 01:03:24 +08:00
commit 9bc3864790
2 changed files with 3744 additions and 2751 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -591,7 +591,7 @@ namespace Assets.Scenes.Ride.Scripts
Vector3 prePos = headPanel.transform.position;
int nextIndex = playerController.CurrentIndex + 1;
var viewIndex = chartDataSourceScript.GetViewIndex(nextIndex);
if (!mainController.isStart && !mainController.isPause && !mainController.isQuit ||(mainController.isStart && playerController.Distance == 0))//未开始未暂停未结束
if (!mainController.isStart && !mainController.isPause && !mainController.isQuit ||(mainController.isStart && playerController.TotalDistance == 0))//未开始未暂停未结束
{
viewIndex = 0;
}
@ -622,7 +622,7 @@ namespace Assets.Scenes.Ride.Scripts
foreach (var item in others)
{
var itemIndex = chartDataSourceScript.GetViewIndex(item.CurrentIndex) + 1;
if (!mainController.isStart && !mainController.isPause && !mainController.isQuit || (mainController.isStart && item.Distance == 0))//未开始未暂停未结束
if (!mainController.isStart && !mainController.isPause && !mainController.isQuit || (mainController.isStart && item.TotalDistance == 0))//未开始未暂停未结束
{
itemIndex = 0;
}