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

音效&骑行loading优化

Browse Source
This commit is contained in:
lishuo 2021-12-16 16:53:38 +08:00
parent 40ac7e1397
commit b9d14a590c
11 changed files with 1264 additions and 1207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,7 +283,9 @@
"My Upload": "我的上传",
"My Collection": "我的收藏",
"Recent Routes": "最近骑行",
"All Route": "全部线路"
"All Route": "全部线路",
"Reconnect": "重新连接",
"Did you want to reconnect the trip that was interrupted abnormally?": "你有异常中断的骑行,是否重新连接开始骑行?"
},
"en": {
"HOT ROUTES": "HOT ROUTES",
@ -560,6 +562,8 @@
"My Upload": "My Upload",
"My Collection": "My Collection",
"Recent Routes": "Recent Routes",
"All Route": "All Route"
"All Route": "All Route",
"Reconnect": "Reconnect",
"Did you want to reconnect the trip that was interrupted abnormally?": "Did you want to reconnect the trip that was interrupted abnormally?"
}
}

BIN
Assets/Resources/audio/高科技UI点击触控警告提示反馈APP菜单UI-App 界面按_爱给网_aigei_com.mp3 Normal file
View File

Binary file not shown.

22
Assets/Resources/audio/高科技UI点击触控警告提示反馈APP菜单UI-App 界面按_爱给网_aigei_com.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 84d23fd0e2b8aa54a93c299537dec8b4
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/audio/高科技UI点击触控警告提示反馈APP菜单UI-很酷的应用程序_爱给网_aigei_com.mp3 Normal file
View File

Binary file not shown.

22
Assets/Resources/audio/高科技UI点击触控警告提示反馈APP菜单UI-很酷的应用程序_爱给网_aigei_com.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: b6d8302f7867b0f4da50ee0fa4921dbb
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

2326
Assets/Scenes/Login-Mobile.unity
View File

File diff suppressed because it is too large Load Diff

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

@ -202,7 +202,8 @@ public class MainController : BaseScene
{
var tempRecordData = Newtonsoft.Json.JsonConvert.DeserializeObject<TempRecordData>(content);
App.tempRecordData = tempRecordData;
SceneManager.LoadScene("Ride");
UIManager.ShowConfirm(App.GetLocalString("Reconnect"), App.GetLocalString("Did you want to reconnect the trip that was interrupted abnormally?"), () => { SceneManager.LoadScene("Ride"); });
}
}
}

66
Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs
View File

@ -57,7 +57,7 @@ namespace Assets.Scenes.Ride.Scripts
return;
}
if (targetAlpha != canvasGroup.alpha && depressFlag)
if (targetAlpha != canvasGroup.alpha && depressFlag && slider.value >= 100)
{
canvasGroup.alpha = Mathf.Lerp(canvasGroup.alpha, targetAlpha, alphaSpeed * Time.deltaTime);
if (Mathf.Abs(targetAlpha - canvasGroup.alpha) <= 0.01f)
@ -66,6 +66,7 @@ namespace Assets.Scenes.Ride.Scripts
}
if (canvasGroup.alpha == 0)
{
StartGame();
transform.gameObject.SetActive(false);
}
}
@ -108,12 +109,16 @@ namespace Assets.Scenes.Ride.Scripts
_map.OnInitialized += _map_OnInitialized;
canvasGroup = transform.GetComponent<CanvasGroup>();
rideNow.interactable = false;
//rideNow.interactable = false;
//rideNow.enabled = false;
UIManager.AddEvent(rideNow.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, StartRide);
UIManager.AddEvent(cancel.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, Cancel);
slider.onValueChanged.AddListener((f) =>
{
processText.text = $"{(f).ToString("#0")}%";
});
}
}
//加载数据
protected virtual void InitGameObjectData()
{
@ -155,25 +160,30 @@ namespace Assets.Scenes.Ride.Scripts
//设定当前loading进度
public virtual void AddProcess(float v)
{
process += v;
slider.value = process;
slider.onValueChanged.AddListener((f) =>
{
processText.text = $"{(f).ToString("#0")}%";
});
if (process >= 100)
return;
process += v;
if (depressFlag)
{
rideNow.interactable = true;
//rideNow.enabled = true;
slider.DOKill();
slider.DOValue(process, 0.5f);
}
}
}
protected string GetMaxString(string value, int length)
{
var s = Helper.SubStr(value, length);
return s;
}
private void StartGame()
{
Debug.Log("StartGame");
cyclingController.InitTcp();
MapUDPService.SendGizpModel();
cyclingController.ReSetUIManager();
cyclingController.GoContinueRide();
}
protected virtual void StartRide(BaseEventData baseEvent)
{
if (!rideNow.IsInteractable())
@ -181,31 +191,10 @@ namespace Assets.Scenes.Ride.Scripts
rideNow.interactable = false;
processText.gameObject.SetActive(true);
slider.gameObject.SetActive(true);
var preValue = slider.value;
slider.value = 0;
slider.DOValue(preValue, 2).onComplete+=()=> {
cyclingController.InitTcp();
MapUDPService.SendGizpModel();
cyclingController.ReSetUIManager();
cyclingController.GoContinueRide();
//启用ridenow
canvasGroup.blocksRaycasts = false;
depressFlag = true;
};
//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
canvasGroup.blocksRaycasts = false;
depressFlag = true;
slider.DOValue(process, 1);
}
protected virtual void Cancel(BaseEventData baseEvent)
{
@ -224,6 +213,7 @@ namespace Assets.Scenes.Ride.Scripts
if (s == ModuleState.Finished)
{
AddProcess(40);
Debug.Log($"add 40");
}
};
}

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

