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

Merge branch 'dev_nonearth' into dev_cyp

Browse Source
This commit is contained in:
CaiYanPeng 2021-12-15 13:32:38 +08:00
commit 9231304269
10 changed files with 83 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/GUIMainNetWorkInfo.cs
View File

@ -87,7 +87,7 @@ public class GUIMainNetWorkInfo : MonoBehaviour
if (_delayTime != App.delayTime && dict!=null)
{
_delayTime = App.delayTime;
Debug.Log("延迟"+_delayTime);
//Debug.Log("延迟"+_delayTime);
if (NetImage)
{
if (_delayTime != -1)

3
Assets/Scripts/Scenes/LoginController.cs
View File

@ -1,4 +1,5 @@
using Assets.Scripts;
using Assets.Scenes.Ride.Scripts;
using Assets.Scripts;
using Assets.Scripts.Apis;
using Assets.Scripts.Apis.Models;
using Assets.Scripts.Scenes;

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

@ -128,10 +128,11 @@ public class MainController : BaseScene
protected override void Update()
{
base.Update();
if (App.canvasWidth != transform.GetComponent<RectTransform>().sizeDelta.x)
{
App.canvasWidth = transform.GetComponent<RectTransform>().sizeDelta.x;
Debug.Log(App.canvasWidth);
//Debug.Log(App.canvasWidth);
}
//Debug.Log(transform.GetComponent<RectTransform>().sizeDelta.x);
t -= Time.deltaTime;
@ -146,6 +147,43 @@ public class MainController : BaseScene
//App.MainDeviceAdapter.StopScan();
//Debug.Log("StopScan");
}
MapUDPService.Send(0, App.CurrentUser.Id, new double[]{ 0d,0d}, competitionId: 0);
//发送消息
foreach (var item in MapUDPService.GetOnlineUserList())
{
if (item.RouteId > 0)
{
if (string.IsNullOrEmpty(item.RouteName))
{
var result = ConfigHelper.mapApi.GetById(item.RouteId);
if (result.result)
{
item.RouteName = result.data.Name;
}
}
var message = item.IsCompleted ? $"{item.Name}完成了{item.RouteName}的挑战" : $"{item.Name}发起了对{item.RouteName}的挑战";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message), $"{item.RouteId}{item.Name}");
}
//距离
if (item.EndDistance > 50)
{
var message = $"{item.Name}在骑行过程中突破了{"50KM"}的挑战" ;
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message), $"{item.RouteId}{item.Name}50KM");
}
//速度
if (item.Speed > 10)
{
var message = $"{item.Name}在骑行过程中速度达到了惊人的{item.Speed}KM/H";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message), $"{item.RouteId}{item.Name}10KM/H");
}
//功体比
if (item.WeightKg > 2)
{
var message = $"{item.Name}在骑行过程中功体比达到了惊人的{item.WeightKg}w/kg";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message), $"{item.RouteId}{item.Name}2WeightKg");
}
}
}
DoMessage();

1
Assets/Scripts/Scenes/Ride/Model/OutModel.cs
View File

@ -508,6 +508,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
/// 路线Id
/// </summary>
public int RouteId { get; set; }
public string RouteName { get; set; }
/// <summary>
/// FTP
/// </summary>

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

@ -303,6 +303,12 @@ namespace Assets.Scenes.Ride.Scripts
return result;
}
public static List<OnlineUser> GetOnlineUserList()
{
var result = onlineUserHelper.OnlineUsers.Where(c => !c.IsSelf).ToList();
return result;
}
//比赛中的人只能看到当前比赛的人
public static List<OnlineUser> GetCompetitionOnlineUsers(int competitionId)
{

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

@ -98,7 +98,7 @@ public class CyclingController : DeviceServiceMonoBase
void OnDestroy()
{
MapUDPService.Dispose();
//MapUDPService.Dispose();
Resources.UnloadUnusedAssets();
GC.Collect();
}

6
Assets/Scripts/Scenes/Ride/Scripts/EventQueueManager.cs
View File

@ -161,5 +161,11 @@ namespace Assets.Scenes.Ride.Scripts
RemoveAll();
eventQueue.Clear();
}
public static void ClearQueue()
{
if (Instance != null)
Instance.eventQueue.Clear();
}
}
}

17
Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs
View File

@ -86,4 +86,21 @@ namespace Assets.Scenes.Ride.Scripts
this.SceneName = SceneName;
}
}
//首页消息提醒
public class LinkedMessageEvent : GameEvent
{
public int routeId;//线路Id
public string content;//消息
public LinkedMessageEvent(int routeId, string content)
{
this.routeId = routeId;
this.content = content;
}
private void CreateContent()
{
}
}
}

9
Assets/Scripts/UIManager.cs
View File

@ -435,10 +435,14 @@ public class UIManager : MonoBehaviour
InitNow();
}
EventQueueSystem.AddListener<CompetitonStartMessageEvent>(CompetitonStartHandler);
EventQueueSystem.AddListener<LinkedMessageEvent>(LinkedMessageHandler);
}
//首页消息通知
private void LinkedMessageHandler(LinkedMessageEvent e)
{
Debug.Log(e.content);
}
//比赛即将开始消息提醒
private void CompetitonStartHandler(CompetitonStartMessageEvent e)
{
@ -1107,6 +1111,7 @@ public class UIManager : MonoBehaviour
private void OnDestroy()
{
UIManager.Instance = null;
EventQueueSystem.ClearQueue();
Resources.UnloadUnusedAssets();
GC.Collect();
}

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

@ -1,4 +1,5 @@
using System;
using Assets.Scenes.Ride.Scripts;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@ -44,6 +45,7 @@ public class Loom : MonoBehaviour
//####永不销毁
DontDestroyOnLoad(g);
_current = g.AddComponent<Loom>();
MapUDPService.Init();
}
}