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

自主拍摄视频测试

Browse Source
This commit is contained in:
lishuo 2023-02-20 17:32:24 +08:00
parent 08b92e7e9b
commit 46821d34a2
21 changed files with 2992 additions and 2944 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -109,3 +109,4 @@ Assets/Tree_Textures.meta
Packages
Assets/FacebookSDK/SDK/Resources.meta
Packages
Assets/Editor

1
Assets/AR/ARRoute.cs
View File

@ -418,6 +418,7 @@ namespace Assets.AR
index = ~index;
if (index == 0)
return this.RightSideOffsets[0];
return this.RightSideOffsets[0];
if (index == this.RightSideOffsetFrames.Length)
return this.RightSideOffsets[this.RightSideOffsetFrames.Length - 1];
float t = Mathf.InverseLerp((float)this.RightSideOffsetFrames[index - 1], (float)this.RightSideOffsetFrames[index], frame);

1
Assets/AndroidUpdate.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using Assets.Scenes.Ride.Scripts;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.UI;

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

@ -2639,7 +2639,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: downloading...
m_Text: Downloading...
--- !u!114 &5578787585634813026
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2652,7 +2652,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key: downloading
key: Downloading
--- !u!1 &7312186405814551362
GameObject:
m_ObjectHideFlags: 0

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

@ -945,7 +945,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &331369851390850339
RectTransform:
m_ObjectHideFlags: 0
@ -965,7 +965,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 277.8, y: -40}
m_AnchoredPosition: {x: 224, y: -41}
m_SizeDelta: {x: 90, y: 20}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &331369851390850348
@ -1036,7 +1036,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &331369851559162156
RectTransform:
m_ObjectHideFlags: 0
@ -31064,7 +31064,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8359135443717704858
RectTransform:
m_ObjectHideFlags: 0
@ -31412,7 +31412,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: AR
m_Text: 3D
--- !u!114 &8359135444460274282
MonoBehaviour:
m_ObjectHideFlags: 0

10
Assets/Resources/UI/language.json
View File

@ -428,7 +428,7 @@
"Invitition":"邀请",
"invite you to join in":"邀请您加入",
"are you accept the invitation?":"是否接受该邀请?",
"you have been kicked out of the room":"您已经移除房间!",
"you have been kicked out of the room":"您已经被踢出房间!",
"DownloadVideoTip":"这是一个视频线路,你必须提前下载该视频！",
"Downloading":"下载中...",
"more":"更多",
@ -438,7 +438,9 @@
"GameRoomNeedDownload": "当前线路需要下载视频后才能进入对战房间！",
"Run In The Background":"后台下载",
"Next Time":"下次再说",
"DontNeedDownload":"当前视频下载完成后,下次进入线路就不需要重复下载."
"DontNeedDownload":"当前视频下载完成后,下次进入线路就不需要重复下载.",
"Not In Use":"禁用",
"CancelReadyToQuit":"请取消准备后再退出!"
},
"en": {
"HOT ROUTES": "HOT ROUTES",
@ -872,6 +874,8 @@
"GameRoomNeedDownload": "This room route is an AR route. You need to download the AR video file of this route first.",
"Run In The Background":"Run In The Background",
"Next Time":"Next Time",
"DontNeedDownload":"The same AR route video does not need to be downloaded again next time"
"DontNeedDownload":"The same AR route video does not need to be downloaded again next time",
"Not In Use":"Not In Use",
"CancelReadyToQuit":"please cancel ready status and click quit!"
}
}

5776
Assets/Scenes/VideoPlay.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scripts/Scenes/MainController.cs
View File

@ -433,6 +433,7 @@ public class MainController : BaseScene
if (DataSorceChanged)
{
DataSorceChanged = false;
UIManager.ShowGameRoomDetailPanel();
return;
}
@ -625,7 +626,6 @@ public class MainController : BaseScene
UIManager.CloseConfirm();
App.Model = "GameRoom";
MapUDPService.SendJoinGameRoom(roomId, App.CurrentUser.Id, UIManager.Now.GetDateTime().ToUniversalTime());
MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, 0, 1, arr[3]);
});
Utils.CopyToClipboard("");
}