@ -366,8 +366,9 @@ public class CyclingController : DeviceServiceMonoBase
{
case 1:
{
UnityEngine.Debug.Log($"{Input.touches[0]}{Input.touches[0].phase }");
//单击切换极简模式
if (Input.touches[0].tapCount==1 && isStart && singleUIManager.clearLock && competitionId == 0)
if (Input.touches[0].tapCount==1 && Input.touches[0].phase == TouchPhase.Moved && isStart && singleUIManager.clearLock && competitionId == 0)
{
if (IsPointerOverGameObject(Input.mousePosition))
{
@ -673,7 +674,7 @@ public class CyclingController : DeviceServiceMonoBase
private IEnumerator MoveCamera(Vector3 prePos, Vector3 nextPos)
{
float t = 0;
while (t < 0.5f)
while (t < 0.37f)
{
t += Time.deltaTime;
Vector3 v = Vector3.Lerp(prePos, nextPos, t);

5
Assets/Scripts/UI/Prefab/MapList/MapItem.cs
View File

@ -230,7 +230,10 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
map.IsFavorite = !map.IsFavorite;
transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite =
UIManager.Instance.collectDict[map.IsFavorite];
this.model.IsFavorite = map.IsFavorite;
if (this.model != null)
{
this.model.IsFavorite = map.IsFavorite;
}
//SetColor(map.IsFavorite);
}
else

14
Assets/Scripts/UIManager.cs
View File

@ -874,6 +874,7 @@ public class UIManager : MonoBehaviour
}
static Texture2D cursor;
static AudioClip buttonClip;
public static void RemoveEvent(GameObject gameObject)
{
EventTrigger et = gameObject.GetComponent<EventTrigger>();
@ -923,9 +924,21 @@ public class UIManager : MonoBehaviour
{
cursor = Resources.Load<Texture2D>("Images/PointerButtonHover");
}
//设置点击音效
if (buttonClip == null)
{
buttonClip = Resources.Load<AudioClip>("audio/dundundun");
}
var audioSource = gameObject.GetComponent<AudioSource>();
if (audioSource == null)
{
audioSource = gameObject.AddComponent<AudioSource>();
}
UIManager.AddEvent(gameObject, EventTriggerType.PointerEnter, (e) =>
{
//if (!gameObject.activeInHierarchy) return;
audioSource.PlayOneShot(buttonClip);
Cursor.SetCursor(cursor, Vector2.zero, CursorMode.Auto);
});
UIManager.AddEvent(gameObject, EventTriggerType.PointerUp, (e) =>
@ -938,6 +951,7 @@ public class UIManager : MonoBehaviour
//if (!gameObject.activeInHierarchy) return;
Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
});
}
}