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

AR文件更新流程&AR网络延时问题

Browse Source
This commit is contained in:
lishuo committed 2023-05-18 19:06:40 +08:00
1 parent 16cd2fd26b
commit 74ba5790f9
18 files changed
+867 -508
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Panel/GameRoomDetailController.cs
+186 -145
View File
@@ -9,8 +9,9 @@ using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using Assets.Scenes.Ride.Scripts.Model;
using UnityEngine.EventSystems;
public class GameRoomDetailController : PFUIPanel
public class GameRoomDetailController : PFUIPanel,IProgress<float>
{
public Text versionText;
public RawImage Avatar;
@@ -27,12 +28,10 @@ public class GameRoomDetailController : PFUIPanel
public Text bestTabName;
public Text bestTabTimer;
public RawImage bestTabHead;
public GameObject readyBtn;
public GameObject startBtn;
public GameObject quitBtn;
public GameObject cancelBtn;
public GameObject d2;
public GameObject d3;
public GameObject ar;
@@ -40,68 +39,80 @@ public class GameRoomDetailController : PFUIPanel
public GameRoomModel GameRoom { get; set; }
public DateTime? StartTime { get; set; }
public int Status { get; set; }
private bool isQuit = false;
private bool DataSourceChanged { get; set; }
float timer = 0f;
private bool isOwner { get; set; } = true;
private MapRoute route { get; set; }
protected override void Start()
{
base.Start();
UIManager.AddBackHandler((e) =>
{
MapUDPService.SendGameRoomKick(GameRoom.RoomId,App.CurrentUser.Id,App.CurrentUser.Id);
App.gameRoomDetail = null;
});
UIManager.AddBackHandler(QuitGameRoom);
transform.Find("MainNav").GetComponent<MainNav>().ShowBack();
Utils.DisplayHead(Avatar, App.CurrentUser.WxHeadImg);
UIManager.AddEvent(startBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) =>
UIManager.AddEvent(startBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick,StartRide);
UIManager.AddEvent(readyBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick,Ready);
UIManager.AddEvent(cancelBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick,CancelReady);
UIManager.AddEvent(quitBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick,LeaveGameRoom);
}
private void LeaveGameRoom(BaseEventData data)
{
if (Status == 1)
{
var list = GameRoom.RoomPlayerList;
var notReady = list.Where(c => c.Status == 0 && c.IsOwner == false).Any();
if (notReady)
{
Utils.showToast(gameObject, App.GetLocalString("have to wait for all ready!"));
}
else
{
MapUDPService.SendGameRoomStartTime(App.gameRoomDetail.RoomId, App.CurrentUser.Id);
}
});
//准备
UIManager.AddEvent(readyBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) =>
Utils.showToast(gameObject, App.GetLocalString("CancelReadyToQuit"));
return;
}
App.gameRoomDetail = null;
isQuit = true;
MapUDPService.SendGameRoomKick(GameRoom.RoomId, App.CurrentUser.Id, App.CurrentUser.Id);
UIManager.ShowGameRoomListPanel();
}
private void CancelReady(BaseEventData data)
{
Status = 0;
readyBtn.SetActive(true);
cancelBtn.SetActive(false);
MapUDPService.SendGameRoomReadyStatus(App.gameRoomDetail.RoomId, App.CurrentUser.Id, Status);
}
private void Ready(BaseEventData data)
{
Status = 1;
readyBtn.SetActive(false);
cancelBtn.SetActive(true);
MapUDPService.SendGameRoomReadyStatus(App.gameRoomDetail.RoomId, App.CurrentUser.Id, Status);
}
private void StartRide(BaseEventData data)
{
var list = GameRoom.RoomPlayerList;
var notReady = list.Any(c => c.Status == 0 && c.IsOwner == false);
if (notReady)
{
Status = 1;
readyBtn.SetActive(false);
cancelBtn.SetActive(true);
MapUDPService.SendGameRoomReadyStatus(App.gameRoomDetail.RoomId, App.CurrentUser.Id, Status);
});
//取消准备
UIManager.AddEvent(cancelBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) =>
Utils.showToast(gameObject, App.GetLocalString("have to wait for all ready!"));
}
else
{
Status = 0;
readyBtn.SetActive(true);
cancelBtn.SetActive(false);
MapUDPService.SendGameRoomReadyStatus(App.gameRoomDetail.RoomId, App.CurrentUser.Id, Status);
});
//退出
UIManager.AddEvent(quitBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) =>
{
if (Status == 1)
{
Utils.showToast(gameObject, App.GetLocalString("CancelReadyToQuit"));
return;
}
App.gameRoomDetail = null;
isQuit = true;
MapUDPService.SendGameRoomKick(GameRoom.RoomId, App.CurrentUser.Id, App.CurrentUser.Id);
UIManager.ShowGameRoomListPanel();
});
MapUDPService.SendGameRoomStartTime(App.gameRoomDetail.RoomId, App.CurrentUser.Id);
}
}
private void QuitGameRoom(string e)
{
MapUDPService.SendGameRoomKick(GameRoom.RoomId,App.CurrentUser.Id,App.CurrentUser.Id);
App.gameRoomDetail = null;
}
public override void Show()
{
base.Show();
Init();
Initialize();
}
private bool DataSourceChanged { get; set; }
private void ListenerHandler(List<ReceiveMsgModel> message)
{
var detail = message.FirstOrDefault();
@@ -113,22 +124,24 @@ public class GameRoomDetailController : PFUIPanel
GameRoom = null;
return;
}
GameRoom = detail.RoomList.Where(c => c.RoomId == GameRoom.RoomId).FirstOrDefault();
GameRoom = detail.RoomList.FirstOrDefault(c => c.RoomId == GameRoom.RoomId);
if (GameRoom != null)
{
DataSourceChanged = true;
}
}
float timer = 0f;
private void Update()
{
TcpHandler();
}
private void Init()
private void Initialize()
{
DataSourceChanged = false;
App.Model = "GameRoom";
versionText.text = "V"+App.AppVersion.ToString();
versionText.text = "V"+App.AppVersion;
MapUDPService.MessageListener = ListenerHandler;
GameRoom = App.gameRoomDetail;
@@ -150,17 +163,13 @@ public class GameRoomDetailController : PFUIPanel
distanceText.text = $"{Math.Round(GameRoom.Distance, 1)}KM";
eleText.text = $"{Math.Round(GameRoom.TotalClimb, 0)}M";
slopeText.text = $"{Math.Round(GameRoom.AverageGrade, 1)}%";
//查询某线路最佳
var result = ConfigHelper.mapApi.GetMapBestInfo(GameRoom.MapRouteId);
if (result.result && !string.IsNullOrEmpty(result.data.BestNickName))
{
bestTab.SetActive(true);
bestTabName.text = result.data.BestNickName;
bestTabTimer.text = result.data.BestTotalTime;
Utils.DisplayHead(bestTabHead, result.data.BestWxHeadImg);
}
Utils.DisplayHead(altitudeGraph, GameRoom.AltitudeGraph);
RenderBestPlayer();
GetMapRoute();
Utils.DisplayHead(altitudeGraph, GameRoom.AltitudeGraph);
var playerList = FindObjectsOfType<GameRoomPlayerPanel>();
foreach (var item in playerList)
{
@@ -174,94 +183,126 @@ public class GameRoomDetailController : PFUIPanel
}
}
}
private bool isOwner { get; set; } = true;
private void TcpHandler()
private void GetMapRoute()
{
if (DataSourceChanged)
var result = ConfigHelper.mapApi.GetById(GameRoom.MapRouteId);
if (result != null && result.result)
{
//房间被销毁了返回房间列表
if (GameRoom == null)
{
Debug.Log("GameRoom == null");
UIManager.ShowGameRoomListPanel();
return;
}
var playerList = FindObjectsOfType<GameRoomPlayerPanel>();
var list = GameRoom.RoomPlayerList;
//自己是否是房主
var mine = list.Where(c => c.UserId == App.CurrentUser.Id).FirstOrDefault();
if (mine != null && isOwner != mine.IsOwner)
{
isOwner = mine.IsOwner;
readyBtn.SetActive(!isOwner);
startBtn.SetActive(isOwner);
cancelBtn.SetActive(!isOwner);
}
//新增/更新
foreach (var item in list)
{
var userName =item.Name;
var headurl = item.WxHeadImage;
var ftp = item.FTP;
var weight = item.Weight;
var sex = item.Sex;
var current = playerList.Where(c => c.UserId == item.UserId).FirstOrDefault();
if (current == null)
{
var s = playerList.Where(c => c.UserId == 0 && c.NotUse == false).OrderBy(c => c.sort).FirstOrDefault();
if (s != null)
{
s.Init(item.UserId, userName, headurl, weight, ftp, item.IsOwner, item.Status,sex);
}
}
else
{
current.UpdatePlayer(item.UserId, userName, headurl, weight, ftp, item.IsOwner, item.Status,sex);
}
}
//删除
foreach (var item in playerList)
{
if (item.UserId != 0)
{
var current = list.Where(c => c.UserId == item.UserId).FirstOrDefault();
if (current == null)
{
item.ShowInviteModal();
}
var myself = list.Where(c => c.UserId == App.CurrentUser.Id).FirstOrDefault();
//被移除房间/掉线
if (myself == null)
{
if (!isQuit)
{
Utils.showToast(gameObject, App.GetLocalString("you have been kicked out of the room"));
UIManager.ShowGameRoomListPanel();
}
}
}
}
//收到服务器开始命令进入 loading页面
if (GameRoom.Status == 1)
{
//路线
App.RouteIdParam = GameRoom.MapRouteId;
App.MainSceneParam["Name"] = "GameRoomList";
if (GameRoom.EnableAR)
{
SceneManager.LoadScene("VideoPlay");
}
else
{
SceneManager.LoadScene("Ride");
}
}
DataSourceChanged = false;
this.route = result.data;
}
}
//查询某线路最佳
private void RenderBestPlayer()
{
var result = ConfigHelper.mapApi.GetMapBestInfo(GameRoom.MapRouteId);
if (result.result && !string.IsNullOrEmpty(result.data.BestNickName))
{
bestTab.SetActive(true);
bestTabName.text = result.data.BestNickName;
bestTabTimer.text = result.data.BestTotalTime;
Utils.DisplayHead(bestTabHead, result.data.BestWxHeadImg);
}
}
private void TcpHandler()
{
if (!DataSourceChanged) return;
//房间被销毁了返回房间列表
if (GameRoom == null)
{
UIManager.ShowGameRoomListPanel();
return;
}
var playerList = FindObjectsOfType<GameRoomPlayerPanel>();
SetRoomOwner();
CreatePlayers(playerList);
RemovePlayers(playerList);
LoadScene();
DataSourceChanged = false;
}
//自己是否是房主
private void SetRoomOwner()
{
var mine = GameRoom.RoomPlayerList.FirstOrDefault(c => c.UserId == App.CurrentUser.Id);
if (mine != null && isOwner != mine.IsOwner)
{
isOwner = mine.IsOwner;
readyBtn.SetActive(!isOwner);
startBtn.SetActive(isOwner);
cancelBtn.SetActive(!isOwner);
}
}
//收到服务器开始命令进入 loading页面
private void LoadScene()
{
if (GameRoom.Status != 1) return;
App.RouteIdParam = GameRoom.MapRouteId;
App.MainSceneParam["Name"] = "GameRoomList";
SceneManager.LoadScene(GameRoom.EnableAR?"VideoPlay":"Ride");
}
private void CreatePlayers(GameRoomPlayerPanel[] playerList)
{
foreach (var item in GameRoom.RoomPlayerList)
{
var userName = item.Name;
var headurl = item.WxHeadImage;
var ftp = item.FTP;
var weight = item.Weight;
var sex = item.Sex;
var current = playerList.Where(c => c.UserId == item.UserId).FirstOrDefault();
if (current == null)
{
var s = playerList.Where(c => c.UserId == 0 && c.NotUse == false).OrderBy(c => c.sort).FirstOrDefault();
if (s != null)
{
s.Init(item.UserId, userName, headurl, weight, ftp, item.IsOwner, item.Status,sex);
}
}
else
{
current.UpdatePlayer(item.UserId, userName, headurl, weight, ftp, item.IsOwner, item.Status,sex);
}
}
}
private void RemovePlayers(GameRoomPlayerPanel[] playerList)
{
foreach (var item in playerList)
{
if (item.UserId == 0) continue;
var current = GameRoom.RoomPlayerList.FirstOrDefault(c => c.UserId == item.UserId);
if (current == null)
{
item.ShowInviteModal();
}
//被移除房间/掉线
var myself = GameRoom.RoomPlayerList.FirstOrDefault(c => c.UserId == App.CurrentUser.Id);
if (myself == null && !isQuit )
{
Utils.showToast(gameObject, App.GetLocalString("you have been kicked out of the room"));
UIManager.ShowGameRoomListPanel();
}
}
}
protected override void OnDisable()
{
App.Model = "";
}
public void Report(float value)
{
Debug.Log(value);
}
}
Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs
+22 -24
View File
@@ -7,10 +7,9 @@ using Assets.Scripts.UI.Control;
using Assets.Scripts.UI.Prefab.MapList;
using System;
using System.Linq;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using Assets.AR;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
@@ -54,7 +53,6 @@ public class GameRoomListController : PFUIPanel
private GameObject right;
private GameObject right2;
private GameObject btn30;
private GameObject btn40;
private GameObject btn50;
@@ -70,7 +68,6 @@ public class GameRoomListController : PFUIPanel
private Transform enterRoomModal;
private Transform cycingRoomModal;
private Transform resultRoomModal;
private GameObject RoomRankItem;
private string RoomName;
@@ -100,10 +97,8 @@ public class GameRoomListController : PFUIPanel
GameObject _avatar;
private GameObject RoomCell { get; set; }
//Dummy data List
private List<GameRoomModel> _list = new List<GameRoomModel>();
private string seachName = "";
private bool ListChanged = false;
private bool CreateRoomSuccessed = false;
@@ -162,7 +157,6 @@ public class GameRoomListController : PFUIPanel
var g = Instantiate(RoomCell, _rectTransform);
g.GetComponent<GameRoomCell>().ConfigureCell(item, index);
}
}
List<GameRoomModel> list;
private int Total { get; set; }
@@ -268,7 +262,13 @@ public class GameRoomListController : PFUIPanel
CreateClicked = false;
UIManager.ShowGameRoomDetailPanel();
}
//LOOM中取数据渲染下载当前下载进度
RenderDownloadTask();
}
//LOOM中取数据渲染下载当前下载进度
private void RenderDownloadTask()
{
var downLoadList = transform.Find("DownLoadList").gameObject;
var list = Loom.DownloadStack.Where(c => c.Value.Process < 1);
if (list.Count() > 0)
@@ -736,24 +736,30 @@ public class GameRoomListController : PFUIPanel
enterRoomModal.gameObject.SetActive(true);
}
//如果本地没有视频文件则弹窗下载否则直接进入房间
public void ShowDownLoadConfirm()
public async void ShowDownLoadConfirm()
{
var fileName = GameRoom.FileName;
var path = PFConstants.VideoFolder;
var filepath = path + "/" + fileName;
if(!GameRoom.EnableAR) return ;
var result = ConfigHelper.mapApi.GetById(GameRoom.MapRouteId);
if (!result.result) return;
var route = result.data;
var download = transform.Find("DownloadPanel").gameObject;
if (GameRoom.EnableAR && !File.Exists(filepath))
downloader = new ARDownloader(route);
var showDownload = await downloader.CheckAllAsync();
if (showDownload)
{
//查询fileUrl
GameRoom.FileUrl = ConfigHelper.GameRoomApi.GetMapVideoURL(GameRoom.MapRouteId).data;
GameRoom.FileUrl = route.Url;
download.SetActive(true);
download.GetComponent<GameRoomDownLoad>().Init(RoomId, GameRoom.FileName, GameRoom.FileUrl, this, GameRoom.MapRouteName);
download.GetComponent<GameRoomDownLoad>().Init(RoomId, GameRoom.FileName, GameRoom.FileUrl, this, GameRoom.MapRouteName,downloader);
}
else
{
GetInRoom();
}
}
private ARDownloader downloader;
private GameRoomModel modelGameRoom { get; set; }
//private GameRoomModel modelGameRoom { get; set; }
private Text CyclingTimer { get; set; }
@@ -788,7 +794,6 @@ public class GameRoomListController : PFUIPanel
}
}
}
private void ShowStatusModal(Transform tr,GameRoomModel data)
{
tr.Find("Modal/Id").GetComponent<Text>().text = data.RoomId.ToString().PadLeft(7, '0');
@@ -818,8 +823,6 @@ public class GameRoomListController : PFUIPanel
UIManager.AddEvent(quit, EventTriggerType.PointerClick, (e) => { tr.gameObject.SetActive(false); });
tr.gameObject.SetActive(true);
}
public void GetInRoom()
{
//1.房间人数已经满了
@@ -841,13 +844,11 @@ public class GameRoomListController : PFUIPanel
MapUDPService.SendJoinGameRoom(App.gameRoomDetail.RoomId,App.CurrentUser.Id,UIManager.Now.GetDateTime().ToUniversalTime());
UIManager.ShowGameRoomDetailPanel();
}
public void SelectRoom(GameRoomModel room)
{
GameRoom = room;
RoomId = GameRoom.RoomId;
}
public int GetRoomId()
{
return RoomId;
@@ -886,7 +887,6 @@ public class GameRoomListController : PFUIPanel
tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(map.CountryCode);
}
public void Refresh()
{
content.transform.DestroyChildren();
@@ -894,14 +894,12 @@ public class GameRoomListController : PFUIPanel
isEnd = false;
GetList();
}
private void onEndEdit()
{
var t = searchInput.GetComponent<InputField>().text;
ftname = t;
Refresh();
}
private void DisplayMaps(List<MapRoute> list)
{
if (map != null)