2
Assets/Scripts/Scenes/Ride/GameRoom/GameRoomResultScript.cs
View File

@ -119,7 +119,7 @@ namespace Assets.Scripts.Scenes.Scripts
}
//当前用户排名
var currentRanking = list.Where(c => c.UserId == cyclingController.CurrentPlayer.UserId).FirstOrDefault();
var currentRanking = list.Where(c => c.UserId == cyclingController.CurrentUserId).FirstOrDefault();
if (currentRanking != null)
{
Utils.DisplayImage(Head, currentRanking.WxHeadImg, true);

2
Assets/Scripts/Scenes/Ride/GameRoom/GameRoomUIManager.cs
View File

@ -152,8 +152,8 @@ namespace Assets.Scenes.Ride.Scripts
if (mainController.isQuit && !Saved)
{
Saved = true;
UIManager.CloseGameRoomCountDownPanel();
ShowResultList();
FindObjectOfType<GameRoomCountDownController>()?.Close();
}
}

3
Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs
View File

@ -112,7 +112,7 @@ namespace Assets.Scenes.Ride.Scripts
SendHeartbeat();
}
}
//查询房间
//查询房间列表
public static void SendQueryGameRoomList(int userId,int pageIndex,int pageSize,string roomIdOrName)
{
var cmd = new QueryGameRoomListCommand()
@ -128,6 +128,7 @@ namespace Assets.Scenes.Ride.Scripts
var sendBytes = Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(cmd));
_udpService.Send(sendBytes, sendBytes.Length);
}
//创建房间
public static void SendCreateGameRoom(string name, int routeId, string pwd, DateTime createTime , int closeTime, int maxMembers,double averageGrade,double totalClimb,double distance,bool enable3D,bool enableAR,string mapName,string fileName,string fileUrl,string altitudeGraph)
{

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

@ -580,6 +580,8 @@ namespace Assets.Scenes.Ride.Scripts
cancelPanel.SetActive(true);
cancelPanel.transform.SetAsLastSibling();
}
UIManager.CloseGameRoomCountDownPanel();
}
//显示设备连接
public void ShowDevicePanel(BaseEventData baseEventData)

1
Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
View File

@ -147,6 +147,7 @@ namespace Assets.Scenes.Ride.Scripts
//上传数据
public override void Upload()
{
UIManager.CloseGameRoomCountDownPanel();
if (mainController.cyclingController.recorderData != null&&!mainController.cyclingController.recorderData.Saved)//处理重复上传的问题
{
mainController.Save(TotalDistance);

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

@ -113,7 +113,7 @@ namespace Assets.Scripts.Scenes.VideoRide
if (animator != null)
{
animator.SetFloat("preSpeed", (float)preSpeed);
animator.SetFloat("speed", (float)speed);
animator.SetFloat("speed", (float)Speed);
animator.SetFloat("grade", (float)currentSlope);
animator.SetFloat("power", (float)power);
}

12
Assets/Scripts/Scenes/VideoRide/OnlineVideoPlayer.cs
View File

@ -1,5 +1,4 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine;
namespace Assets.Scripts.Scenes.VideoRide
{
@ -45,12 +44,17 @@ namespace Assets.Scripts.Scenes.VideoRide
this.userId = userId;
this.power = power;
this.speed = speed;
this.Speed = speed/3.6;
this.Speed = speed;
this.OnlineSpeed = this.Speed/3.6f;
this.Diff = endDistance - currentPlayerDistance;
this.currentFrame = frame;
this.PreDistance = preDistance * 1000;
this.EndDistance = endDistance * 1000;
this.OnlineSpeed = speed / 3.6;
}
public override void ComputePlayer()
{
distance = this.speed;
}
}
}

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

