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

ar观察者模式

Browse Source
This commit is contained in:
lishuo 2023-01-31 18:22:15 +08:00
parent df936c4e04
commit 7822584cdd
62 changed files with 8331 additions and 7049 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/AR/ARObject.cs → Assets/AR/ARGameObject.cs
View File

@ -2,7 +2,7 @@
namespace Assets.AR
{
public class ARObject : MonoBehaviour
public class ARGameObject : MonoBehaviour
{
public string Hash;
public const int Layer = 1;
@ -23,12 +23,14 @@ namespace Assets.AR
private float FrameRate = 29.97f;
public ARObjectTimeTransform[] TimeTransforms { get; set; }
public ARVideoTransform[] TimeTransforms { get; set; }
public string CustomUrl { get; set; }
public string ArName { get; set; }
public int UserId { get; set; }
public Vector3 CameraPositionOffset { get; set; }
public float Frame => !this.useMultilapTransform ? this.frame : this.frame + this.videoSync.LastVideoFrame;

0
Assets/AR/ARObject.cs.meta → Assets/AR/ARGameObject.cs.meta
View File

8
Assets/AR/ARMeshFactory.cs → Assets/AR/ARGameObjectFactory.cs
View File

@ -3,7 +3,7 @@ using UnityEngine.Rendering;
namespace Assets.AR
{
public static class ARMeshFactory
public static class ARGameObjectFactory
{
private static bool IsValidVertex(Vector3 v) => !float.IsNaN(v.x) && !float.IsInfinity(v.x) && !float.IsNaN(v.y) && !float.IsInfinity(v.y) && !float.IsNaN(v.z) && !float.IsInfinity(v.z);
//创建轨迹
@ -22,15 +22,15 @@ namespace Assets.AR
Vector3[] vector3Array1 = new Vector3[num1 * 2];
Vector3 left;
Vector3 right;
ARMeshFactory.CreateVertices(start, route, lOffset, rOffset, out left, out right, margin);
ARGameObjectFactory.CreateVertices(start, route, lOffset, rOffset, out left, out right, margin);
vector3Array1[0] = left;
vector3Array1[1] = right;
int num2 = 2;
int num3 = 0;
for (int frame = start + 1; frame <= end; ++frame)
{
ARMeshFactory.CreateVertices(frame, route, lOffset, rOffset, out left, out right, margin);
if (ARMeshFactory.IsValidVertex(left) && ARMeshFactory.IsValidVertex(right))
ARGameObjectFactory.CreateVertices(frame, route, lOffset, rOffset, out left, out right, margin);
if (ARGameObjectFactory.IsValidVertex(left) && ARGameObjectFactory.IsValidVertex(right))
{
Vector3[] vector3Array2 = vector3Array1;
int index1 = num2;

0
Assets/AR/ARMeshFactory.cs.meta → Assets/AR/ARGameObjectFactory.cs.meta
View File

6
Assets/AR/ARObjectType.cs → Assets/AR/ARGameObjectType.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Assets.AR
{
public enum ARObjectType
public enum ARGameObjectType
{
Sign,
Box,
@ -17,7 +17,7 @@ namespace Assets.AR
Custom,
}
public enum RiderCameraDistance
public enum CameraDistance
{
FirstPerson,
Near,
@ -25,7 +25,7 @@ namespace Assets.AR
Far,
}
public enum VideoControlMode
public enum VideoPlayMode
{
Front,
AutoPanorama,

0
Assets/AR/ARObjectType.cs.meta → Assets/AR/ARGameObjectType.cs.meta
View File

26
Assets/AR/ARObjectsController.cs → Assets/AR/ARGameObjectsController.cs
View File

@ -4,12 +4,12 @@ using UnityEngine.Rendering;
namespace Assets.AR
{
public abstract class ARObjectsController : MonoBehaviour
public abstract class ARGameObjectsController : MonoBehaviour
{
public float MaximumVisibilityDistance = 200f;
private readonly Vector3 CameraOriginOffset = Vector3.up * -100f;
protected static readonly Vector3 DefaultObjectPosition = new Vector3(0.0f, 1000f, 0.0f);
protected List<ARObject> arObjects = new List<ARObject>();
protected List<ARGameObject> arObjects = new List<ARGameObject>();
protected Material matShadow { get; set; }
protected Material matModelMask;
protected AVProVideoPlayer videoPlayer { get; set; }
@ -21,7 +21,7 @@ namespace Assets.AR
protected GameObject trajectoryObject;
private float ambientIntensity;
private GameObject camGo;
protected Dictionary<int, ARObjectsController.Segment> trajectorySegments = new Dictionary<int, ARObjectsController.Segment>();
protected Dictionary<int, ARGameObjectsController.Segment> trajectorySegments = new Dictionary<int, ARGameObjectsController.Segment>();
protected int lapCount = 1;
protected double lapLength;
@ -49,7 +49,7 @@ namespace Assets.AR
this.matShadow = Resources.Load<Material>("UI/Material/TransparentPlane");
//this.matModelMask = Resources.Load<Material>("Materials/ModelDepth");
this.arObjects.Clear();
this.arObjects.AddRange(FindObjectsOfType<ARObject>());
this.arObjects.AddRange(FindObjectsOfType<ARGameObject>());
SetupCamera();
}
@ -66,18 +66,18 @@ namespace Assets.AR
if (this.Route.CameraRotationsRear != null && this.Route.CameraRotationsRear.Length == this.Route.CameraRotations.Length)
{
this.AR360Version = true;
ARObject.MaxDistanceVisibilityModels = 200f;
ARGameObject.MaxDistanceVisibilityModels = 200f;
this.MaximumVisibilityDistance = 500f;
}
else
{
this.AR360Version = false;
ARObject.MaxDistanceVisibilityModels = 80f;
ARGameObject.MaxDistanceVisibilityModels = 80f;
this.MaximumVisibilityDistance = 200f;
}
if (route == null)
return;
foreach (ARObject arObject in this.arObjects)
foreach (ARGameObject arObject in this.arObjects)
{
arObject.VideoSync = videoSync;
arObject.Route = route;
@ -92,10 +92,10 @@ namespace Assets.AR
float visibilityRear,
float visibilityFront)
{
foreach (ARObject arObject in this.arObjects)
foreach (ARGameObject arObject in this.arObjects)
{
arObject.CameraPositionOffset = this.cameraPositionOffset;
if (arObject is ARLaneObject arLaneObject)
if (arObject is ARLaneGameObject arLaneObject)
arLaneObject.FrameIndexDistanceCorrection = this.FrameIndexDistanceCorrection;
//if (this.SelectedPanorama != null && (arObject.ObjectType == ARObjectType.Box || arObject.ObjectType == ARObjectType.Sphere))
//{
@ -112,7 +112,7 @@ namespace Assets.AR
}
}
protected virtual bool IsArObjectActive(ARObject arObject) => (double)arObject.VisibilityLevel > 0.0 ;
protected virtual bool IsArObjectActive(ARGameObject arObject) => (double)arObject.VisibilityLevel > 0.0 ;
protected virtual Material GetTrajectoryMaterial() => this.matShadow;
@ -165,13 +165,13 @@ namespace Assets.AR
if (!this.trajectorySegments.ContainsKey(index))
{
GameObject trajectory = this.CreateTrajectory(index, 0.0f, 0.0f);
ARObjectsController.Segment segment = new ARObjectsController.Segment(trajectory, trajectory.transform.position);
ARGameObjectsController.Segment segment = new ARGameObjectsController.Segment(trajectory, trajectory.transform.position);
this.trajectorySegments.Add(index, segment);
}
}
foreach (int key in this.trajectorySegments.Keys)
{
ARObjectsController.Segment trajectorySegment = this.trajectorySegments[key];
ARGameObjectsController.Segment trajectorySegment = this.trajectorySegments[key];
trajectorySegment.GameObject.transform.position = trajectorySegment.Position - this.cameraPositionOffset;
}
}
@ -183,7 +183,7 @@ namespace Assets.AR
float rOffset,
float margin = float.NaN)
{
GameObject trajectory = ARMeshFactory.CreateTrajectory(this.Route, segment, lOffset, rOffset, margin);
GameObject trajectory = ARGameObjectFactory.CreateTrajectory(this.Route, segment, lOffset, rOffset, margin);
trajectory.transform.parent = this.trajectoryObject.transform;
//trajectory.layer = 9;
trajectory.GetComponent<MeshRenderer>().shadowCastingMode = ShadowCastingMode.Off;

0
Assets/AR/ARObjectsController.cs.meta → Assets/AR/ARGameObjectsController.cs.meta
View File

2
Assets/AR/ARLaneObject.cs → Assets/AR/ARLaneGameObject.cs
View File

@ -3,7 +3,7 @@ using DG.Tweening;
namespace Assets.AR
{
public class ARLaneObject : ARObject
public class ARLaneGameObject : ARGameObject
{
public Vector3 Lean { get; set; }//偏移量

0
Assets/AR/ARLaneObject.cs.meta → Assets/AR/ARLaneGameObject.cs.meta
View File

40
Assets/AR/ARLaneObjectsController.cs → Assets/AR/ARLaneGameObjectsController.cs
View File

@ -4,7 +4,7 @@ using UnityEngine;
namespace Assets.AR
{
public abstract class ARLaneObjectsController : ARObjectsController
public abstract class ARLaneGameObjectsController : ARGameObjectsController
{
protected const float LaneWidth = 0.7f;
protected const float StartRegionDistance = 200f;
@ -12,9 +12,9 @@ namespace Assets.AR
private const float StartRowsRandomDistance = 0.4f;
private const float StartRowsRandomWidth = 0.15f;
private const float MinCollisionDistance = 1.33f;
protected readonly Dictionary<int, ARLaneObject> riderObjects = new Dictionary<int, ARLaneObject>();
protected readonly Dictionary<int, ARLaneGameObject> riderObjects = new Dictionary<int, ARLaneGameObject>();
private readonly Dictionary<int, Vector2> randomizedStartOffsets = new Dictionary<int, Vector2>();
private readonly List<ARLaneObject> collisionList = new List<ARLaneObject>();
private readonly List<ARLaneGameObject> collisionList = new List<ARLaneGameObject>();
public bool AllowStartOrder { get; set; } = true;
@ -28,7 +28,7 @@ namespace Assets.AR
public int FollowedRiderId { get; set; }
public IReadOnlyDictionary<int, ARLaneObject> ArRiders => (IReadOnlyDictionary<int, ARLaneObject>)this.riderObjects;
public IReadOnlyDictionary<int, ARLaneGameObject> ArRiders => (IReadOnlyDictionary<int, ARLaneGameObject>)this.riderObjects;
protected virtual void Start()
{
@ -50,10 +50,10 @@ namespace Assets.AR
//检测碰撞
private void DetectRidersCollisions(float cameraDistance)
{
float num1 = cameraDistance - ARObject.MaxDistanceVisibilityModels;
float num2 = cameraDistance + ARObject.MaxDistanceVisibilityModels;
float num1 = cameraDistance - ARGameObject.MaxDistanceVisibilityModels;
float num2 = cameraDistance + ARGameObject.MaxDistanceVisibilityModels;
this.collisionList.Clear();
foreach (ARLaneObject arLaneObject in this.riderObjects.Values)
foreach (ARLaneGameObject arLaneObject in this.riderObjects.Values)
{
if (arLaneObject.gameObject.activeSelf && !arLaneObject.IsAtFinish)
{
@ -64,7 +64,7 @@ namespace Assets.AR
}
}
}
foreach (ARLaneObject collision in this.collisionList)
foreach (ARLaneGameObject collision in this.collisionList)
{
if ((double)collision.RouteDistance < 200.0)
{
@ -72,7 +72,7 @@ namespace Assets.AR
collision.DistanceSort = collision.Distance;
}
}
this.collisionList.Sort((Comparison<ARLaneObject>)((r1, r2) =>
this.collisionList.Sort((Comparison<ARLaneGameObject>)((r1, r2) =>
{
int num3 = r1.Lane.CompareTo(r2.Lane);
if (num3 == 0)
@ -82,7 +82,7 @@ namespace Assets.AR
float deltaTime = Time.deltaTime;
for (int index = 0; index < this.collisionList.Count; ++index)
{
ARLaneObject collision = this.collisionList[index];
ARLaneGameObject collision = this.collisionList[index];
float lane = collision.Lane;
float num4 = this.GetLane(collision.RouteDistance, collision.DistanceSort, index);
if ((double)collision.LaneWidth != 0.0)
@ -94,7 +94,7 @@ namespace Assets.AR
collision.Lane = num4;
}
this.CalculateOvertakingParameters();
foreach (ARLaneObject collision in this.collisionList)
foreach (ARLaneGameObject collision in this.collisionList)
{
collision.LaneWidth = 0.7f;
float num6 = this.Route.LeftHanded ? this.GetRouteLeftOffset(collision.Frame) : this.GetRouteRightOffset(collision.Frame);
@ -109,7 +109,7 @@ namespace Assets.AR
float deltaTime = Time.deltaTime;
for (int index = 0; index < this.collisionList.Count; ++index)
{
ARLaneObject collision = this.collisionList[index];
ARLaneGameObject collision = this.collisionList[index];
bool flag1 = collision.StartPosition == this.FollowedRiderId;
float x = Math.Abs(collision.Distance - cameraDistance);
float x2 = 4f;
@ -124,7 +124,7 @@ namespace Assets.AR
}
else
{
float num1 = VTMath.Lerp(0.0f, 1f, x2, 0.0f, x);
float num1 = PFMath.Lerp(0.0f, 1f, x2, 0.0f, x);
float num2 = collision.Lane * collision.LaneWidth - collision.BaseOffset;
float num3 = 0.75f;
if (this.NearViewMode && !flag1)
@ -149,7 +149,7 @@ namespace Assets.AR
private void CalculateOvertakingParameters()
{
float deltaTime = Time.deltaTime;
foreach (ARLaneObject laneObject in this.riderObjects.Values)
foreach (ARLaneGameObject laneObject in this.riderObjects.Values)
{
float num1 = laneObject.Speed * deltaTime;
if ((double)num1 == 0.0)
@ -166,7 +166,7 @@ namespace Assets.AR
if ((double)num1 > 0.0)
{
float num3 = Mathf.Atan(num2 / num1);
curvature = (float)(0.039999999105930328 * (double)VTMath.Lerp(0.0f, 3f, 20f, 1f, laneObject.Speed)) * num3;
curvature = (float)(0.039999999105930328 * (double)PFMath.Lerp(0.0f, 3f, 20f, 1f, laneObject.Speed)) * num3;
}
this.UpdateRiderCurvature(laneObject, curvature, deltaTime);
float angle = -57.29578f * Mathf.Atan(num2 / num1);
@ -175,14 +175,14 @@ namespace Assets.AR
}
}
protected void UpdateRiderCurvature(ARLaneObject laneObject, float curvature, float deltaTime)
protected void UpdateRiderCurvature(ARLaneGameObject laneObject, float curvature, float deltaTime)
{
float num = 6f;
laneObject.Curvature = Mathf.Lerp(laneObject.Curvature, curvature, num * deltaTime);
}
protected void UpdateLaneChangingDirection(
ARLaneObject laneObject,
ARLaneGameObject laneObject,
float angle,
float deltaTime)
{
@ -198,10 +198,10 @@ namespace Assets.AR
float b = 0.0f;
for (int index = count - 1; index >= 0; --index)
{
ARLaneObject collision = this.collisionList[index];
ARLaneGameObject collision = this.collisionList[index];
if ((double)collision.Lane + 1.0 >= (double)b)
{
float collisionParameter = ARLaneObjectsController.GetCollisionParameter(modelDistance, collision.DistanceSort, overtakingThreshold);
float collisionParameter = ARLaneGameObjectsController.GetCollisionParameter(modelDistance, collision.DistanceSort, overtakingThreshold);
if ((double)collisionParameter > 0.0)
b = Mathf.Max(collision.Lane + collisionParameter, b);
}
@ -248,7 +248,7 @@ namespace Assets.AR
x = -x;
if ((double)x < 1.0)
return 1f;
return (double)x > (double)maxDistance ? 0.0f : VTMath.SmoothStep(1f, 1f, maxDistance, 0.0f, x);
return (double)x > (double)maxDistance ? 0.0f : PFMath.SmoothStep(1f, 1f, maxDistance, 0.0f, x);
}
private float GetRouteLeftOffset(float frame) => this.Route == null ? 0.0f : this.Route.GetLeftSideOffset(frame);

0
Assets/AR/ARLaneObjectsController.cs.meta → Assets/AR/ARLaneGameObjectsController.cs.meta
View File

6
Assets/AR/ARRoute.cs
View File

@ -205,7 +205,7 @@ namespace Assets.AR
return 0.0;
if (index == frameDistances.Length)
return (double)(frameDistances.Length - 1);
double num = VTMath.InverseLerp(frameDistances[index - 1], frameDistances[index], distance);
double num = PFMath.InverseLerp(frameDistances[index - 1], frameDistances[index], distance);
return (double)index + num - 1.0;
}
@ -222,7 +222,7 @@ namespace Assets.AR
if (index >= this.FrameCount)
return this.FrameDistances[this.FrameDistances.Length - 1];
double t = frame - (double)(index - 1);
return VTMath.Lerp(this.FrameDistances[index - 1], this.FrameDistances[index], t);
return PFMath.Lerp(this.FrameDistances[index - 1], this.FrameDistances[index], t);
}
public CameraProjectionParameters GetCameraProjectionParameters(
@ -558,7 +558,7 @@ namespace Assets.AR
Vector3 filteredCameraPosition1 = this.GetFilteredCameraPosition((float)this.GetFrameAtDistance(num - 10.0));
Vector3 filteredCameraPosition2 = this.GetFilteredCameraPosition((float)this.GetFrameAtDistance(num + 10.0));
Vector3 center;
if (!Geometry.CircleCenter(filteredCameraPosition1, aP1, filteredCameraPosition2, out center))
if (!GeometryUtil.CircleCenter(filteredCameraPosition1, aP1, filteredCameraPosition2, out center))
{
numArray[index] = 0.0f;
}

117
Assets/AR/ARTrainingController.cs
View File

@ -8,20 +8,20 @@ using Assets.Scenes.Ride.Scripts.Model.RiderModels;
namespace Assets.AR
{
public class ARTrainingController : ARLaneObjectsController
public class ARTrainingController : ARLaneGameObjectsController
{
public MediaPlayer mediaPlayer;
private ARData aRData;
private RouteDetailData detail;
private VideoPointsSync videoPointsSync;
private readonly List<ARLaneObject> collisionList = new List<ARLaneObject>();
VideoPlayerControl VideoPlayerControl;
ARLaneObject[] rides { get; set; }
public ARLaneObject mainRiderObject { get; set; }
private readonly List<ARLaneGameObject> collisionList = new List<ARLaneGameObject>();
ARVideoPlayerControl VideoPlayerControl;
ARLaneGameObject[] rides { get; set; }
public ARLaneGameObject mainRiderObject { get; set; }
private Light arLight;
private Light arBackLight;
public RiderCameraDistance RiderCameraDistance { get; set; }
public VideoControlMode VideoControlMode { get; private set; }
public CameraDistance RiderCameraDistance { get; set; }
public VideoPlayMode VideoControlMode { get; private set; }
private float autoCameraSwitchTimeCounter = 80f;
float timers = 0f;
private VideoGameManager manager;
@ -55,14 +55,14 @@ namespace Assets.AR
//ar数据加载本地，本地没有就下载
this.aRData = arData;
this.detail = routeDetailData;
this.RiderCameraDistance = AR.CameraDistance.Middle;
videoPointsSync = new VideoPointsSync(detail.VideoPoints.Select(c => new VideoPoint()
{
Distance = (float)c.Distance,
Time = (float)c.VideoTime
}));
videoSync = videoPointsSync;
this.VideoPlayerControl = new VideoPlayerControl();
this.VideoPlayerControl = new ARVideoPlayerControl();
this.VideoPlayerControl.VideoSyncSource = videoSync;
this.videoPlayer = new AVProVideoPlayer();
this.videoPlayer.videoPlayer = mediaPlayer;
@ -70,7 +70,7 @@ namespace Assets.AR
this.VideoPlayerControl.VideoFrameOffset = this.Route.VideoFrameOffset;
this.VideoPlayerControl.Route = Route;
this.VideoPlayerControl.SetVideoPlayer(videoPlayer);
rides = FindObjectsOfType<ARLaneObject>();
rides = FindObjectsOfType<ARLaneGameObject>();
SetUpLight();
}
@ -87,7 +87,7 @@ namespace Assets.AR
{
var item = dic.Value;
if (dic.Key.UserId == App.CurrentUser.Id)
if (dic.Key.UserId == manager.CurrentPlayer.userId)
{
mainRiderObject = item;
}
@ -109,14 +109,28 @@ namespace Assets.AR
item.IsAtFinish = dic.Key.EndDistance >= manager.GetMapRoute().Distance*1000f;
if (!this.arObjects.Contains(item))
this.arObjects.Add(item);
if (!this.riderObjects.ContainsKey(item.GetInstanceID()))
this.riderObjects.Add(item.GetInstanceID(), item);
if (!this.riderObjects.ContainsKey(item.UserId))
this.riderObjects.Add(item.UserId, item);
}
this.arObjects.RemoveAll(c => !manager.rideObjs.Select(m => m.Key.UserId.ToString()).Contains(c.UserId.ToString()));
var keys = riderObjects.Keys.ToList();
foreach (var item in keys)
{
if (!manager.rideObjs.Keys.Where(c => c.UserId == item).Any())
{
riderObjects.Remove(item);
}
}
timers += 1f;
}
if (mainRiderObject == null || Route == null)
if (mainRiderObject == null || Route == null)
{
videoPlayer?.Pause();
return;
}
var delta = Time.deltaTime;
foreach (var obj in this.riderObjects.Values)
{
@ -135,12 +149,12 @@ namespace Assets.AR
this.UpdateRidersLean();
this.UpdateBackLight();
if (Input.GetKeyDown(KeyCode.F))
this.SetVideoControlMode(VideoControlMode.Front);
this.SetVideoControlMode(VideoPlayMode.Front);
if (Input.GetKeyDown(KeyCode.P))
this.SetVideoControlMode(VideoControlMode.AutoPanorama);
this.SetVideoControlMode(VideoPlayMode.AutoPanorama);
if (!Input.GetKeyDown(KeyCode.B))
return;
this.SetVideoControlMode(VideoControlMode.Rear);
this.SetVideoControlMode(VideoPlayMode.Rear);
}
//创建
private void SetUpLight()
@ -173,28 +187,27 @@ namespace Assets.AR
this.arBackLight.cullingMask = 512;
}
//设置video显示模式
public void SetVideoControlMode(VideoControlMode mode)
public void SetVideoControlMode(VideoPlayMode mode)
{
if (mode == this.VideoControlMode)
return;
if (!this.AR360Version)
mode = VideoControlMode.Front;
mode = VideoPlayMode.Front;
this.VideoControlMode = mode;
this.autoCameraSwitchTimeCounter = 80f;
if (mode == VideoControlMode.AutoPanorama)
if (mode == VideoPlayMode.AutoPanorama)
return;
this.videoPlayer.IntendedRear = mode == VideoControlMode.Rear;
this.videoPlayer.IntendedRear = mode == VideoPlayMode.Rear;
}
//更新摄像机的位置
private void UpdateCameraFollowDistance()
{
this.RiderCameraDistance = RiderCameraDistance.Middle;
this.NearViewMode = this.RiderCameraDistance == RiderCameraDistance.Near;
this.NearViewMode = this.RiderCameraDistance == AR.CameraDistance.Near;
float cameraFollowDistance = GetCameraFollowDistance(this.RiderCameraDistance);
this.VideoPlayerControl.CameraFollowDistance = cameraFollowDistance;
}
//人物是否显示
protected override bool IsArObjectActive(ARObject arObject)
protected override bool IsArObjectActive(ARGameObject arObject)
{
bool flag = base.IsArObjectActive(arObject);
if ((UnityEngine.Object)arObject != (UnityEngine.Object)this.mainRiderObject)
@ -204,17 +217,17 @@ namespace Assets.AR
return flag && (double)this.VideoPlayerControl.CameraDistanceError > 5.0;
}
//获取摄像机的位置
public static float GetCameraFollowDistance(RiderCameraDistance distance)
public static float GetCameraFollowDistance(CameraDistance distance)
{
switch (distance)
{
case RiderCameraDistance.FirstPerson:
case AR.CameraDistance.FirstPerson:
return 0.0f;
case RiderCameraDistance.Near:
case AR.CameraDistance.Near:
return 1.5f;
case RiderCameraDistance.Middle:
case AR.CameraDistance.Middle:
return 5f;
case RiderCameraDistance.Far:
case AR.CameraDistance.Far:
return 10f;
default:
throw new ArgumentException("Unknown rider's camera distance.");
@ -237,26 +250,26 @@ namespace Assets.AR
this.DestroyRiderTitle(riderId);
}
//创建人物
private BaseRenderer CreateRiderModel(OnlineRiderModel rider, float lane)
private AbstractRenderer CreateRiderModel(OnlineRiderModel rider, float lane)
{
GameObject gameObject;
RiderRenderer riderModel;
PlayerRenderer riderModel;
if (rider.Sex == 1)
{
gameObject = UnityEngine.Object.Instantiate<GameObject>(this.BikerMalePrefab);
gameObject.name = "RiderMale " + rider.UserId.ToString();
riderModel = gameObject.AddComponent<RiderRenderer>();
riderModel = gameObject.AddComponent<PlayerRenderer>();
riderModel.Initialize(true, false);
}
else
{
gameObject = UnityEngine.Object.Instantiate<GameObject>(this.BikerFemalePrefab);
gameObject.name = "RiderFemale " + rider.UserId.ToString();
riderModel = gameObject.AddComponent<RiderRenderer>();
riderModel = gameObject.AddComponent<PlayerRenderer>();
riderModel.Initialize(false, false);
}
gameObject.transform.parent = this.transform;
gameObject.transform.position = ARObjectsController.DefaultObjectPosition;
gameObject.transform.position = ARGameObjectsController.DefaultObjectPosition;
gameObject.layer = 9;
riderModel.Route = this.Route;
riderModel.VideoSync = this.videoSync;
@ -269,30 +282,30 @@ namespace Assets.AR
//riderModel.BikeTexture = modelTextures.BikeTexture;
if ((double)lane != -1.0)
riderModel.Lane = lane;
this.riderObjects.Add(rider.UserId, (ARLaneObject)riderModel);
this.arObjects.Add((ARObject)riderModel);
this.riderObjects.Add(rider.UserId, (ARLaneGameObject)riderModel);
this.arObjects.Add((ARGameObject)riderModel);
//是否
if (this.IsMainRider(rider))
this.mainRiderObject = (ARLaneObject)riderModel;
return (BaseRenderer)riderModel;
this.mainRiderObject = (ARLaneGameObject)riderModel;
return (AbstractRenderer)riderModel;
}
private ARLaneObject CreateRiderObject(OnlineRiderModel rider, float lane)
private ARLaneGameObject CreateRiderObject(OnlineRiderModel rider, float lane)
{
ARLaneObject riderObject = new GameObject("RiderObject " + rider.UserId.ToString())
ARLaneGameObject riderObject = new GameObject("RiderObject " + rider.UserId.ToString())
{
transform = {
parent = this.transform
},
layer = 9
}.AddComponent<ARLaneObject>();
}.AddComponent<ARLaneGameObject>();
riderObject.Route = this.Route;
riderObject.VideoSync = this.videoSync;
//riderObject.VideoPlayer = this.videoPlayer;
if ((double)lane != -1.0)
riderObject.Lane = lane;
this.riderObjects.Add(rider.UserId, riderObject);
this.arObjects.Add((ARObject)riderObject);
this.arObjects.Add((ARGameObject)riderObject);
if (this.IsMainRider(rider))
this.mainRiderObject = riderObject;
return riderObject;
@ -300,13 +313,13 @@ namespace Assets.AR
//销毁骑手
private void DestroyRider(int riderId)
{
ARLaneObject arLaneObject;
ARLaneGameObject arLaneObject;
if (!this.riderObjects.TryGetValue(riderId, out arLaneObject))
return;
this.arObjects.Remove((ARObject)arLaneObject);
this.arObjects.Remove((ARGameObject)arLaneObject);
this.riderObjects.Remove(riderId);
if ((UnityEngine.Object)arLaneObject == (UnityEngine.Object)this.mainRiderObject)
this.mainRiderObject = (ARLaneObject)null;
this.mainRiderObject = (ARLaneGameObject)null;
UnityEngine.Object.Destroy((UnityEngine.Object)arLaneObject.gameObject);
}
//创建骑行人员头顶的名字
@ -392,7 +405,7 @@ namespace Assets.AR
{
if (!this.visibleRiders.ContainsKey(num))
{
ARLaneObject riderObject = this.riderObjects[num];
ARLaneGameObject riderObject = this.riderObjects[num];
if (!riderObject.IsAtFinish || (double)riderObject.VisibilityLevel <= 0.0)
{
this.DestroyRider(num);
@ -405,11 +418,11 @@ namespace Assets.AR
{
var rider = visibleRiderItem.Rider;
bool showModel = visibleRiderItem.ShowModel;
ARLaneObject arLaneObject;
ARLaneGameObject arLaneObject;
//二次检查
if (this.riderObjects.TryGetValue(rider.UserId, out arLaneObject))
{
if (arLaneObject is BaseRenderer)
if (arLaneObject is AbstractRenderer)
{
if (!showModel)
{
@ -438,7 +451,7 @@ namespace Assets.AR
public int VisibleRiderTitlesLimit => this.VisibleModelsLimit + 10;
private void UpdateVisibleRiders()
{
float visibilityModels = ARObject.MaxDistanceVisibilityModels;
float visibilityModels = ARGameObject.MaxDistanceVisibilityModels;
float visibilityDistance = this.MaximumVisibilityDistance;
float routeDistance = this.CameraDistance;
bool flag = this.AllowStartOrder && (double)routeDistance < 200.0;
@ -500,7 +513,7 @@ namespace Assets.AR
if ((double)num6 > -(double)num2 && (double)num6 < (double)num1)
{
float num7 = -1f;
ARLaneObject laneObject;
ARLaneGameObject laneObject;
if (this.riderObjects.TryGetValue(rider.UserId, out laneObject))
{
if ((double)laneObject.Lane > (double)num4)
@ -630,7 +643,7 @@ namespace Assets.AR
{
float routeDistance1 = (float)visibleRiderItem.Rider.RouteDistance;
float routeDistance2 = (float)sorted.Rider.RouteDistance;
float collisionParameter = ARLaneObjectsController.GetCollisionParameter(routeDistance1, routeDistance2, this.GetOvertakingThreshold(routeDistance1));
float collisionParameter = ARLaneGameObjectsController.GetCollisionParameter(routeDistance1, routeDistance2, this.GetOvertakingThreshold(routeDistance1));
sorted.Lane += collisionParameter;
if ((double)sorted.Lane > (double)maxLane)
sorted.Lane = float.MaxValue;
@ -647,7 +660,7 @@ namespace Assets.AR
//更新骑手的偏移角度
private void UpdateRidersLean()
{
foreach (ARLaneObject riderObject in this.riderObjects.Values)
foreach (ARLaneGameObject riderObject in this.riderObjects.Values)
{
float num1 = this.Route.GetTrajectoryCurvature(riderObject.Frame) + riderObject.Curvature;
float z1;

8
Assets/AR/VideoPlayerControl.cs → Assets/AR/ARVideoPlayerControl.cs
View File

@ -7,7 +7,7 @@ using UnityEngine;
namespace Assets.AR
{
public class VideoPlayerControl
public class ARVideoPlayerControl
{
private const float MinVideoPlaybackSpeedChangeInterval = 0.2f;
private const float MaxPlaybackSpeed = 1.5f;
@ -123,7 +123,7 @@ namespace Assets.AR
}
else
f = frame - (this.VideoPlayer.CurrentFrame - (float)this.VideoFrameOffset);
float num1 = Mathf.Clamp01(VTMath.Lerp(0.0f, 1f, 100f, 0.0f, Mathf.Abs(f)));
float num1 = Mathf.Clamp01(PFMath.Lerp(0.0f, 1f, 100f, 0.0f, Mathf.Abs(f)));
this.FrameIndexDistanceCorrection = f * num1;
this.CameraDistanceError = distance - distanceForVideoFrame;
if (this.IsMultilap)
@ -141,12 +141,12 @@ namespace Assets.AR
double totalSeconds = DateTime.UtcNow.Subtract(this.lastPlaybackSpeedChange).TotalSeconds;
if (totalSeconds >= 0.0 && totalSeconds < 0.20000000298023224)
return;
float num3 = 1f;
float num3 = (float)totalSeconds;
float num4 = num3 * speed;
var offset = this.VideoSyncSource.GetDistanceForVideoFrame((float)((double)this.VideoPlayer.CurrentFrame - (double)this.VideoFrameOffset + (double)num3 * (double)this.VideoPlayer.PlaybackSpeed * (double)this.VideoPlayer.FrameRate));
var left = (double)Math.Abs(distance + num4 - offset);
var right = (double)Math.Abs(this.CameraDistanceError);
if (left <= right)
return;
float videoFrameAtDistance2 = this.VideoSyncSource.GetVideoFrameAtDistance(routeDistance + num4);

0
Assets/AR/VideoPlayerControl.cs.meta → Assets/AR/ARVideoPlayerControl.cs.meta
View File

2
Assets/AR/ARObjectTimeTransform.cs → Assets/AR/ARVideoTransform.cs
View File

@ -2,7 +2,7 @@
namespace Assets.AR
{
public class ARObjectTimeTransform
public class ARVideoTransform
{
public int Frame;
public float Distance;

0
Assets/AR/ARObjectTimeTransform.cs.meta → Assets/AR/ARVideoTransform.cs.meta
View File

6
Assets/AR/AVProVideoPlayer.cs
View File

@ -132,17 +132,17 @@ namespace Assets.AR
this.videoPlayer.CloseMedia();
this.ReleaseRenderTextures();
}
private float pauseSpeed = 0.001f;
public bool SetPlaybackSpeed(float playbackSpeed)
{
if (this.IsSeeking || this.IsPaused || DateTime.UtcNow.Subtract(this.lastPlaybackSpeedChange).TotalSeconds < 1.0)
return false;
if ((double)playbackSpeed == 0.0 && !this.pausedByPlaybackSpeed)
if ((double)playbackSpeed <= pauseSpeed && !this.pausedByPlaybackSpeed)
{
this.pausedByPlaybackSpeed = true;
this.videoPlayer.Pause();
}
else if ((double)playbackSpeed > 0.0 && this.pausedByPlaybackSpeed)
else if ((double)playbackSpeed > pauseSpeed && this.pausedByPlaybackSpeed)
{
this.pausedByPlaybackSpeed = false;
if (!this.pausedByTrainingPause)

2
Assets/AR/BaseRenderer.cs → Assets/AR/AbstractRenderer.cs
View File

@ -3,7 +3,7 @@ using UnityEngine;
namespace Assets.AR
{
public abstract class BaseRenderer : ARLaneObject
public abstract class AbstractRenderer : ARLaneGameObject
{
protected Animator animator;
protected Shader shaderNormal;

0
Assets/AR/BaseRenderer.cs.meta → Assets/AR/AbstractRenderer.cs.meta
View File

2
Assets/AR/Geometry.cs → Assets/AR/GeometryUtil.cs
View File

@ -3,7 +3,7 @@ using UnityEngine;
namespace Assets.AR
{
public static class Geometry
public static class GeometryUtil
{
public static bool CircleCenter(Vector3 aP0, Vector3 aP1, Vector3 aP2, out Vector3 center)
{

0
Assets/AR/Geometry.cs.meta → Assets/AR/GeometryUtil.cs.meta
View File

32
Assets/AR/VTMath.cs → Assets/AR/PFMath.cs
View File

@ -3,7 +3,7 @@ using UnityEngine;
namespace Assets
{
public static class VTMath
public static class PFMath
{
public const double Deg2Rad = 0.017453292519943295;
public const double Rad2Deg = 57.295779513082323;
@ -29,9 +29,9 @@ namespace Assets
return (double)value <= (double)max ? value : max;
}
public static float Clamp01(float value) => VTMath.Clamp(value, 0.0f, 1f);
public static float Clamp01(float value) => PFMath.Clamp(value, 0.0f, 1f);
public static double Clamp01(double value) => VTMath.Clamp(value, 0.0, 1.0);
public static double Clamp01(double value) => PFMath.Clamp(value, 0.0, 1.0);
public static bool InBounds(double value, double min, double max) => min <= value && value <= max;
@ -39,14 +39,14 @@ namespace Assets
public static double Lerp(double x1, double y1, double x2, double y2, double x)
{
double t = x1 != x2 ? VTMath.InverseLerp(x1, x2, x) : 0.5;
return VTMath.Lerp(y1, y2, t);
double t = x1 != x2 ? PFMath.InverseLerp(x1, x2, x) : 0.5;
return PFMath.Lerp(y1, y2, t);
}
public static float Lerp(float x1, float y1, float x2, float y2, float x)
{
float t = (double)x1 != (double)x2 ? VTMath.InverseLerp(x1, x2, x) : 0.5f;
return VTMath.Lerp(y1, y2, t);
float t = (double)x1 != (double)x2 ? PFMath.InverseLerp(x1, x2, x) : 0.5f;
return PFMath.Lerp(y1, y2, t);
}
public static double Lerp(double a, double b, double t) => (1.0 - t) * a + t * b;
@ -61,23 +61,23 @@ namespace Assets
public static float SmoothStep(float x) => (float)((double)x * (double)x * (3.0 - 2.0 * (double)x));
public static double SmoothStep(double a, double b, double t) => VTMath.Lerp(a, b, VTMath.SmoothStep(t));
public static double SmoothStep(double a, double b, double t) => PFMath.Lerp(a, b, PFMath.SmoothStep(t));
public static float SmoothStep(float a, float b, float t) => VTMath.Lerp(a, b, VTMath.SmoothStep(t));
public static float SmoothStep(float a, float b, float t) => PFMath.Lerp(a, b, PFMath.SmoothStep(t));
public static double SmoothStep(double x1, double y1, double x2, double y2, double x)
{
double t = x1 != x2 ? VTMath.InverseLerp(x1, x2, x) : 0.5;
return VTMath.SmoothStep(y1, y2, t);
double t = x1 != x2 ? PFMath.InverseLerp(x1, x2, x) : 0.5;
return PFMath.SmoothStep(y1, y2, t);
}
public static float SmoothStep(float x1, float y1, float x2, float y2, float x)
{
float t = (double)x1 != (double)x2 ? VTMath.InverseLerp(x1, x2, x) : 0.5f;
return VTMath.SmoothStep(y1, y2, t);
float t = (double)x1 != (double)x2 ? PFMath.InverseLerp(x1, x2, x) : 0.5f;
return PFMath.SmoothStep(y1, y2, t);
}
public static double InverseSmoothStep(double a, double b, double value) => VTMath.InverseSmoothStep(VTMath.InverseLerp(a, b, value));
public static double InverseSmoothStep(double a, double b, double value) => PFMath.InverseSmoothStep(PFMath.InverseLerp(a, b, value));
public static double InverseSmoothStep(double x)
{
@ -106,7 +106,7 @@ namespace Assets
Vector3d lineStart,
Vector3d lineEnd)
{
return Vector3d.Magnitude(VTMath.ProjectPointToLineSegment(point, lineStart, lineEnd) - point);
return Vector3d.Magnitude(PFMath.ProjectPointToLineSegment(point, lineStart, lineEnd) - point);
}
public static Vector3d ProjectPointToLineSegment(
@ -114,7 +114,7 @@ namespace Assets
Vector3d lineStart,
Vector3d lineEnd)
{
double lineParameter = VTMath.ProjectPointToLineParameter(point, lineStart, lineEnd);
double lineParameter = PFMath.ProjectPointToLineParameter(point, lineStart, lineEnd);
return Vector3d.LerpClamped(lineStart, lineEnd, lineParameter);
}

0
Assets/AR/VTMath.cs.meta → Assets/AR/PFMath.cs.meta
View File

6
Assets/AR/RiderRenderer.cs → Assets/AR/PlayerRenderer.cs
View File

@ -4,7 +4,7 @@ using UnityEngine;
namespace Assets.AR
{
public class RiderRenderer : BaseRenderer
public class PlayerRenderer : AbstractRenderer
{
private const int PowerWindowSize = 10;
private const float Circumference = 2.13097382f;
@ -83,16 +83,14 @@ namespace Assets.AR
{
if ((UnityEngine.Object)this.animator != (UnityEngine.Object)null)
{
if (lastSpeed > 0)
if (lastSpeed > 1)
{
animator.Play("rideLoop");
}
else
{
animator.Play("idle");
}
animator.SetFloat("speed", lastSpeed);
}
}
private string LastAnimatorState { get; set; }

0
Assets/AR/RiderRenderer.cs.meta → Assets/AR/PlayerRenderer.cs.meta
View File

50
Assets/AR/TestPlayer.cs
View File

@ -9,7 +9,7 @@ using UnityEngine.UI;
namespace Assets.Scripts.Scenes.VideoRide
{
public class TestPlayer : ARLaneObjectsController
public class TestPlayer : ARLaneGameObjectsController
{
protected Transform LightTrans { get; set; }
public MediaPlayer mediaPlayer;
@ -18,11 +18,11 @@ namespace Assets.Scripts.Scenes.VideoRide
private RouteDetailData detail;
private VideoPointsSync videoPointsSync;
private int index = 1;
private readonly List<ARLaneObject> collisionList = new List<ARLaneObject>();
private readonly List<ARLaneGameObject> collisionList = new List<ARLaneGameObject>();
///private Dictionary<int, IRouteRider> riders = new Dictionary<int, IRouteRider>();
VideoPlayerControl VideoPlayerControl;
ARLaneObject[] rides;
public ARLaneObject mainObject;
ARVideoPlayerControl VideoPlayerControl;
ARLaneGameObject[] rides;
public ARLaneGameObject mainObject;
private Light arLight;
private Light arBackLight;
@ -45,7 +45,7 @@ namespace Assets.Scripts.Scenes.VideoRide
videoSync = videoPointsSync;
this.VideoPlayerControl = new VideoPlayerControl();
this.VideoPlayerControl = new ARVideoPlayerControl();
this.VideoPlayerControl.VideoSyncSource = videoSync;
this.videoPlayer = new AVProVideoPlayer();
this.videoPlayer.videoPlayer = mediaPlayer;
@ -53,7 +53,7 @@ namespace Assets.Scripts.Scenes.VideoRide
this.VideoPlayerControl.VideoFrameOffset = this.Route.VideoFrameOffset;
this.VideoPlayerControl.Route = Route;
this.VideoPlayerControl.SetVideoPlayer(videoPlayer);
rides = FindObjectsOfType<ARLaneObject>();
rides = FindObjectsOfType<ARLaneGameObject>();
CreateBackLight();
}
@ -134,39 +134,39 @@ namespace Assets.Scripts.Scenes.VideoRide
this.UpdateRidersLean();
this.UpdateBackLight();
if (Input.GetKeyDown(KeyCode.F))
this.SetVideoControlMode(VideoControlMode.Front);
this.SetVideoControlMode(VideoPlayMode.Front);
if (Input.GetKeyDown(KeyCode.P))
this.SetVideoControlMode(VideoControlMode.AutoPanorama);
this.SetVideoControlMode(VideoPlayMode.AutoPanorama);
if (!Input.GetKeyDown(KeyCode.B))
return;
this.SetVideoControlMode(VideoControlMode.Rear);
this.SetVideoControlMode(VideoPlayMode.Rear);
}
public VideoControlMode VideoControlMode { get; private set; }
public VideoPlayMode VideoControlMode { get; private set; }
private float autoCameraSwitchTimeCounter = 80f;
public void SetVideoControlMode(VideoControlMode mode)
public void SetVideoControlMode(VideoPlayMode mode)
{
if (mode == this.VideoControlMode)
return;
if (!this.AR360Version)
mode = VideoControlMode.Front;
mode = VideoPlayMode.Front;
this.VideoControlMode = mode;
this.autoCameraSwitchTimeCounter = 80f;
if (mode == VideoControlMode.AutoPanorama)
if (mode == VideoPlayMode.AutoPanorama)
return;
this.videoPlayer.IntendedRear = mode == VideoControlMode.Rear;
this.videoPlayer.IntendedRear = mode == VideoPlayMode.Rear;
}
public RiderCameraDistance RiderCameraDistance { get; set; }
public CameraDistance RiderCameraDistance { get; set; }
//更新摄像机的位置
private void UpdateCameraFollowDistance()
{
this.RiderCameraDistance = RiderCameraDistance.Middle;
this.NearViewMode = this.RiderCameraDistance == RiderCameraDistance.Near;
this.RiderCameraDistance = AR.CameraDistance.Middle;
this.NearViewMode = this.RiderCameraDistance == AR.CameraDistance.Near;
float cameraFollowDistance = GetCameraFollowDistance(this.RiderCameraDistance);
this.VideoPlayerControl.CameraFollowDistance = cameraFollowDistance;
}
protected override bool IsArObjectActive(ARObject arObject)
protected override bool IsArObjectActive(ARGameObject arObject)
{
bool flag = base.IsArObjectActive(arObject);
if ((UnityEngine.Object)arObject != (UnityEngine.Object)this.mainObject)
@ -176,17 +176,17 @@ namespace Assets.Scripts.Scenes.VideoRide
return flag && (double)this.VideoPlayerControl.CameraDistanceError > 5.0;
}
//获取摄像机的位置
public static float GetCameraFollowDistance(RiderCameraDistance distance)
public static float GetCameraFollowDistance(CameraDistance distance)
{
switch (distance)
{
case RiderCameraDistance.FirstPerson:
case AR.CameraDistance.FirstPerson:
return 0.0f;
case RiderCameraDistance.Near:
case AR.CameraDistance.Near:
return 2.5f;
case RiderCameraDistance.Middle:
case AR.CameraDistance.Middle:
return 5f;
case RiderCameraDistance.Far:
case AR.CameraDistance.Far:
return 10f;
default:
throw new ArgumentException("Unknown rider's camera distance.");
@ -248,7 +248,7 @@ namespace Assets.Scripts.Scenes.VideoRide
//更新骑手的偏移角度
private void UpdateRidersLean()
{
foreach (ARLaneObject riderObject in this.riderObjects.Values)
foreach (ARLaneGameObject riderObject in this.riderObjects.Values)
{
float num1 = this.Route.GetTrajectoryCurvature(riderObject.Frame) + riderObject.Curvature;
float z1;

2
Assets/AR/Vector3d.cs
View File

@ -80,7 +80,7 @@ namespace Assets
public static Vector3d LerpClamped(Vector3d a, Vector3d b, double t)
{
t = VTMath.Clamp01(t);
t = PFMath.Clamp01(t);
return Vector3d.Lerp(a, b, t);
}

2
Assets/Models/ViewPlayer.controller
View File

@ -32,7 +32,7 @@ AnimatorStateTransition:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: speed
m_EventTreshold: 0
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2690597925175035265}
m_Solo: 0

1787
Assets/Resources/UI/Prefab/AR/CancelPanel.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/UI/Prefab/AR/CancelPanel.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 16b6b676346aaae4599661ec416e36ba
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Resources/UI/Prefab/AR/LoadingPanel.prefab
View File

@ -1637,7 +1637,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3007624748412546454}
m_Enabled: 1
m_Alpha: 0
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0

11
Assets/Resources/UI/Prefab/AR/VidePlayer.prefab
View File

@ -3675,7 +3675,7 @@ GameObject:
- component: {fileID: 2162915128657393134}
- component: {fileID: 1841566136631317502}
- component: {fileID: 1841566136631316992}
- component: {fileID: 7118383410524510623}
- component: {fileID: 3611148035918924976}
m_Layer: 0
m_Name: VidePlayer
m_TagString: Untagged
@ -4032,7 +4032,8 @@ MonoBehaviour:
totalClimb: 0
currentIndex: 0
bearing: 0
--- !u!114 &7118383410524510623
IsStart: 0
--- !u!114 &3611148035918924976
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -4050,10 +4051,8 @@ MonoBehaviour:
PositionOffset: {x: 0, y: 0, z: 0}
RotationOffset: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
StartPosition: 0
TestPower: 500
wheelFront: {fileID: 6089162587112974816}
wheelRear: {fileID: 5665119758069145564}
wheelFront: {fileID: 0}
wheelRear: {fileID: 0}
--- !u!1 &1540924146250517987
GameObject:
m_ObjectHideFlags: 0

2
Assets/Resources/UI/Prefab/GameRoom/GameRoomMapItem.prefab
View File

@ -3125,7 +3125,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 80ca2c4b44afce842834c2afcb41da14, type: 3}
m_Sprite: {fileID: 21300000, guid: e67d070f35d1a9f4796e8d67fa17b2af, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

26
Assets/Resources/UI/Prefab/Panel/GameRoomListPanel.prefab
View File

@ -2750,7 +2750,7 @@ MonoBehaviour:
m_ScrollSensitivity: 50
m_Viewport: {fileID: 5195470952481441617}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 4068819566306428287}
m_HorizontalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 1
m_HorizontalScrollbarSpacing: -3
@ -17019,10 +17019,10 @@ RectTransform:
m_Father: {fileID: 7055447207513649608}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.1155889}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_AnchoredPosition: {x: -0.069000006, y: 0.23300171}
m_SizeDelta: {x: 10.188904, y: -3.2523804}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3296896121850349645
CanvasRenderer:
@ -17060,7 +17060,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 2
--- !u!1 &4860149725120165892
GameObject:
m_ObjectHideFlags: 0
@ -17845,7 +17845,7 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 0.23921569, g: 0.24313726, b: 0.3019608, a: 1}
m_NormalColor: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
@ -21174,8 +21174,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_AnchoredPosition: {x: 0, y: -0.000030517578}
m_SizeDelta: {x: -12, y: -0.000030517578}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6090952175355431170
GameObject:
@ -22742,8 +22742,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 6, y: 0}
m_AnchoredPosition: {x: -1, y: 0}
m_SizeDelta: {x: 12.04053, y: -13.69861}
m_Pivot: {x: 1, y: 1}
--- !u!222 &4917913218158151159
CanvasRenderer:
@ -22781,7 +22781,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 3
--- !u!114 &4068819566306428287
MonoBehaviour:
m_ObjectHideFlags: 0
@ -22824,8 +22824,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 6952554627092647068}
m_HandleRect: {fileID: 3601439425270914808}
m_Direction: 2
m_Value: 1
m_Size: 0.8844111
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:

2400
Assets/Resources/UI/Prefab/Panel/RideSettingPanel.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/UI/Prefab/Panel/RideSettingPanel.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2455ebbb22ebe754fb70b974c157e685
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

10459
Assets/Scenes/VideoPlay.unity
View File

File diff suppressed because it is too large Load Diff

3
Assets/Scripts/Scenes/Ride/Model/CyclingModels/ARSingleModel.cs
View File

@ -54,6 +54,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
#region 获取当前路线在线用户
riders.Clear();
var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id).ToList();
onlineUsers = onlineUsers.Where(c => !c.Saved).ToList();
foreach (var item in onlineUsers)
{
riders.Add(new OnlineRiderModel()
@ -68,6 +69,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
Sex = item.Sex,
FrameRate = item.FrameRate,
Speed = item.Speed,
IsWatcher = item.IsWatcher,
Saved = item.Saved
});
}
#endregion

3
Assets/Scripts/Scenes/Ride/Model/RiderModels/OnlineRiderModel.cs
View File

@ -21,6 +21,9 @@ namespace Assets.Scenes.Ride.Scripts.Model.RiderModels
public int? FrameRate { get; set; } = 0;
public bool IsWatcher { get; set; }
public bool Saved { get; set; }
public OutUser GetOutUser(double preDistance, double currentDistance, TurfHelper turfHelper, CyclingStateEnum cyclingState)
{
if (this.IsSelf)

9
Assets/Scripts/Scenes/VideoRide/AbstractVideoPlayer.cs
View File

@ -70,16 +70,7 @@ namespace Assets.Scripts.Scenes.VideoRide
manager = FindObjectOfType<VideoGameManager>();
mapData = manager.GetMapData();
ComputeNextSlope();//初始化坡度等
if (speed > 0)
{
animator.Play("rideLoop");
}
else
{
animator.Play("idle");
}
bone_bottle_2 = transform.Find("bone_cable_20");
}
protected virtual void Update()
{

23
Assets/Scripts/Scenes/VideoRide/ElevationBarDataFeed.cs
View File

@ -2,6 +2,7 @@
using System;
using System.Linq;
using UnityEngine;
using Assets.Scenes.Ride.Scripts.Model.RiderModels;
namespace Assets.Scripts.Scenes.VideoRide
{
@ -56,6 +57,7 @@ namespace Assets.Scripts.Scenes.VideoRide
if (manager.cyclingController == null)
return;
var players = manager.cyclingController.riders;
players = players.Where(c => ((OnlineRiderModel)c).IsWatcher == false).ToList();
var headList = FindObjectsOfType<HeadScript>();
var videoPlayer = manager.CurrentPlayer;
foreach (var item in players)
@ -73,20 +75,23 @@ namespace Assets.Scripts.Scenes.VideoRide
var onlineHead = Instantiate(headPanel, transform);
onlineHead.GetComponent<HeadScript>().UserId = item.UserId;
onlineHead.transform.position = vector3;
if (item.IsSelf)
{
onlineHead.transform.Find("Main").gameObject.SetActive(true);
onlineHead.transform.SetAsLastSibling();
}
else
{
onlineHead.transform.SetAsFirstSibling();
}
currentHead = onlineHead.GetComponent<HeadScript>();
}
else
{
currentHead.transform.position = vector3;
}
//控制海拔图头像
if (manager.CurrentPlayer.userId == item.UserId)
{
currentHead.transform.Find("Main").gameObject.SetActive(true);
currentHead.transform.SetAsLastSibling();
}
else
{
currentHead.transform.Find("Main").gameObject.SetActive(false);
currentHead.transform.SetAsFirstSibling();
}
}
//删除离线的人
foreach (var item in headList)

37
Assets/Scripts/Scenes/VideoRide/InitMiniMapScript.cs
View File

@ -56,7 +56,7 @@ namespace Assets.Scripts.Scenes.VideoRide
trail.startColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 1f);
trail.endColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 1f);
}
float timer = 0f;
private void Update()
{
if (cyclingCotroller.CurrentPlayer != null)
@ -69,6 +69,14 @@ namespace Assets.Scripts.Scenes.VideoRide
Vector2 vp2 = _minicamera.WorldToViewportPoint(_player.transform.localPosition);//将三维物体的世界坐标转换为视口坐标
((RectTransform)tr.transform).anchoredPosition = new Vector2((vp2.x * RectRoot.sizeDelta.x) - (RectRoot.sizeDelta.x * 0.5f), (vp2.y * RectRoot.sizeDelta.y) - (RectRoot.sizeDelta.y * 0.5f));
trail.enabled = cyclingCotroller.CurrentPlayer.power > 0;
timer += Time.deltaTime;
while (timer >= 1)
{
CreateMiniPath();
timer = 0;
}
}
}
@ -157,6 +165,33 @@ namespace Assets.Scripts.Scenes.VideoRide
CreateLineRender(feat);//创建小地图路线
}
}
void CreateMiniPath()
{
var dat = new List<Vector3>();
var mapData = cyclingCotroller.GetMapData();
if (mapData != null)
{
var count = mapData.List.Count;
var interval = Math.Max(Math.Ceiling(count / 100D), 1f);
for (int i = 0; i < mapData.List.Count; i++)
{
if (i % interval == 0)
{
var point = mapData.List[i].Point;
Vector3 item = _map.GeoToWorldPosition(new Vector2d(point[0], point[1]));
item.y += 5f;
if (cyclingCotroller.CurrentPlayer.currentIndex >= i)
{
dat.Add(item);
}
}
}
var feat = new VectorFeatureUnity();
feat.Points.Add(dat);
CreateRedLineRender(feat);//创建小地图路线
}
}
//创建小地图路线
void CreateLineRender(VectorFeatureUnity feat)
{

9
Assets/Scripts/Scenes/VideoRide/ListItem.cs
View File

@ -29,10 +29,7 @@ namespace Assets.Scripts.Scenes.VideoRide
private void Start()
{
manager = FindObjectOfType<VideoGameManager>();
if (manager._aRMode == VideoGameManager.ARMode.INSPECT)
{
GetComponent<Button>().onClick.AddListener(ButtonListener);
}
GetComponent<Button>().onClick.AddListener(ButtonListener);
}
private float timer = 1f;
private void Update()
@ -80,8 +77,8 @@ namespace Assets.Scripts.Scenes.VideoRide
}
private void ButtonListener()
{
manager.ChangePlayer(Convert.ToInt32(Id));
if(manager._aRMode == VideoGameManager.ARMode.INSPECT)
manager.ChangePlayer(Convert.ToInt32(Id));
}
}
}

2
Assets/Scripts/Scenes/VideoRide/NearByScript.cs
View File

@ -1,5 +1,6 @@
using Assets.Scenes.Ride.Scripts;
using DG.Tweening;
using System.Linq;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
@ -60,6 +61,7 @@ namespace Assets.Scripts.Scenes.VideoRide
timer -= Time.deltaTime;
while (timer < 0) {
var list = MapUDPService.GetOnlineUsers(App.RouteIdParam);//最新列表
list = list.Where(c => c.IsWatcher == false).ToList();
rideNum.text = $"{list.Count}";
btnRideNum.text = rideNum.text;
if (manager._aRMode == VideoGameManager.ARMode.RIDE)

3
Assets/Scripts/Scenes/VideoRide/NearVideoPlayerList.cs
View File

@ -1,4 +1,5 @@
using Assets.Scenes.Ride.Scripts;
using Assets.Scenes.Ride.Scripts.Model.RiderModels;
using PolyAndCode.UI;
using System;
using System.Collections.Generic;
@ -48,6 +49,7 @@ namespace Assets.Scripts.Scenes.VideoRide
{
if (_contactList != null) _contactList.Clear();
var list = MapUDPService.GetOnlineUsers(App.RouteIdParam);
list = list.Where(c => c.IsWatcher == false).ToList();
var currentPlayer = list.Where(c => c.IsSelf).FirstOrDefault();
list = list.Where(c => c.Id != App.CurrentUser.Id).ToList();
foreach (var item in list)
@ -73,6 +75,7 @@ namespace Assets.Scripts.Scenes.VideoRide
var currentDistance = manager.CurrentPlayer.totalDistance;
var currenList = GetComponentsInChildren<ListItem>(true);
var list = MapUDPService.GetOnlineUsers(App.RouteIdParam,manager.cyclingController.recorderData.RoomId);//最新列表
list = list.Where(c => c.IsWatcher == false).ToList();
var currentPlayerInfo = list.Where(c => c.Id.ToString() == manager.CurrentPlayer.UserId.ToString()).FirstOrDefault();
list = list.Where(c => c.Id != App.CurrentUser.Id).OrderByDescending(c=>c.EndDistance).ToList();
if (currenList.Count() == 0 && list.Count() > 0)

25
Assets/Scripts/Scenes/VideoRide/RideSettingController.cs Normal file
View File

@ -0,0 +1,25 @@
using UnityEngine;
using UnityEngine.UI;
namespace Assets.Scripts.Scenes.VideoRide
{
public class RideSettingController : PFUIPanel
{
public Slider PowerSlider;
public Text PowerText;
private VideoGameManager manager;
// Start is called before the first frame update
void Start()
{
manager = FindObjectOfType<VideoGameManager>();
PowerSlider.onValueChanged.AddListener(e =>
{
PowerText.text = e.ToString("f0") + "W";
if (manager.CurrentPlayer != null)
{
manager.CurrentPlayer.mockpower = e;
}
});
}
}
}

11
Assets/Scripts/Scenes/VideoRide/RideSettingController.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8c630a81d1477c842ad1599135a73d2d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

74
Assets/Scripts/Scenes/VideoRide/VideoGameManager.cs
View File

@ -63,8 +63,8 @@ namespace Assets.Scripts.Scenes.VideoRide
public ARMode _aRMode { get; set; }
public int RankingId { get; set; }
public Dictionary<IRider,RiderRenderer> rideObjs = new Dictionary<IRider, RiderRenderer>();
public Dictionary<IRider, PlayerRenderer> rideObjs = new Dictionary<IRider, PlayerRenderer>();
protected override void Awake()
{
base.Awake();
@ -83,7 +83,7 @@ namespace Assets.Scripts.Scenes.VideoRide
Player_NV = Resources.Load<GameObject>("UI/Prefab/AR/VidePlayer_NV");
StartCoroutine(Init());
}
void Start()
{
UIManager.Instance.MainPanel = GetCanvasTransform().GetComponent<PFUIPanel>();
@ -93,7 +93,7 @@ namespace Assets.Scripts.Scenes.VideoRide
GetMapRoute();
GetMapData();
route = new Route(mapData, mapRoute);
if (selectParamModel == null)
{
selectParamModel = new RouteResultParam
@ -129,7 +129,7 @@ namespace Assets.Scripts.Scenes.VideoRide
cyclingController.Run(null);
var onlineRiders = cyclingController.riders;
try
{
{
CreateOnlineUser(onlineRiders);
}
catch (Exception e)
@ -144,8 +144,8 @@ namespace Assets.Scripts.Scenes.VideoRide
{
var endTime = UIManager.Now == null ? DateTime.Now : UIManager.Now.GetDateTime();
var startTime = Helper.GetStartTime(endTime, type);
var list = ConfigHelper.mapApi.GetRouteRanking(App.RouteIdParam, "1", 0, 10, "", startTime,endTime);
if (list.result)
var list = ConfigHelper.mapApi.GetRouteRanking(App.RouteIdParam, "1", 0, 10, "", startTime, endTime);
if (list.result)
{
rankingList = list.data;
}
@ -158,14 +158,24 @@ namespace Assets.Scripts.Scenes.VideoRide
//创建当前线路其他选手
private void CreateOnlineUser(List<BaseRider> list)
{
list = list.Where(c => ((OnlineRiderModel)c).IsWatcher == false).ToList();
if (list == null || list.Count == 0)
{
var currentList = FindObjectsOfType<RiderRenderer>();
var currentList = FindObjectsOfType<PlayerRenderer>();
foreach (var item in currentList)
{
item.Speed = 0;
item.Paused = true;
}
rideObjs.Clear();
visibleRiders.Clear();
//移除退出的选手
var onlineUserList = FindObjectsOfType<OnlineVideoPlayer>();
foreach (var item in onlineUserList)
{
DestroyImmediate(item.gameObject);
}
CurrentPlayer = null;
return;
}
var trainController = GetComponent<ARTrainingController>();
@ -182,7 +192,14 @@ namespace Assets.Scripts.Scenes.VideoRide
}
}
var currentPlayerInfo = list.Where(c => c.IsSelf).FirstOrDefault();
var needUpdateList = list.OrderByDescending(c=>c.IsSelf).ToList();
var needUpdateList = list.OrderByDescending(c => c.IsSelf).ToList();
//如果当前为观察者模式且currentPlayerInfo为null随机选择以为用户观察
if (currentPlayerInfo == null)
{
currentPlayerInfo = needUpdateList.Where(c => c.UserId == currentUserId).FirstOrDefault();
if(currentPlayerInfo == null)
currentPlayerInfo = needUpdateList.FirstOrDefault();
}
foreach (var item in needUpdateList)
{
var onlineRider = item as OnlineRiderModel;
@ -191,11 +208,11 @@ namespace Assets.Scripts.Scenes.VideoRide
if (visibleItem != null)
{
visibleItem.SetPlayer(onlineRider.NickName, onlineRider.Speed, onlineRider.PreDistance, onlineRider.EndDistance, item.Cadence, item.HeartRate, onlineRider.WeightKg, item.UserId, onlineRider.Power, currentPlayerInfo.EndDistance, onlineRider.FrameRate.Value);
if(visibleItem.userId == currentUserId)
CurrentPlayer = visibleItem;
}
else
{
if (currentPlayerInfo == null)
return;
var diff = item.EndDistance % mapData.TotalDistance - currentPlayerInfo.EndDistance % mapData.TotalDistance;
if (Math.Abs(diff * 1000) <= MaxVisibleDistance)
{
@ -211,14 +228,17 @@ namespace Assets.Scripts.Scenes.VideoRide
obj = Instantiate(OnlinePlayer_NV, transform);
}
var online = obj.GetComponentInChildren<OnlineVideoPlayer>();
var rideObj = obj.GetComponentInChildren<RiderRenderer>();
var rideObj = obj.GetComponentInChildren<PlayerRenderer>();
online.SetStartDistance(item.EndDistance);
rideObj.Distance = (float)online.StartDistance;
rideObj.RouteDistance = rideObj.Distance;
rideObj.UserId = item.UserId;
rideObjs.Add(online, rideObj);
visibleRiders.Add(online);
trainController.AddRider(onlineRider);
online.SetPlayer(onlineRider.NickName, onlineRider.Speed, onlineRider.PreDistance, onlineRider.EndDistance, item.Cadence, item.HeartRate, onlineRider.WeightKg, item.UserId, onlineRider.Power, currentPlayerInfo.EndDistance, onlineRider.FrameRate.Value);
if (currentPlayerInfo.UserId == item.UserId)
CurrentPlayer = online;
}
else
{
@ -238,10 +258,11 @@ namespace Assets.Scripts.Scenes.VideoRide
vp.SetEndDistance(item.EndDistance);
CurrentPlayer.SetStartDistance(item.EndDistance);
var rideObj = videoPlayer.GetComponent<RiderRenderer>();
var rideObj = videoPlayer.GetComponent<PlayerRenderer>();
rideObj.Distance = (float)CurrentPlayer.StartDistance;
rideObj.RouteDistance = rideObj.Distance;
rideObj.IsMain = true;
rideObj.UserId = item.UserId;
rideObjs.Add(CurrentPlayer, rideObj);
visibleRiders.Add(CurrentPlayer);
@ -271,33 +292,11 @@ namespace Assets.Scripts.Scenes.VideoRide
}
public GameObject videoPlayer;
public GameObject target;
private int currentUserId { get; set; }
//切换人物 TODO:替换写法
public void ChangePlayer(int userId)
{
var players = FindObjectsOfType<OnlineVideoPlayer>();
if (players != null)
{
CurrentPlayer = players.Where(c => c.UserId == userId).FirstOrDefault();
if (CurrentPlayer == null)
{
var onlineRiders = cyclingController.riders;
var currentPlayer = onlineRiders.Where(c => c.UserId == userId).FirstOrDefault();
if (currentPlayer != null)
{
var onlineRider = currentPlayer as OnlineRiderModel;
var obj = Instantiate(OnlinePlayer, transform);
var online = obj.GetComponent<OnlineVideoPlayer>();
online.SetPlayer(onlineRider.NickName, onlineRider.Speed,onlineRider.PreDistance, onlineRider.EndDistance, onlineRider.Cadence, onlineRider.HeartRate, 0, onlineRider.UserId, onlineRider.Power, onlineRider.EndDistance, onlineRider.FrameRate.Value);
CurrentPlayer = online;
}
var clearList = players.Where(c => c.UserId != userId);
foreach (var item in clearList)
{
item.Destroy();
}
}
}
currentUserId = userId;
}
//获取角色头顶信息预制件
public GameObject GetHeadInfo()
@ -315,6 +314,7 @@ namespace Assets.Scripts.Scenes.VideoRide
Debug.Log("selectParamModel"+ selectParamModel.ContinueMark);
SetCyclingModel(CyclingModel.Single);
endDistance = routeResult.EndDistance;
App.routeResult = null;
//mediaPlayer.Control.SeekToFrame(routeResult.LastFrame ?? 0);
}
}

14
Assets/Scripts/Scenes/VideoRide/VideoLoading.cs
View File

@ -48,7 +48,7 @@ namespace Assets.Scripts.Scenes.VideoRide
protected RawImage head;
protected RawImage country;
protected RawImage mapCountry;
protected RawImage altitudeGraph;
protected RawImage altitudeGraph { get; set; }
protected Transform mapRanking;
protected Text mapId;
@ -121,7 +121,7 @@ namespace Assets.Scripts.Scenes.VideoRide
if (File.Exists(filepath))
{
//TODO:暂时隐藏watch.SetActive(true);
watch.SetActive(true);
slider.value = 100;
download.gameObject.SetActive(false);
manager.SetMedia(filepath);
@ -208,7 +208,7 @@ namespace Assets.Scripts.Scenes.VideoRide
mapCountry.texture = manager.GetCountryImageByCode(route.CountryCode);//路书国家
}
#endregion
Utils.DisplayImage(altitudeGraph, route.AltitudeGraph,true,null,1f);//渲染海拔图
//显示线路背景图
DrawMapRouteAsync(route.Id);
//查询排行榜 TODO优化
@ -263,9 +263,7 @@ namespace Assets.Scripts.Scenes.VideoRide
};
UIManager.ShowGameRoomCountDownPanel(seconds,()=> {
manager.StartGame();
//manager.SetCyclingModel(CyclingModel.GameRoom);
//manager.SetCurrentMode(VideoGameManager.ARMode.RIDE);
});
},false,true);
}
protected async void DownloadAsync(BaseEventData baseEvent)
@ -315,10 +313,14 @@ namespace Assets.Scripts.Scenes.VideoRide
{
var canvasGroup = transform.GetComponent<CanvasGroup>();
var ui = manager.GetCanvasTransform();
InitAR();
MapUDPService.IsWatch = true;
MapUDPService.SendGizpModel();
canvasGroup.DOFade(0, 1).onComplete += () => {
gameObject.SetActive(false);
ui.gameObject.SetActive(true);
manager.SetCurrentMode(VideoGameManager.ARMode.INSPECT);
manager.StartGame();
};
}
protected void Cancel(BaseEventData baseEvent)

2
Assets/Scripts/Scenes/VideoRide/VideoPlayer.cs
View File

@ -63,7 +63,7 @@ namespace Assets.Scripts.Scenes.VideoRide
{
power = mockpower;
cadance = 50;
heartRate = 120;
heartRate = 160;
}
//#endif
weight = App.CurrentUser.Weight;

67
Assets/Scripts/Scenes/VideoRide/VideoUIManager.cs
View File

@ -7,6 +7,7 @@ using DG.Tweening;
using UnityEngine.SceneManagement;
using Assets.Scenes.Ride.Scripts.Model.CyclingModels;
using static Assets.Scripts.Scenes.VideoRide.VideoGameManager;
using Assets.AR;
namespace Assets.Scripts.Scenes.VideoRide
{
@ -52,9 +53,6 @@ namespace Assets.Scripts.Scenes.VideoRide
Image ftpImage { get; set; }
Text wkg { get; set; }
public Text PowerText;
public Slider PowerSlider;
// Start is called before the first frame update
void Start()
{
@ -69,14 +67,10 @@ namespace Assets.Scripts.Scenes.VideoRide
{
mapName.text = manager.GetMapRoute().Name;
//#if UNITY_EDITOR
//infoText.gameObject.SetActive(true);
//infoText.text = $"帧数：{manager.GetCurrentFrame()}";
//#endif
if (manager.CurrentPlayer != null)
{
power.text = Math.Round(manager.CurrentPlayer.power).ToString();
speed.text = Math.Round(manager.CurrentPlayer.speed).ToString();
speed.text = manager.CurrentPlayer.speed.ToString("f1");
heartRate.text = Math.Round((manager.CurrentPlayer.heartRate ?? 0d)).ToString();
cadance.text = Math.Round(manager.CurrentPlayer.cadance).ToString();
playerTimer.text = Helper.FormatTicks(manager.CurrentPlayer.ticks);
@ -84,13 +78,33 @@ namespace Assets.Scripts.Scenes.VideoRide
left.fillAmount = (float)(Math.Round(manager.CurrentPlayer.power) / MAXPOWER_RATE);
right.fillAmount = (float)(Math.Round((manager.CurrentPlayer.heartRate ?? 0f)) / MAXHEARRATE);
SetSlopePanel();
//ftp
ftpImage.fillAmount = (float)(manager.CurrentPlayer.wkg / MAXWKG);
wkg.text = $"{manager.CurrentPlayer.wkg}w/kg";
//explosive.SetActive(true);TODO：心率过高的时候显示
//心率过高的时候显示
if (manager.CurrentPlayer.UserId == App.CurrentUser.Id)
{
explosive.SetActive(ComputeHearRateRatio(manager.CurrentPlayer.heartRate ?? 0) > MAX_HEART_RATIO);
}
else
{
explosive.SetActive(false);
}
}
}
}
private const float MAX_HEART_RATIO = 0.9f;
private float ComputeHearRateRatio(int heartRate)
{
// 220 - 年龄= 最大心率 ratio = heartRate /最大心率
var age = DateTime.Now.Year - App.CurrentUser.Birthday?.Year;
if (DateTime.Now.Month - App.CurrentUser.Birthday?.Month > 0 && DateTime.Now.Day - App.CurrentUser.Birthday?.Day > 0)
{
age += 1;
}
age = age ?? 0;
var ratio = heartRate / (220 - age);
return (float)ratio;
}
public void SetCurrentMode(VideoGameManager.ARMode aRMode)
{
@ -142,15 +156,11 @@ namespace Assets.Scripts.Scenes.VideoRide
//
explosive = transform.Find("Panel/Explosive").gameObject;
//toolbar 事件注册
UIManager.AddEvent(settingBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, PauseClick);
UIManager.AddEvent(settingBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShowSetting);
UIManager.AddEvent(changeViewBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, ChangeViewClick);
UIManager.AddEvent(deviceBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, DeviceClick);
UIManager.AddEvent(quitBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, QuitClick);
PowerSlider.onValueChanged.AddListener(e =>
{
PowerText.text = e.ToString("f0") + "W";
manager.CurrentPlayer.mockpower = e;
});
}
//设置坡度信息
private void SetSlopePanel()
@ -188,10 +198,9 @@ namespace Assets.Scripts.Scenes.VideoRide
}
}
private void PauseClick(BaseEventData e)
private void ShowSetting(BaseEventData e)
{
settingPanel.SetActive(true);
settingPanel.transform.SetAsLastSibling();
UIManager.ShowRideSettingPanel();
}
private void DeviceClick(BaseEventData e)
{
@ -200,21 +209,27 @@ namespace Assets.Scripts.Scenes.VideoRide
private void ChangeViewClick(BaseEventData e)
{
var videoPlayer = FindObjectOfType<VideoPlayer>();
var nearByScript = FindObjectOfType<NearByScript>();
var rankingScript = FindObjectOfType<RankingScript>();
var currentPlayer = manager.CurrentPlayer == null ? videoPlayer.transform : manager.CurrentPlayer.transform;
manager._viewMode = manager._viewMode == ViewMode.THIRD ? ViewMode.FIRST : ViewMode.THIRD;
var arController = FindObjectOfType<ARTrainingController>();
var cameraImage = changeViewBtn.transform.Find("Camera").gameObject;
manager._viewMode = manager._viewMode == ViewMode.THIRD ? ViewMode.FIRST : ViewMode.THIRD;
if (manager._viewMode == ViewMode.FIRST)
{
currentPlayer.DOMoveX(0f, 0f);
currentPlayer.DOMoveZ(-0.1f, 0f);
currentPlayer.DOMoveY(-0.85f, 0f);
ftpPanel.SetActive(true);
nearByScript.Hidehandler(null);
rankingScript.Hidehandler(null);
cameraImage.SetActive(true);
arController.RiderCameraDistance = CameraDistance.FirstPerson;
}
else
{
ftpPanel.SetActive(false);
nearByScript.Showhandler(null);
rankingScript.Showhandler(null);
cameraImage.SetActive(false);
arController.RiderCameraDistance = CameraDistance.Middle;
}
}
@ -249,7 +264,7 @@ namespace Assets.Scripts.Scenes.VideoRide
}
private void QuitClick(BaseEventData e)
{
if (manager.CurrentPlayer.UserId == App.CurrentUser.Id && (manager.CurrentPlayer.ticks == 0 || manager.CurrentPlayer.EndDistance - manager.CurrentPlayer.StartDistance < 0.1f))
if (manager.CurrentPlayer != null && manager.CurrentPlayer.UserId == App.CurrentUser.Id && (manager.CurrentPlayer.ticks == 0 || manager.CurrentPlayer.EndDistance - manager.CurrentPlayer.StartDistance < 0.1f))
{
UIManager.ShowConfirm("Quit", App.GetLocalString("Current ride distance too short to save."), () => {
UIManager.CloseConfirm();

18
Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownLoad.cs
View File

@ -43,15 +43,15 @@ class GameRoomDownLoad : MonoBehaviour
{
gameObject.SetActive(false);
downLoadList.SetActive(true);
var content = downLoadList.transform.Find("Viewport/Content");
var list = FindObjectsOfType<GameRoomDownloadTask>();
//新增
var obj = list.Where(c => c.RoomId == RoomId).FirstOrDefault();
if (obj == null)
{
var newtask = Instantiate(downLoadTask, content);
newtask.GetComponent<GameRoomDownloadTask>().Init(RoomId, FileName,gameObject);
}
//var content = downLoadList.transform.Find("Viewport/Content");
//var list = FindObjectsOfType<GameRoomDownloadTask>();
////新增
//var obj = list.Where(c => c.RoomId == RoomId).FirstOrDefault();
//if (obj == null)
//{
// var newtask = Instantiate(downLoadTask, content);
// newtask.GetComponent<GameRoomDownloadTask>().Init(RoomId, FileName,gameObject);
//}
});
UIManager.AddEvent(enterBtn, EventTriggerType.PointerClick, (ee) =>

2
Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownloadTask.cs
View File

@ -26,7 +26,7 @@ class GameRoomDownloadTask : MonoBehaviour
{
modal.SetActive(true);
modal.GetComponent<GameRoomDownLoad>().ComeIntoStep2(FileName);
transform.parent.parent.parent.gameObject.SetActive(false);
//transform.parent.parent.parent.gameObject.SetActive(false);
});
}

3
Assets/Scripts/UI/Prefab/GameRoom/GameRoomMapItem.cs
View File

@ -108,7 +108,8 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
var tabContainer = transform.Find("TabContainer");
var diff = tabContainer.Find("Diff");
diff.Find("Text").GetComponent<Text>().text = myMap.Hard;
tabContainer.Find("3d").gameObject.SetActive(myMap.Enable3D);
tabContainer.Find("3d").gameObject.SetActive(myMap.Enable3D && !myMap.EnableAR);
tabContainer.Find("AR").gameObject?.SetActive(myMap.EnableAR);
tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(myMap.CountryCode);
//if (!isModal)
//{

14
Assets/Scripts/UI/Prefab/Panel/GameRoomCountDownController.cs
View File

@ -23,12 +23,13 @@ public class GameRoomCountDownController : PFUIPanel
{
base.Show();
}
public void Init(int seconds,Action action,bool isEnd = false)
private bool isSimple { get; set; }
public void Init(int seconds,Action action,bool isEnd = false,bool isSimple = false)
{
Seconds = seconds;
Callback = action;
endCount.gameObject.SetActive(isEnd);
this.isSimple = isSimple;
}
public override void Close()
@ -52,7 +53,14 @@ public class GameRoomCountDownController : PFUIPanel
}
else
{
count.text = Helper.FormatTicks(Seconds);
if (isSimple)
{
count.text = Seconds.ToString();
}
else
{
count.text = Helper.FormatTicks(Seconds);
}
endCount.text = Helper.FormatTicks(Seconds);
}
Seconds--;

6
Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs
View File

@ -223,7 +223,7 @@ public class GameRoomListController : PFUIPanel
MapUDPService.MessageListener = ListenerHandler;
MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, pageHelper.PageIndex, pageHelper.PageSize, seachName);
}
private List<string> fileNameList = new List<string>();
private void Update()
{
//房间已经进行骑行时间
@ -277,12 +277,12 @@ public class GameRoomListController : PFUIPanel
if (Loom.DownLoadTaskList.Count>0)
{
var content = downLoadList.transform.Find("Viewport/Content");
var taskList = FindObjectsOfType<GameRoomDownloadTask>();
foreach (var item in Loom.DownLoadTaskList)
{
var done = taskList.Where(c => c.FileName.Equals(item.Key)).Any();
var done = fileNameList.Where(c => c.Equals(item.Key)).Any();
if (!done)
{
fileNameList.Add(item.Key);
var newtask = Instantiate(_downLoadTask, content);
newtask.GetComponent<GameRoomDownloadTask>().Init(0, item.Key, downloadPanel);
}

22
Assets/Scripts/UIManager.cs
View File

@ -17,6 +17,7 @@ using Assets.Scenes.Ride.Scripts;
using UnityEngine.SceneManagement;
using System.Threading;
using Assets.Scripts.Devices.Ant;
using Assets.Scripts.Scenes.VideoRide;
public class UIManager : MonoBehaviour
{
@ -132,7 +133,16 @@ public class UIManager : MonoBehaviour
return this.GetPanelInstance("GameRoomCountDown", ref this.mGameRoomCountDownController);
}
}
private RideSettingController mRideSettingController;
public RideSettingController RideSettingController
{
get
{
return this.GetPanelInstance("RideSettingPanel", ref this.mRideSettingController);
}
}
private SettingContoller mSettingContoller;
public SettingContoller SettingModal
{
@ -882,14 +892,20 @@ public class UIManager : MonoBehaviour
{
UIManager.Show(UIManager.Instance.GameRoomLoadingPanel, null, true);
}
public static void ShowGameRoomCountDownPanel(int seconds,Action action,bool isEnd = false)
//显示关门时间倒计时
public static void ShowGameRoomCountDownPanel(int seconds,Action action,bool isEnd = false, bool isSimple = false)
{
if (UIManager.Instance.GameRoomCountDownPanel!= null)
{
UIManager.Instance.GameRoomCountDownPanel.Init(seconds, action, isEnd);
UIManager.Instance.GameRoomCountDownPanel.Init(seconds, action, isEnd, isSimple);
}
UIManager.Show(UIManager.Instance.GameRoomCountDownPanel, null, true);
}
//显示骑行设置面板
public static void ShowRideSettingPanel()
{
UIManager.Show(UIManager.Instance.RideSettingController, null, true);
}
public static void ShowDevicePanel()
{
UIManager.Show(UIManager.Instance.DevicePanel, null, true);

2
Assets/Scripts/Utils/Davinci.cs
View File

@ -474,7 +474,7 @@ public class Davinci : MonoBehaviour
break;
color = image.color;
maxAlpha = color.a;
maxAlpha = Math.Max(color.a, 1);
if (fadeTime > 0)
{

4
Assets/Scripts/Utils/Utils.cs
View File

@ -378,12 +378,12 @@ namespace Assets.Scripts
}
public static Dictionary<string, Texture> propTextureCache = new Dictionary<string, Texture>();
public delegate Coroutine StartCoroutine(IEnumerator routine);
public static void DisplayImage(MaskableGraphic img, string url, bool cache = true,Dictionary<string,Texture> caches = null)
public static void DisplayImage(MaskableGraphic img, string url, bool cache = true,Dictionary<string,Texture> caches = null,float fadeTime = 0)
{
if (string.IsNullOrEmpty(url))
return;
Davinci.get().load(url).setCached(cache).into(img).setFadeTime(0).start();
Davinci.get().load(url).setCached(cache).into(img).setFadeTime(fadeTime).start();
return;
//可以考虑缓存到硬盘里
//Texture2D tex = null;

3
ProjectSettings/EditorBuildSettings.asset
View File

@ -17,7 +17,4 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/VideoPlay.unity
guid: f25b9f482e27079448d130ae1ed0ea34
- enabled: 1
path: Assets/Scenes/TestVideoPlay.unity
guid: b5f405e85b6fce54eb64e445b8a7997f
m_configObjects: {}