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

Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble

Browse Source
This commit is contained in:
lishuo 2021-09-15 21:16:30 +08:00
commit d7486c920c
8 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Plugins/Android/ImageSelector-release.aar
View File

Binary file not shown.

6
Assets/Scripts/UI/Prefab/Panel/DeviceController.cs
View File

@ -9,6 +9,7 @@ using UnityEngine.UI;
using UnityEngine.EventSystems;
using DG.Tweening;
using Assets.Scripts.Devices.Ble.Devices;
using Assets.Scripts;
public class DeviceController : PFUIPanel
{
@ -187,15 +188,12 @@ public class DeviceController : PFUIPanel
public override void Show()
{
var cg = this.GetComponent<CanvasGroup>();
cg.alpha = 0;
base.Show();
App.MainDeviceAdapter.ClearDevice();
#if UNITY_ANDROID || UNITY_IOS
App.MainDeviceAdapter.StartScan();
#endif
cg.DOFade(1f, 0.3f);
transform.MyDOFade();
}
protected override void OnDisable()

5
Assets/Scripts/UI/Prefab/Panel/HomeController.cs
View File

@ -254,11 +254,8 @@ public class HomeController : PFUIPanel
public override void Show()
{
var cg = this.GetComponent<CanvasGroup>();
cg.alpha = 0;
base.Show();
cg.DOFade(1f, 0.3f);
transform.MyDOFade();
GetSummary();
}
}

4
Assets/Scripts/UI/Prefab/Panel/MapListController.cs
View File

@ -465,8 +465,6 @@ public class MapListController : PFUIPanel
transform.Find("RawImage").GetComponent<RawImage>().texture = App.DefaultRotateTexture;
}
ResetPanel();
var cg = this.GetComponent<CanvasGroup>();
cg.alpha = 0;
cg.DOFade(1f, .3f);
transform.MyDOFade();
}
}

4
Assets/Scripts/UI/Prefab/Race/RaceScript.cs
View File

@ -12,9 +12,7 @@ public class RaceScript : PFUIPanel
public override void Show()
{
base.Show();
var cg = this.GetComponent<CanvasGroup>();
cg.alpha = 0;
cg.DOFade(1f, .5f);
transform.MyDOFade();
}
protected void StartTime()
{

4
Assets/Scripts/UI/Prefab/SettingContoller.cs
View File

@ -137,9 +137,7 @@ public class SettingContoller : PFUIPanel
public override void Show()
{
var cg = this.GetComponent<CanvasGroup>();
cg.alpha = 0;
base.Show();
cg.DOFade(1f, 0.3f);
transform.MyDOFade();
}
}

14
Assets/Scripts/Utils/Utils.cs
View File

@ -502,5 +502,19 @@ namespace Assets.Scripts
{
UIManager.Instance.StartCoroutine(TimerFunc(seconds, action));
}
public static void MyDOFade(this Transform transform)
{
var cg = transform.GetComponent<CanvasGroup>();
if (cg)
{
cg.alpha = 0;
#if UNITY_IOS
cg.DOFade(1f, .6f);
#else
cg.DOFade(1f, .3f);
#endif
}
}
}
}

1
ProjectSettings/GraphicsSettings.asset
View File

@ -38,6 +38,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}