对战AR
This commit is contained in:
lishuo committed
1 parent
509c309252
commit
11b131b24a
60 files changed
+2505
-632
No files matched your search
@@ -105,7 +105,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
|
||||
MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId,
|
||||
new double[] { lastData._Lat, lastData._Lon },
|
||||
recorderData.IsCompleted, false, recorderData.EndDistance,
|
||||
true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, 0, lastData._Power, lastData._Cadence, lastData.Ticks, (lastData._FrameRate??0),roomId: (recorderData.RoomId??0));
|
||||
true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, 0, lastData._Power, lastData._Cadence, lastData.Ticks, (lastData._FrameRate??0),roomId: recorderData.RoomId);
|
||||
}
|
||||
else if (recorderData.EndDistance > 0)//没有骑，但是有初始位置的情况
|
||||
{
|
||||
|
||||
@@ -29,8 +29,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
|
||||
StartTime = DateTime.Now,//UIManager.Now.GetDateTime(),//DateTime.Now
|
||||
selectParam = param,
|
||||
RoomId = App.gameRoomDetail.RoomId,
|
||||
};
|
||||
|
||||
};
|
||||
App.gameRoomDetail = null;
|
||||
if (param != null)
|
||||
{
|
||||
recorderData.EndDistance = param.EndDistance;
|
||||
@@ -55,7 +55,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
|
||||
{
|
||||
#region 获取当前路线在线用户
|
||||
riders.RemoveAll(r => r.IsSelf == false);
|
||||
var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id,App.gameRoomDetail.RoomId).Where(d => d.IsSelf == false)
|
||||
var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id, recorderData.RoomId).Where(d => d.IsSelf == false)
|
||||
.ToList();
|
||||
foreach (var item in onlineUsers)
|
||||
{
|
||||
|
||||
@@ -44,7 +44,9 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
}
|
||||
public class ExtendInfo
|
||||
{
|
||||
public int TotalTicks { get; set; }
|
||||
public int RoomId { get; set; }
|
||||
public int FrameRate { get; set; }
|
||||
public int UserId { get; set; }
|
||||
public static ExtendInfo Parse(string s)
|
||||
{
|
||||
@@ -55,6 +57,8 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
{
|
||||
UserId = Convert.ToInt32(info[0]),
|
||||
RoomId = Convert.ToInt32(info[1]),
|
||||
FrameRate = Convert.ToInt32(info[2]),
|
||||
TotalTicks = Convert.ToInt32(info[3]),
|
||||
};
|
||||
return ex;
|
||||
}
|
||||
@@ -576,8 +580,10 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
|
||||
public string WatchIdList { get; set; }
|
||||
|
||||
public int? FrameRate { get; set; }
|
||||
public int FrameRate { get; set; }
|
||||
public int? RoomId { get; set; }
|
||||
|
||||
public int GameRoomTotal { get; set; }
|
||||
public List<GameRoomModel> RoomList { get; set; }
|
||||
public GameRoomModel RoomDetail { get; set; }
|
||||
|
||||
@@ -746,7 +752,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
|
||||
public DateTime CreateTime { get; set; }
|
||||
|
||||
public int? FrameRate { get; set; }
|
||||
public int FrameRate { get; set; }
|
||||
|
||||
public int RoomId { get; set; }
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
|
||||
public int? LastFrame { get; set; }
|
||||
|
||||
public int? RoomId { get; set; }
|
||||
public int RoomId { get; set; }
|
||||
/// <summary>
|
||||
/// 是否已经保存成功
|
||||
/// </summary>
|
||||
|
||||
@@ -148,7 +148,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
AverageGrade = averageGrade,
|
||||
AltitudeGraph = altitudeGraph,
|
||||
FileName = fileName,
|
||||
FileUrl = fileUrl,
|
||||
FileUrl = "",//url下载的时候查询
|
||||
CommandType = 3,
|
||||
SubType = 0,
|
||||
V = 2,
|
||||
|
||||
@@ -201,14 +201,27 @@ namespace Assets.Scenes.Ride.Scripts.Network
|
||||
if (t.IndexOf('g') == 0)
|
||||
{
|
||||
var x = t.Replace("g{", "").Replace("}", "");
|
||||
//list[0,0,321313,30,5,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,213,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,:][0,0,2131,30,4,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,313,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,:][20,16652,3213,30,3,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/5/6 8:41:34:][19,16652,测试3d线路,30,2,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/5/6 1:39:57:][18,16652,测试,61,2,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/4/25 2:34:03:][17,16652,213,30,3,1217,翠屏山后山北向南,5.271609999999998,65.22760000000001,0.23308249282477278,False,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=1217,0,2022/4/25 2:20:13:]
|
||||
var li = GameRoomModel.Parse(x);
|
||||
foreach (var i in list)
|
||||
//l2[0,0,321313,30,5,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,213,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,:][0,0,2131,30,4,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,313,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,:][20,16652,3213,30,3,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/5/6 8:41:34:][19,16652,测试3d线路,30,2,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/5/6 1:39:57:][18,16652,测试,61,2,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/4/25 2:34:03:][17,16652,213,30,3,1217,翠屏山后山北向南,5.271609999999998,65.22760000000001,0.23308249282477278,False,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=1217,0,2022/4/25 2:20:13:]
|
||||
if (!string.IsNullOrEmpty(x))
|
||||
{
|
||||
i.RoomList = li;
|
||||
var index = x.IndexOf("l");
|
||||
var total = 0;
|
||||
if (index != -1)
|
||||
{
|
||||
var pageInfo = x.Substring(0, index);
|
||||
if (!string.IsNullOrEmpty(pageInfo))
|
||||
total = Convert.ToInt32(pageInfo);
|
||||
x = x.Substring(index);
|
||||
}
|
||||
var li = GameRoomModel.Parse(x);
|
||||
foreach (var i in list)
|
||||
{
|
||||
i.RoomList = li;
|
||||
i.GameRoomTotal = total;
|
||||
}
|
||||
}
|
||||
}
|
||||
//对战骑行场景中信息
|
||||
//附加信息
|
||||
if (t.IndexOf('e') == 0)
|
||||
{
|
||||
var g = t.Replace("e{", "").Replace("}", "");
|
||||
@@ -219,10 +232,11 @@ namespace Assets.Scenes.Ride.Scripts.Network
|
||||
if (string.IsNullOrEmpty(i))
|
||||
continue;
|
||||
var extendInfo = ExtendInfo.Parse(i);
|
||||
var owner = list.Where(c => c.MemberId == extendInfo.UserId).FirstOrDefault();
|
||||
var owner = list.Where(c => c.MemberId == extendInfo.UserId && c.TotoalTicks == extendInfo.TotalTicks).FirstOrDefault();
|
||||
if (owner != null)
|
||||
{
|
||||
owner.RoomId = extendInfo.RoomId;
|
||||
owner.FrameRate = extendInfo.FrameRate;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
}
|
||||
protected override void CreateList()
|
||||
{
|
||||
var roomId = cyclingController.cyclingController == null ? 0 : (cyclingController.cyclingController.recorderData.RoomId ?? 0);
|
||||
var roomId = cyclingController.cyclingController == null ? 0 : cyclingController.cyclingController.recorderData.RoomId;
|
||||
OnlineUserNum.text = " "+ MapUDPService.GetNearRiderCount(roomId).ToString();
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(OnlineUserNum.rectTransform);
|
||||
var nearList = MapUDPService.GetNearRiderData(pageIndex, pageSize, new double[] { playerController.Currentlatlong.x, playerController.Currentlatlong.y },roomId);
|
||||
|
||||
Reference in new issue
Block a user