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 2022-01-25 18:29:27 +08:00
commit 2abb2d81a2
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,8 +372,9 @@ namespace Assets.Scenes.Ride.Scripts
//{ //{
// return; // return;
//} //}
mainController.Is3dView = true;
ChangeView(null); ChangeView(null);
//mainController.Is3dView = true;
} }
} }

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

@ -720,6 +720,17 @@ public class CyclingController : DeviceServiceMonoBase
public void ChangeCurrentPlayer(int userId) public void ChangeCurrentPlayer(int userId)
{ {
var coll = FindObjectsOfType<AbstractPlayer>(); var coll = FindObjectsOfType<AbstractPlayer>();
var unselectedPlayers = coll.Where(c => c.UserId != userId).ToList();
foreach (var item in unselectedPlayers)
{
item.transform.localScale = MIN_SIZE;
if (item.transform.childCount > 0)
{
Utils.DestroyChildren(item.transform);
}
}
var selectedPlayer = coll.Where(c => c.UserId == userId).FirstOrDefault(); var selectedPlayer = coll.Where(c => c.UserId == userId).FirstOrDefault();
if (selectedPlayer != null) if (selectedPlayer != null)
{ {
@ -732,8 +743,10 @@ public class CyclingController : DeviceServiceMonoBase
{ {
Utils.DestroyChildren(selectedPlayer.transform); Utils.DestroyChildren(selectedPlayer.transform);
var ss = Instantiate(onlineUserPrefab3d, selectedPlayer.transform); var ss = Instantiate(onlineUserPrefab3d, selectedPlayer.transform);
ss.transform.localScale = Is3dView ? MAX_SIZE : MIN_SIZE; ss.transform.localScale = new Vector3(1f, 1f, 1f);
selectedPlayer.transform.localScale = Is3dView ? MAX_SIZE : MIN_SIZE;
selectedPlayer.UpdateAnimator(); selectedPlayer.UpdateAnimator();
selectedPlayer.UserId = userId;
} }
Vector2d nextLatLon = Along(selectedPlayer.TotalDistance + 0.1); Vector2d nextLatLon = Along(selectedPlayer.TotalDistance + 0.1);
//设定人物方向 //设定人物方向
@ -744,15 +757,6 @@ public class CyclingController : DeviceServiceMonoBase
selectedPlayer.currentRotation = neededRotation; selectedPlayer.currentRotation = neededRotation;
} }
var unselectedPlayers = coll.Where(c => c.UserId != userId).ToList();
foreach (var item in unselectedPlayers)
{
item.transform.localScale = MIN_SIZE;
if (item.transform.childCount > 0)
{
Utils.DestroyChildren(item.transform);
}
}
//重置海拔图进度 //重置海拔图进度
var currentIndex = currentPlayer.CurrentIndex; var currentIndex = currentPlayer.CurrentIndex;
graph.HorizontalScrolling = chartDataSourceScript.GetCurrentStart(currentIndex); graph.HorizontalScrolling = chartDataSourceScript.GetCurrentStart(currentIndex);
@ -1066,11 +1070,15 @@ public BaseUIManager singleUIManager;
IEnumerator EnableTrailRenderer(List<TrailRenderer> trailRendererList) IEnumerator EnableTrailRenderer(List<TrailRenderer> trailRendererList)
{ {
yield return new WaitForSeconds(2f); yield return new WaitForSeconds(2f);
foreach (var item in trailRendererList) try
{ {
item.Clear(); foreach (var item in trailRendererList)
item.time = 30; {
item.Clear();
item.time = 30;
}
} }
catch (Exception e) { }
} }
#endregion #endregion