@ -31,6 +31,7 @@ namespace Assets.Scripts.Scenes.VideoRide
public void Complete()
{
start = false;
UIManager.CloseGameRoomCountDownPanel();
var uimanager= FindObjectOfType<VideoUIManager>();
if (uimanager!= null)
{
@ -142,8 +143,8 @@ namespace Assets.Scripts.Scenes.VideoRide
}
this.PreDistance = preDistance * 1000;
this.EndDistance = endDistance * 1000;
this.Speed = speed;
if (manager.IsQuit())
{
this.OnlineSpeed = 0;

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

@ -26,9 +26,10 @@ public class GameRoomCountDownController : PFUIPanel
private bool isSimple { get; set; }
public void Init(int seconds,Action action,bool isEnd = false,bool isSimple = false)
{
stopped = false;
Seconds = seconds;
Callback = action;
endCount.gameObject.SetActive(isEnd);
endCount.gameObject.SetActive(false);
this.isSimple = isSimple;
}
@ -36,6 +37,11 @@ public class GameRoomCountDownController : PFUIPanel
{
base.Close();
}
private bool stopped;
public void Stop()
{
this.stopped = true;
}
float timer = 0f;
private void Update()
@ -47,7 +53,7 @@ public class GameRoomCountDownController : PFUIPanel
{
Callback?.Invoke();
}
if (Seconds < 0)
if (Seconds < 0 || stopped)
{
gameObject.SetActive(false);
}

51
Assets/Scripts/UI/Prefab/Panel/GameRoomDetailController.cs
View File

@ -40,6 +40,8 @@ public class GameRoomDetailController : PFUIPanel
public GameRoomModel GameRoom { get; set; }
public DateTime? StartTime { get; set; }
public int Status { get; set; }
private bool isQuit = false;
protected override void Start()
{
base.Start();
@ -82,7 +84,13 @@ public class GameRoomDetailController : PFUIPanel
//退出
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();
});
@ -96,24 +104,20 @@ public class GameRoomDetailController : PFUIPanel
private bool DataSourceChanged { get; set; }
private void ListenerHandler(List<ReceiveMsgModel> message)
{
try
var detail = message.FirstOrDefault();
if (detail != null)
{
var detail = message.FirstOrDefault();
if (detail != null)
if (detail.RoomList == null)
{
if (detail.RoomList != null)
{
GameRoom = detail.RoomList.Where(c => c.RoomId == GameRoom.RoomId).FirstOrDefault();
if (GameRoom != null)
{
DataSourceChanged = true;
}
}
DataSourceChanged = true;
GameRoom = null;
return;
}
GameRoom = detail.RoomList.Where(c => c.RoomId == GameRoom.RoomId).FirstOrDefault();
if (GameRoom != null)
{
DataSourceChanged = true;
}
}
catch (Exception e)
{
}
}
float timer = 0f;
@ -128,6 +132,7 @@ public class GameRoomDetailController : PFUIPanel
}
private void Init()
{
DataSourceChanged = false;
App.Model = "GameRoom";
versionText.text = "V"+App.AppVersion.ToString();
MapUDPService.MessageListener = ListenerHandler;
@ -180,6 +185,13 @@ public class GameRoomDetailController : PFUIPanel
{
if (DataSourceChanged)
{
//房间被销毁了返回房间列表
if (GameRoom == null)
{
Debug.Log("GameRoom == null");
UIManager.ShowGameRoomListPanel();
return;
}
var playerList = FindObjectsOfType<GameRoomPlayerPanel>();
var list = GameRoom.RoomPlayerList;
//自己是否是房主
@ -224,11 +236,14 @@ public class GameRoomDetailController : PFUIPanel
item.ShowInviteModal();
}
var myself = list.Where(c => c.UserId == App.CurrentUser.Id).FirstOrDefault();
//被移除房间 or 掉线
//被移除房间/掉线
if (myself == null)
{
Utils.showToast(gameObject, App.GetLocalString("you have been kicked out of the room"));
UIManager.ShowGameRoomListPanel();
if (!isQuit)
{
Utils.showToast(gameObject, App.GetLocalString("you have been kicked out of the room"));
UIManager.ShowGameRoomListPanel();
}
}
}
}

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

