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

Assets/Scripts/UI/Prefab/Panel/DeviceController.cs

@@ -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
-
+        transform.MyDOFade();        
-        cg.DOFade(1f, 0.3f);        
     }
 
     protected override void OnDisable()

Assets/Scripts/UI/Prefab/Panel/HomeController.cs

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

Assets/Scripts/UI/Prefab/Panel/MapListController.cs

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

Assets/Scripts/UI/Prefab/Race/RaceScript.cs

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

Assets/Scripts/UI/Prefab/SettingContoller.cs

@@ -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();
     }
 }

Assets/Scripts/Utils/Utils.cs

@@ -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
+            }
+        }
     }
 }

ProjectSettings/GraphicsSettings.asset

@@ -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}