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

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

@@ -62,8 +62,11 @@ public class HomeController : PFUIPanel
                 //Application.OpenURL("https://powerfun.oss-cn-shanghai.aliyuncs.com/Releases/PowerFunWorkouts.exe");
                 return;
             }
-            Utils.ExecFile(path);
-            Application.Quit();
+            UIManager.ShowConfirm("Confirm", "Switch to PowerFun Workouts?\nWe will close the Powerfun and start PowerFun Workouts.", () => 
+            {
+                Utils.ExecFile(path);
+                Application.Quit();
+            });
         });
         UIManager.AddEvent(BtnTraining.gameObject, EventTriggerType.PointerEnter, OnHover);
         UIManager.AddEvent(BtnTraining.gameObject, EventTriggerType.PointerExit, OnExit);

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

@@ -398,8 +398,6 @@ public class MapListController : PFUIPanel
 
     public override void Show()
     {
-        var cg = this.GetComponent<CanvasGroup>();
-        cg.alpha = 0;
         base.Show();
         if (App.TextureCache.ContainsKey("rotateImage"))
         {
@@ -409,6 +407,8 @@ public class MapListController : PFUIPanel
         {
             transform.Find("RawImage").GetComponent<RawImage>().texture = App.DefaultRotateTexture;
         }
+        var cg = this.GetComponent<CanvasGroup>();
+        cg.alpha = 0;
         cg.DOFade(1f, .3f);
     }
 }