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

# Conflicts:
#	Assets/Scripts/App.cs

Assets/Scripts/Scenes/LoginController.cs

@@ -117,6 +117,10 @@ public class LoginController : BaseScene
 
     public Texture avatar;
     // Start is called before the first frame update
+    private void Awake()
+    {
+        App.CanOpenAd = true;
+    }
     void Start()
     {
 #if UNITY_ANDROID || UNITY_IOS

Assets/Scripts/Scenes/MainController.cs

@@ -337,6 +337,24 @@ public class MainController : BaseScene
         else
         {
             UIManager.ShowHomePanel();
+            if (App.CanOpenAd) 
+            {
+                App.CanOpenAd = false;
+
+                var _r = await ConfigHelper.activityApi.GetCurrentActivityList();
+                if (_r.result && _r.data != null)
+                {
+                    var adList = _r.data;
+                    App.adQueue.Clear();
+                    foreach (var _ad in adList)
+                    {
+                        App.adQueue.Enqueue(_ad);
+                    }
+                    var ad = App.adQueue.Dequeue();
+                    UIManager.ShowActivityAdPanel(ad.Id, ad.DetailUrl, ad.Url + $"?Token={App.CurrentUser.cookie}");
+                }
+            }
+            
             //UIManager.ShowNewRouteOverviewPanel();
             //UIManager.ShowUserInfoPanel();
             //UIManager.ShowEditUserPanel();