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

fix:AR相关修改

Browse Source
This commit is contained in:
lishuo committed 2023-06-28 15:59:34 +08:00
1 parent 74ba5790f9
commit c95f6b7c70
12 files changed
+382 -368
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownLoad.cs
+6 -49
View File
@@ -28,40 +28,7 @@ class GameRoomDownLoad : MonoBehaviour
public string FileName { get; set; }
public string RouteName { get; set; }
private string FileUrl { get; set; }
private float _videoProgress;
public float VideoProgress
{
get => _videoProgress;
set
{
_videoProgress = value;
ComputeProgress();
}
}
private float _dataProgress = 0f;
public float DataProgress
{
get => _dataProgress;
set
{
_dataProgress = value;
ComputeProgress();
}
}
private float _routeProgress = 0f;
public float RouteProgress
{
get => _routeProgress;
set
{
_routeProgress = value;
ComputeProgress();
}
}
private void Start()
{
UIManager.AddEvent(downloadBtn, EventTriggerType.PointerClick, Download_Click);
@@ -124,34 +91,24 @@ class GameRoomDownLoad : MonoBehaviour
{
step2.SetActive(true);
step2.transform.Find("RouteName").GetComponent<Text>().text = RouteName;
downloadSlider.maxValue = _downloader.Total * 100;
if(_downloader.IsVideoDownloaded)
await _downloader.DownLoadVideoAsync(Progress.Create<float>(x => VideoProgress = x));
if(_downloader.IsARRouteDownloaded)
await _downloader.DownLoadARRouteAsync(Progress.Create<float>(x=> RouteProgress = x));
if(_downloader.IsARDataDownloaded)
await _downloader.DownLoadARDataAsync(Progress.Create<float>(x=> DataProgress = x));
await _downloader.DownLoadDefault(ReportProgress);
}
private void ComputeProgress()
private void ReportProgress(float progress)
{
//update progress
var progress = (_videoProgress + _routeProgress + _dataProgress) / _downloader.Total;
downloadSlider.value = progress * 100;
downloadSlider.value = progress;
//update download info
if (!Loom.DownloadStack.ContainsKey(FileName) )
{
Loom.DownloadStack.Add(FileName, new DownloadInfo(FileName, RouteName,progress));
}
Loom.DownloadStack[FileName].Process = progress;
if (progress >= 1)
LayoutRebuilder.ForceRebuildLayoutImmediate((RectTransform)this.downloadSlider.transform);
if (progress == 1f)
{
Loom.DownloadStack.Remove(FileName);
downloadSlider.value = 100;
step3.SetActive(true);
step3.transform.Find("RouteName").GetComponent<Text>().text = RouteName;
}
Assets/Scripts/UI/Prefab/GameRoom/GameRoomMapItem.cs
+27 -58
View File
@@ -2,11 +2,9 @@
using Assets.Scripts;
using Assets.Scripts.Apis;
using Assets.Scripts.Apis.Models;
using Cysharp.Threading.Tasks;
using DG.Tweening;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using Assets.AR;
using Assets.Core;
using UnityEngine;
@@ -43,40 +41,7 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
private ARDownloader downloader { get; set; }
private float _videoProgress;
public float VideoProgress
{
get => _videoProgress;
set
{
_videoProgress = value;
ComputeProgress();
}
}
private float _dataProgress = 0f;
public float DataProgress
{
get => _dataProgress;
set
{
_dataProgress = value;
ComputeProgress();
}
}
private float _routeProgress = 0f;
public float RouteProgress
{
get => _routeProgress;
set
{
_routeProgress = value;
ComputeProgress();
}
}
private CancellationTokenSource _cancellation;
private void Awake()
{
@@ -87,6 +52,7 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
private void Start()
{
listController = FindObjectOfType<GameRoomListController>();
ShowDownloadModal();
}
public void Initial(MapRoute myMap, Dictionary<string, Texture> caches, MapRouteAreaItem area = null)
@@ -107,8 +73,6 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
downloadTxt = transform.Find("DownLoadModal/Text").gameObject;
slider = transform.Find("DownLoadModal/Slider").GetComponent<Slider>();
ShowDownloadModal();
UIManager.AddEvent(downloadBtn, EventTriggerType.PointerClick,Download_Click);
transform.Find("Name").GetComponent<Text>().text = myMap.Name;
@@ -148,28 +112,24 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
downloading.SetActive(true);
downloadTxt.SetActive(false);
slider.gameObject.SetActive(true);
slider.maxValue = downloader.Total * 100;
if(downloader.IsVideoDownloaded)
await downloader.DownLoadVideoAsync(Progress.Create<float>(x => VideoProgress = x));
if(downloader.IsARRouteDownloaded)
await downloader.DownLoadARRouteAsync(Progress.Create<float>(x=> RouteProgress = x));
if(downloader.IsARDataDownloaded)
await downloader.DownLoadARDataAsync(Progress.Create<float>(x=> DataProgress = x));
_cancellation = new CancellationTokenSource();
await downloader.DownLoadDefault(ReportProgress,_cancellation);
}
private void ComputeProgress()
private void ReportProgress(float progress)
{
//update progress
var progress = (_videoProgress + _routeProgress + _dataProgress) / downloader.Total;
slider.value = progress * 100;
//update download info
Debug.Log($"{progress},{downloader.IsDone}");
slider.value = progress;
if(!Loom.DownloadStack.ContainsKey(map.FileName))
Loom.DownloadStack.Add(map.FileName, new DownloadInfo(map.FileName,map.Name,0, map.Url));
Loom.DownloadStack[map.FileName].Process = progress;
//refresh slider
LayoutRebuilder.ForceRebuildLayoutImmediate((RectTransform)this.slider.transform);
transform.Find("DownLoadModal").gameObject.SetActive(progress != 1);
transform.Find("DownLoadModal").gameObject.SetActive(progress < 1f);
if(progress == 1)
_cancellation = null;
}
//显示下载面板
@@ -183,10 +143,9 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
private void Ride()
{
var fileName = map.FileName;
var path = PFConstants.VideoFolder;
var filepath = path + "/" + fileName;
if ((map.EnableAR && File.Exists(filepath) )|| !map.EnableAR)
var canARRide = map.EnableAR && downloader != null && downloader.IsDone;
var canRide = !map.EnableAR;
if (canARRide || canRide)
{
var list = FindObjectsOfType<GameRoomMapItem>();
foreach (var item in list)
@@ -238,6 +197,7 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
transform.Find("Shadow").GetComponent<Image>().DOFade(0, 0.3f);
#endif
}
public void OnPointerEnter(PointerEventData eventData)
{
if (isModal)
@@ -258,6 +218,7 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
transform.Find("Shadow").GetComponent<Image>().DOFade(1, 0.3f);
#endif
}
private void SetActive4Button(bool b)
{
transform.Find("MapHBImg").gameObject.SetActive(!b);
@@ -280,6 +241,7 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
transform.Find("MapHBImg").GetComponent<RawImage>().color = Utils.HexToColorHtml(
PropNames.colorDict[isFav]);
}
private async void Collect()
{
JsonResult<object> r;
@@ -362,4 +324,11 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter
{
Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
}
private void OnDestroy()
{
// _cancellation?.Cancel();
// Loom.DownloadStack.Remove(map?.FileName);
}
}
Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs
+128 -108
View File
@@ -69,6 +69,8 @@ public class GameRoomListController : PFUIPanel
private Transform cycingRoomModal;
private Transform resultRoomModal;
private GameObject RoomRankItem;
InputField hourInputField, minInputField;
private string RoomName;
private string Roompwd;
@@ -103,6 +105,12 @@ public class GameRoomListController : PFUIPanel
private bool ListChanged = false;
private bool CreateRoomSuccessed = false;
PFUIPageHelper pageHelper;
private ARDownloader downloader;
private GameRoomModel modelGameRoom { get; set; }
private Text CyclingTimer { get; set; }
List<GameRoomModel> list;
private int Total { get; set; }
private bool CreateClicked { get; set; }
protected override void Awake()
{
@@ -126,73 +134,7 @@ public class GameRoomListController : PFUIPanel
UIManager.AddEvent(_avatar, UnityEngine.EventSystems.EventTriggerType.PointerClick, AvatarBtn_Click);
}
private void SearchBtn_Click(BaseEventData data)
{
pageHelper.PageIndex = 0;
Query();
}
private void AvatarBtn_Click(BaseEventData data)
{
UIManager.ShowUserInfoPanel();
}
private void Query()
{
MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, pageHelper.PageIndex, pageHelper.PageSize, seachName);
}
private void Refreash()
{
Utils.DestroyChildren(_rectTransform);
pageHelper.Total = Total;
pageHelper.Build();
if (list == null)
{
_noDataFound.SetActive(true);
return;
}
_noDataFound.SetActive(false);
int index = 0;
foreach (var item in list)
{
index++;
var g = Instantiate(RoomCell, _rectTransform);
g.GetComponent<GameRoomCell>().ConfigureCell(item, index);
}
}
List<GameRoomModel> list;
private int Total { get; set; }
private bool CreateClicked { get; set; }
private void ListenerHandler(List<ReceiveMsgModel> message)
{
try
{
if (message.Count > 1)
return;
//查询列表
var roomList = message.Where(c => c.RoomList != null).FirstOrDefault();
if (roomList != null)
{
list = roomList.RoomList;
Total = roomList.GameRoomTotal;
ListChanged = true;
}
//查询自己当前创建的房间信息并进入
var info = message.Where(c => c.RoomList != null && c.RoomList.Where(o => o.UserId == App.CurrentUser.Id && o.Status == 0).Any()).FirstOrDefault();
if (info != null)
{
GameRoom = info.RoomList[0];
App.gameRoomDetail = GameRoom;
CreateRoomSuccessed = true;
//进入房间清空列表
list = null;
Total = 0;
ListChanged = true;
}
}
catch (Exception e)
{
Debug.LogError(e);
}
}
protected override void Start()
{
base.Start();
@@ -208,14 +150,6 @@ public class GameRoomListController : PFUIPanel
}
public override void Show()
{
base.Show();
App.Model = "GameRoom";
MapUDPService.MessageListener = ListenerHandler;
MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, pageHelper.PageIndex, pageHelper.PageSize, seachName);
}
private void Update()
{
//房间已经进行骑行时间
@@ -265,8 +199,84 @@ public class GameRoomListController : PFUIPanel
RenderDownloadTask();
}
public override void Show()
{
base.Show();
App.Model = "GameRoom";
MapUDPService.MessageListener = ListenerHandler;
MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, pageHelper.PageIndex, pageHelper.PageSize, seachName);
}
//LOOM中取数据渲染下载当前下载进度
private void SearchBtn_Click(BaseEventData data)
{
pageHelper.PageIndex = 0;
Query();
}
private void AvatarBtn_Click(BaseEventData data)
{
UIManager.ShowUserInfoPanel();
}
private void Query()
{
MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, pageHelper.PageIndex, pageHelper.PageSize, seachName);
}
private void Refreash()
{
Utils.DestroyChildren(_rectTransform);
pageHelper.Total = Total;
pageHelper.Build();
if (list == null)
{
_noDataFound.SetActive(true);
return;
}
_noDataFound.SetActive(false);
int index = 0;
foreach (var item in list)
{
index++;
var g = Instantiate(RoomCell, _rectTransform);
g.GetComponent<GameRoomCell>().ConfigureCell(item, index);
}
}
private void ListenerHandler(List<ReceiveMsgModel> message)
{
try
{
if (message.Count > 1)
return;
//查询列表
var roomList = message.Where(c => c.RoomList != null).FirstOrDefault();
if (roomList != null)
{
list = roomList.RoomList;
Total = roomList.GameRoomTotal;
ListChanged = true;
}
//查询自己当前创建的房间信息并进入
var info = message.Where(c => c.RoomList != null && c.RoomList.Where(o => o.UserId == App.CurrentUser.Id && o.Status == 0).Any()).FirstOrDefault();
if (info != null)
{
GameRoom = info.RoomList[0];
App.gameRoomDetail = GameRoom;
CreateRoomSuccessed = true;
//进入房间清空列表
list = null;
Total = 0;
ListChanged = true;
}
}
catch (Exception e)
{
Debug.LogError(e);
}
}
private void RenderDownloadTask()
{
var downLoadList = transform.Find("DownLoadList").gameObject;
@@ -510,7 +520,7 @@ public class GameRoomListController : PFUIPanel
Query();
});
}
InputField hourInputField, minInputField;
private void InitStep2()
{
//关门时间
@@ -647,6 +657,7 @@ public class GameRoomListController : PFUIPanel
}
return result;
}
private void HandleStepBtn(string btnName)
{
next.SetActive(btnName == previous.name);
@@ -661,6 +672,7 @@ public class GameRoomListController : PFUIPanel
step1Btn.transform.Find("Bg").gameObject.SetActive(btnName == previous.name);
step2Btn.transform.Find("Bg").gameObject.SetActive(btnName != previous.name);
}
private void HandleFormInput()
{
if (Members >= 2 && !string.IsNullOrEmpty(RoomName) && CloseTime > 0 && CloseTime < 120)
@@ -680,6 +692,7 @@ public class GameRoomListController : PFUIPanel
create.GetComponent<Button>().enabled = false;
}
}
private void HandleCloseTimeBtnClick(int closeTime, string btnName)
{
if (btnName != "MinInputField" && btnName != "HourInputField")
@@ -699,6 +712,7 @@ public class GameRoomListController : PFUIPanel
btn60.GetComponent<Image>().color = btn60.name == btnName ? pink : grey;
HandleFormInput();
}
private void HandleMembersBtnClick(int members, string btnName)
{
ColorUtility.TryParseHtmlString("#3D3E4D", out Color grey);
@@ -711,6 +725,7 @@ public class GameRoomListController : PFUIPanel
btn6.GetComponent<Image>().color = btn6.name == btnName ? pink : grey;
HandleFormInput();
}
private void ChangeDistance(int index)
{
var text = distanceOptions.GetComponent<Dropdown>().options[index].text;
@@ -718,6 +733,7 @@ public class GameRoomListController : PFUIPanel
scroll.GetComponent<ScrollRect>().verticalNormalizedPosition = 1;
Refresh();
}
private void OnEndDrag(BaseEventData arg0)
{
var scrollrect = scroll.GetComponent<ScrollRect>();
@@ -731,6 +747,7 @@ public class GameRoomListController : PFUIPanel
Refresh();
}
}
public void ShowPwdConfirm()
{
enterRoomModal.gameObject.SetActive(true);
@@ -758,17 +775,13 @@ public class GameRoomListController : PFUIPanel
}
}
private ARDownloader downloader;
private GameRoomModel modelGameRoom { get; set; }
//private GameRoomModel modelGameRoom { get; set; }
private Text CyclingTimer { get; set; }
public void ShowCycingPanel(GameRoomModel gameRoomModel)
{
ShowStatusModal(cycingRoomModal, gameRoomModel);
modelGameRoom = gameRoomModel; //倒计时
CyclingTimer = cycingRoomModal.Find("Modal/Timer").GetComponent<Text>();
}
public void ShowDonePanel(int roomId)
{
var result = ConfigHelper.GameRoomApi.GetDetail(roomId);
@@ -794,6 +807,7 @@ public class GameRoomListController : PFUIPanel
}
}
}
private void ShowStatusModal(Transform tr,GameRoomModel data)
{
tr.Find("Modal/Id").GetComponent<Text>().text = data.RoomId.ToString().PadLeft(7, '0');
@@ -823,6 +837,7 @@ public class GameRoomListController : PFUIPanel
UIManager.AddEvent(quit, EventTriggerType.PointerClick, (e) => { tr.gameObject.SetActive(false); });
tr.gameObject.SetActive(true);
}
public void GetInRoom()
{
//1.房间人数已经满了
@@ -844,19 +859,23 @@ 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;
}
public GameRoomModel GetCurrentRoom()
{
return GameRoom;
}
public void Select(MapRoute map)
{
Map = map;
@@ -887,6 +906,7 @@ public class GameRoomListController : PFUIPanel
tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(map.CountryCode);
}
public void Refresh()
{
content.transform.DestroyChildren();
@@ -894,54 +914,53 @@ 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)
if (map == null) return;
foreach (var item in list)
{
foreach (var item in list)
{
var obj = Instantiate(map);
obj.GetComponent<GameRoomMapItem>().Initial(item, caches);
//obj.SendMessage("Initial", );
obj.transform.SetParent(content.transform);
obj.transform.localScale = new Vector3(1, 1, 1);
}
var obj = Instantiate(map, content.transform, true);
obj.GetComponent<GameRoomMapItem>().Initial(item, caches);
obj.transform.localScale = new Vector3(1, 1, 1);
}
}
private async void GetList()
{
if (isEnd) return;
var res = await ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname, distance, string.Join(",", hands), is3d, sort, sortDire, isEnableAR: isEnableAR, isEnableBattle: true);
if (res.result)
var res = await ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname, distance, string.Join(",", hands),
is3d, sort, sortDire, isEnableAR: isEnableAR, isEnableBattle: true);
if (!res.result) return;
if (res.data.Count == 0)
{
if (res.data.Count == 0)
if (pageIndex != 0)
{
if (pageIndex != 0)
{
isEnd = true;
scroll.transform.Find("Error").gameObject.SetActive(false);
}
else
{
Debug.Log("当前没查到内容");
scroll.transform.Find("Error").gameObject.SetActive(true);
}
isEnd = true;
scroll.transform.Find("Error").gameObject.SetActive(false);
}
else
{
isEnd = false;
DisplayMaps(res.data);
scroll.transform.Find("Error").gameObject.SetActive(false);
Debug.Log("当前没查到内容");
scroll.transform.Find("Error").gameObject.SetActive(true);
}
}
else
{
isEnd = false;
DisplayMaps(res.data);
scroll.transform.Find("Error").gameObject.SetActive(false);
}
}
//创建房间
private void CreateGameRoom(BaseEventData data)
{
@@ -957,6 +976,7 @@ public class GameRoomListController : PFUIPanel
MapList.SetActive(true);
}
protected override void OnDisable()
{
base.OnDisable();