@ -330,9 +330,10 @@ public class GameRoomListController : PFUIPanel
//是否是3d
if (tdContainer != null)
{
tdContainer.gameObject.SetActive(false);
var g = tdContainer.Find("Gou").gameObject;
g.SetActive(false);
is3d = false;
is3d = true;
UIManager.RemoveEvent(tdContainer.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick);
UIManager.AddEvent(tdContainer.gameObject, EventTriggerType.PointerClick, (b) =>
{

8
Assets/Scripts/UIManager.cs
View File

@ -902,6 +902,14 @@ public class UIManager : MonoBehaviour
}
UIManager.Show(UIManager.Instance.GameRoomCountDownPanel, null, true);
}
public static void CloseGameRoomCountDownPanel()
{
if (UIManager.Instance.GameRoomCountDownPanel != null)
{
UIManager.Instance.GameRoomCountDownPanel.Stop();
}
}
//显示骑行设置面板
public static void ShowRideSettingPanel()
{

32
ProjectSettings/QualitySettings.asset
View File

@ -4,7 +4,7 @@
QualitySettings:
m_ObjectHideFlags: 0
serializedVersion: 5
m_CurrentQuality: 3
m_CurrentQuality: 5
m_QualitySettings:
- serializedVersion: 2
name: Very Low
@ -89,7 +89,7 @@ QualitySettings:
shadowNearPlaneOffset: 3
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
shadowmaskMode: 0
skinWeights: 2
textureQuality: 0
anisotropicTextures: 1
@ -101,7 +101,7 @@ QualitySettings:
vSyncCount: 1
lodBias: 0.7
maximumLODLevel: 0
streamingMipmapsActive: 1
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
@ -129,7 +129,7 @@ QualitySettings:
skinWeights: 2
textureQuality: 0
anisotropicTextures: 1
antiAliasing: 8
antiAliasing: 0
softParticles: 0
softVegetation: 1
realtimeReflectionProbes: 1
@ -153,15 +153,15 @@ QualitySettings:
- serializedVersion: 2
name: Very High
pixelLightCount: 3
shadows: 1
shadowResolution: 0
shadows: 2
shadowResolution: 2
shadowProjection: 1
shadowCascades: 2
shadowDistance: 70
shadowNearPlaneOffset: 3
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
shadowmaskMode: 1
skinWeights: 4
textureQuality: 0
anisotropicTextures: 2
@ -189,8 +189,8 @@ QualitySettings:
- serializedVersion: 2
name: Ultra
pixelLightCount: 4
shadows: 2
shadowResolution: 2
shadows: 1
shadowResolution: 0
shadowProjection: 1
shadowCascades: 4
shadowDistance: 150
@ -198,10 +198,10 @@ QualitySettings:
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
skinWeights: 4
skinWeights: 255
textureQuality: 0
anisotropicTextures: 2
antiAliasing: 2
antiAliasing: 4
softParticles: 1
softVegetation: 1
realtimeReflectionProbes: 1
@ -224,15 +224,17 @@ QualitySettings:
excludedTargetPlatforms: []
m_PerPlatformDefaultQuality:
Android: 2
CloudRendering: 5
GameCoreScarlett: 5
GameCoreXboxOne: 5
Lumin: 5
Nintendo 3DS: 5
Nintendo Switch: 5
PS4: 5
PSP2: 2
PS5: 5
Stadia: 5
Standalone: 3
Standalone: 2
WebGL: 3
Windows Store Apps: 5
Windows Store Apps: 2
XboxOne: 5
iPhone: 2
tvOS: 2