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

增加编号，loading页提示，延迟毫秒

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-11-01 11:04:22 +08:00
1 parent b9aa0131cc
commit 558fb16160
62 files changed
+7533 -2804
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/LoginController.cs
+26 -4
View File
@@ -113,6 +113,7 @@ public class LoginController : BaseScene
Dictionary<string, Selectable> formDict, signFormDict;
public string avatarName { get; private set; }
public Texture avatar;
// Start is called before the first frame update
void Start()
@@ -506,18 +507,39 @@ public class LoginController : BaseScene
}
async void Init()
{
Task.Run(() =>
{
System.Net.NetworkInformation.Ping ping = new System.Net.NetworkInformation.Ping();
System.Timers.Timer timer = new System.Timers.Timer();
timer.Interval = 1000;
timer.AutoReset = true;
timer.Elapsed += new ElapsedEventHandler((o, e) =>
{
var reply = ping.Send("47.97.84.8");
if (reply.Status == System.Net.NetworkInformation.IPStatus.Success)
{
#if UNITY_EDITOR
App.delayTime = new System.Random().Next(300);
#else
App.delayTime = reply.RoundtripTime;
#endif
}
else
{
App.delayTime = -1;
}
});
timer.Start();
});
Debug.Log(535);
UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
userInfos = UIManager.Instance.userInfos;
App.DefaultRotateTexture = Utils.ReadTextureFromPlayerPrefs("rotateImage");
App.firstEnter = PlayerPrefs.GetInt("firstEnter");
PlayerPrefs.SetInt("firstEnter", 1);
var notifyId = PlayerPrefs.GetInt("notifyId");
//Task.Run(async () =>
//{
//});
var r = await ConfigHelper.userApi.GetNotify();
if (r.result)
{
#if !(UNITY_ANDROID || UNITY_IOS)
Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
+31 -1
View File
@@ -158,6 +158,36 @@ namespace Assets.Scenes.Ride.Scripts
UIManager.AddEvent(Apply, EventTriggerType.PointerClick, ApplyRace);
UIManager.AddEvent(CancelJoin, EventTriggerType.PointerClick, CancelReserve);
UIManager.AddEvent(Detail, EventTriggerType.PointerClick, GoDetail);
#if UNITY_STANDALONE_WIN
UIManager.RemoveEvent(distance.gameObject);
UIManager.RemoveEvent(slope.gameObject);
UIManager.RemoveEvent(elevaction.gameObject);
UIManager.AddEvent(distance.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, b =>
{
panel.transform.Find("DistanceTip").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
});
UIManager.AddEvent(distance.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, b =>
{
panel.transform.Find("DistanceTip").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
});
UIManager.AddEvent(slope.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, b =>
{
panel.transform.Find("SlopeTip").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
});
UIManager.AddEvent(slope.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, b =>
{
panel.transform.Find("SlopeTip").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
});
UIManager.AddEvent(elevaction.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, b =>
{
panel.transform.Find("ElevactionTip").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
});
UIManager.AddEvent(elevaction.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, b =>
{
panel.transform.Find("ElevactionTip").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
});
#endif
}
private bool _canCancelApply = false;
@@ -197,7 +227,7 @@ namespace Assets.Scenes.Ride.Scripts
//路书描述
mapDescText.text = GetMaxString(competition.Dec, 400);
//线路编号
MapId.text = route.Id.ToString();
MapId.text = $"#{route.Id.ToString()}";
ReadMore.SetActive(!string.IsNullOrEmpty(competition.CompetitionPreviewUrl));
//主办方logo
Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs
+14 -14
View File
@@ -176,20 +176,20 @@ namespace Assets.Scenes.Ride.Scripts
{
if (!rideNow.IsInteractable())
return;
var checkAnt = cyclingController.CheckAnt();
#if UNITY_EDITOR
checkAnt = true;
#endif
if (!checkAnt && !cyclingController.isWatch)
{
#if UNITY_IOS || UNITY_ANDROID
var alert = (GameObject)Instantiate(Resources.Load("UI/Prefab/Ride/Mobile/Alert"), panel.transform);
#else
var alert = (GameObject)Instantiate(Resources.Load("UI/Prefab/Ride/Alert"), panel.transform);
#endif
alert.SetActive(true);
}
else
//var checkAnt = cyclingController.CheckAnt();
//#if UNITY_EDITOR
// checkAnt = true;
//#endif
// if (!checkAnt && !cyclingController.isWatch)
// {
//#if UNITY_IOS || UNITY_ANDROID
// var alert = (GameObject)Instantiate(Resources.Load("UI/Prefab/Ride/Mobile/Alert"), panel.transform);
//#else
// var alert = (GameObject)Instantiate(Resources.Load("UI/Prefab/Ride/Alert"), panel.transform);
//#endif
// alert.SetActive(true);
// }
// else
{
cyclingController.InitTcp();
MapUDPService.SendGizpModel();
Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
+19 -1
View File
@@ -491,7 +491,25 @@ public class CyclingController : DeviceServiceMonoBase
public BaseUIManager singleUIManager;
public void GameStart()
{
singleUIManager.StartRide();
var check = CheckAnt();
if (check)
{
singleUIManager.StartRide();
transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = true;
}
else
{
transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = false;
Utils.showToast(null, "Please connect the device!", duration: int.MaxValue, isLowest: true
, stopFunc: () => !(!CheckAnt() && !isWatch)
, endCallback: () =>
{
UIManager.Instance.DevicePanel.Close();
singleUIManager.StartRide();
transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = true;
});
}
}
public void GoContinueRide()
Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs
+42 -1
View File
@@ -5,6 +5,7 @@ using System;
using Assets.Scripts;
using Assets.Scripts.Apis.Models;
using System.Collections.Generic;
using DG.Tweening;
namespace Assets.Scenes.Ride.Scripts
{
@@ -51,6 +52,7 @@ namespace Assets.Scenes.Ride.Scripts
protected override void InitGameObject()
{
base.InitGameObject();
Debug.Log(55);
level = panel.transform.Find("level/Text").GetComponent<Text>();
rideNum = panel.transform.Find("RideNum").GetComponent<Text>();
uploadByUserName = panel.transform.Find("UploadByUserName").GetComponent<Text>();
@@ -60,6 +62,45 @@ namespace Assets.Scenes.Ride.Scripts
altitudeGraph = panel.transform.Find("AltitudeGraph").GetComponent<RawImage>();
mapRanking = panel.transform.Find("MapRanking");
mapId = panel.transform.Find("MapId").GetComponent<Text>();
#if UNITY_STANDALONE_WIN
UIManager.RemoveEvent(distance.gameObject);
UIManager.RemoveEvent(slope.gameObject);
UIManager.RemoveEvent(elevaction.gameObject);
UIManager.RemoveEvent(rideNum.gameObject);
UIManager.AddEvent(distance.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, b =>
{
panel.transform.Find("DistanceTip").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
});
UIManager.AddEvent(distance.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, b =>
{
panel.transform.Find("DistanceTip").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
});
UIManager.AddEvent(slope.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, b =>
{
panel.transform.Find("SlopeTip").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
});
UIManager.AddEvent(slope.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, b =>
{
panel.transform.Find("SlopeTip").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
});
UIManager.AddEvent(elevaction.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, b =>
{
panel.transform.Find("ElevactionTip").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
});
UIManager.AddEvent(elevaction.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, b =>
{
panel.transform.Find("ElevactionTip").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
});
UIManager.AddEvent(rideNum.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, b =>
{
panel.transform.Find("RideTip").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
});
UIManager.AddEvent(rideNum.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, b =>
{
panel.transform.Find("RideTip").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
});
#endif
}
protected override void InitGameObjectData()
{
@@ -77,7 +118,7 @@ namespace Assets.Scenes.Ride.Scripts
rideNum.text = route.TheHeat.ToString();
distance.text = route.Distance.ToString("f1") + "KM";
mapDescText.text = GetMaxString(route.Dec, 255);
mapId.text = route.Id.ToString();
mapId.text = $"#{route.Id.ToString()}";
var userList = ConfigHelper.mapApi.GetOnlineUserInfo(new int[] { route.UserId }).data;
if (userList.Count > 0)
{
Assets/Scripts/Scenes/Ride/Scripts/VersionScript.cs
+40 -3
View File
@@ -1,4 +1,5 @@
using System.Collections;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
@@ -7,12 +8,48 @@ namespace Assets.Scenes.Ride.Scripts
{
public class VersionScript : MonoBehaviour
{
long _delayTime = 0;
Text appVersion;
void Start()
{
var appVersion = transform.GetComponent<Text>();
appVersion = transform.GetComponent<Text>();
if (appVersion != null)
{
appVersion.text = "V"+App.AppVersion;
appVersion.lineSpacing = 1;
appVersion.verticalOverflow = VerticalWrapMode.Overflow;
appVersion.alignment = TextAnchor.LowerRight;
appVersion.text = $"{"V" + App.AppVersion}";
}
}
private void Update()
{
if (_delayTime != App.delayTime && appVersion != null)
{
_delayTime = App.delayTime;
if (_delayTime != -1)
{
appVersion.text = $"<color={getColor(_delayTime)}>{_delayTime.ToString("0")}MS</color>\n{"V" + App.AppVersion}";
}
else
{
appVersion.text = "V" + App.AppVersion;
}
}
}
private string getColor(long a)
{
if (a > 0 && a <= 50)
{
return "#4FE944";
}
else if (a > 50 && a <= 100)
{
return "#E9BF44";
}
else
{
return "#EE2929";
}
}
}