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

Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

Browse Source 
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
This commit is contained in:
CaiYanPeng 2021-12-21 10:47:00 +08:00
commit 4b3dad0b84
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,6 +176,7 @@ public class MainController : BaseScene
} }
void FinishMessageLeft() void FinishMessageLeft()
{ {
#if UNITY_STANDALONE_WIN
msgIndex = 0; msgIndex = 0;
if (msgs != null) if (msgs != null)
{ {
@ -184,6 +185,7 @@ public class MainController : BaseScene
item.DOFade(0, 0.3f); item.DOFade(0, 0.3f);
} }
} }
#endif
} }
void FinishMessageRight() void FinishMessageRight()
@ -313,7 +315,8 @@ public class MainController : BaseScene
MapUDPService.Send(0, App.CurrentUser.Id, new double[]{ 0d,0d}, competitionId: 0); MapUDPService.Send(0, App.CurrentUser.Id, new double[]{ 0d,0d}, competitionId: 0);
//发送消息 //发送消息
foreach (var item in MapUDPService.GetOnlineUserList()) var list = MapUDPService.GetAllOnlineUserList();
foreach (var item in list)
{ {
if (item.RouteId > 0) if (item.RouteId > 0)
{ {
@ -326,7 +329,7 @@ public class MainController : BaseScene
App.RouteNameDict.Add(item.RouteId, item.RouteName); App.RouteNameDict.Add(item.RouteId, item.RouteName);
} }
} }
else else
{ {
item.RouteName = App.RouteNameDict[item.RouteId]; item.RouteName = App.RouteNameDict[item.RouteId];
} }
@ -339,27 +342,32 @@ public class MainController : BaseScene
{ {
message = $"完成了<color=#ff2742>{item.RouteName}</color>的挑战"; message = $"完成了<color=#ff2742>{item.RouteName}</color>的挑战";
} }
if (!string.IsNullOrEmpty(message)) if (!string.IsNullOrEmpty(message))
{ {
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}"); EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}");
} }
} }
if (item.Point[0] == -1d)
{
var message = $"{item.Name}上线了";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.Id}{item.LastActiveTime}{item.Point}");
}
//距离 //距离
if (item.EndDistance > 50) if (item.EndDistance > 50)
{ {
var message = $"在骑行过程中突破了<color=#00ff00>{"50KM"}</color>的挑战" ; var message = $"在骑行过程中突破了<color=#00ff00>{"50KM"}</color>的挑战";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM"); EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM");
} }
//速度 //速度
if (item.Speed > 10) if (item.Speed > 10)
{ {
var message = $"在骑行过程中速度达到了惊人的<color=#ff0000>{item.Speed}</color>KM/H"; var message = $"在骑行过程中速度达到了惊人的<color=#ff0000>{item.Speed}</color>KM/H";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}10KM/H"); EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}10KM/H");
} }
//功体比 //功体比
if (item.WeightKg > 2) if (item.WeightKg > 2)
{ {
var message = $"在骑行过程中功体比达到了惊人的<color=#0000ff>{item.WeightKg}</color>w/kg"; var message = $"在骑行过程中功体比达到了惊人的<color=#0000ff>{item.WeightKg}</color>w/kg";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}2WeightKg"); EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}2WeightKg");
} }
} }
@ -417,6 +425,7 @@ public class MainController : BaseScene
} }
private void OnDestroy() private void OnDestroy()
{ {
EventQueueSystem.RemoveListener<LinkedMessageEvent>(LinkedMessageHandler);
App.isHomeChanged -= OnIsHomeChanged; App.isHomeChanged -= OnIsHomeChanged;
} }
} }

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

@ -303,7 +303,7 @@ namespace Assets.Scenes.Ride.Scripts
return result; return result;
} }
public static List<OnlineUser> GetOnlineUserList() public static List<OnlineUser> GetAllOnlineUserList()
{ {
var result = onlineUserHelper.OnlineUsers.Where(c => !c.IsSelf).ToList(); var result = onlineUserHelper.OnlineUsers.Where(c => !c.IsSelf).ToList();
return result; return result;
@ -325,6 +325,11 @@ namespace Assets.Scenes.Ride.Scripts
} }
public static int GetNearRiderCount() public static int GetNearRiderCount()
{
return onlineUserHelper.OnlineUsers.Where(c=> (c.Point[0] != 0 && c.Point[1] != 0)|| (c.Point[0] != -1 && c.Point[1] != -1)).Count();
}
public static int GetAllOnlineUserCount()
{ {
return onlineUserHelper.OnlineUsers.Count(); return onlineUserHelper.OnlineUsers.Count();
} }
@ -484,7 +489,7 @@ namespace Assets.Scenes.Ride.Scripts
var list = mes.ToList(); var list = mes.ToList();
//去除自己的数据和命令包 //去除自己的数据和命令包
//mes.RemoveAll(item => item.MemberId == App.CurrentUser.Id || item.Point[0] == 0); //mes.RemoveAll(item => item.MemberId == App.CurrentUser.Id || item.Point[0] == 0);
list.RemoveAll(item => item.Point[0] == 0 && item.Point[1] == 0); //list.RemoveAll(item => item.Point[0] == 0 && item.Point[1] == 0);
//去除重复数据 //去除重复数据
list = list.Distinct(new OlineUserComparer()).ToList(); list = list.Distinct(new OlineUserComparer()).ToList();

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

@ -64,6 +64,7 @@ namespace Assets.Scenes.Ride.Scripts
Instance.delegates[typeof(T)] = temp; Instance.delegates[typeof(T)] = temp;
} }
Instance.delegateLookup.Remove(del); Instance.delegateLookup.Remove(del);
keyList.Clear();
} }
} }
@ -120,16 +121,15 @@ namespace Assets.Scenes.Ride.Scripts
return; return;
Instance.eventQueue.Enqueue(e); Instance.eventQueue.Enqueue(e);
} }
static List<string> keyList = new List<string>(); private static Dictionary<string,GameEvent> keyList = new Dictionary<string, GameEvent>();
public static void QueueEventOnce(GameEvent e,string key) public static void QueueEventOnce(GameEvent e,string key)
{ {
if (!Instance.delegates.ContainsKey(e.GetType())) if (!Instance.delegates.ContainsKey(e.GetType()))
return; return;
if (keyList.Contains(key)) if (keyList.ContainsKey(key))
return; return;
keyList.Add(key); keyList.Add(key,e);
Debug.Log(126);
Instance.eventQueue.Enqueue(e); Instance.eventQueue.Enqueue(e);
} }
float timer = 0.0f; float timer = 0.0f;

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

@ -46,8 +46,8 @@ public class Loom : MonoBehaviour
DontDestroyOnLoad(g); DontDestroyOnLoad(g);
_current = g.AddComponent<Loom>(); _current = g.AddComponent<Loom>();
MapUDPService.Init(); MapUDPService.Init();
MapUDPService.Send(0, App.CurrentUser.Id, new double[] { -1d, -1d }, competitionId: 0);
} }
} }
private List<Action> _actions = new List<Action>(); private List<Action> _actions = new List<Action>();