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

# Conflicts:
#	Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs

Assets/Scripts/Apis/Models/MapRoute.cs

@@ -111,5 +111,7 @@ namespace Assets.Scripts.Apis.Models
         public int MineCount { get; set; }
 
         public int[] RouteIds { get; set; }
+        //最近骑行列表使用
+        public RouteResult RecentRecord { get; set; }
     }
 }

Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs

@@ -23,7 +23,8 @@ namespace Assets.Scenes.Ride.Scripts
         GameObject ShareButton { get; set; }
         GameObject ToolBarPanel { get; set; }
         GameObject WeChatButton { get; set; }
-        
+        GameObject WeChatGpButton { get; set; }
+
 
         RawImage TopHead { get; set; }
         RawImage SecondHead { get; set; }
@@ -60,9 +61,9 @@ namespace Assets.Scenes.Ride.Scripts
             ShareButton = transform.Find("ShareButton").gameObject;
             ToolBarPanel = transform.Find("ToolBarPanel").gameObject;
             WeChatButton = transform.Find("ToolBarPanel/WeChatButton").gameObject;
-            ShareButton.SetActive(!cyclingController.isWatch);
-            UIManager.AddEvent(ShareButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, OpenShare);
-            UIManager.AddEvent(WeChatButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, OpenShare);
+            WeChatGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject;
+            UIManager.AddEvent(WeChatButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechat);
+            UIManager.AddEvent(WeChatGpButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechatGp);
 #endif
             SpriteTop = Resources.Load<Sprite>("Images/Ride/Match/top-1");
             SpriteSecond = Resources.Load<Sprite>("Images/Ride/Match/top-2");
@@ -114,7 +115,7 @@ namespace Assets.Scenes.Ride.Scripts
 
                 Mine.SetActive(!cyclingController.isWatch);
                 RankingPanel.SetActive(cyclingController.isWatch);
-                TitleImage.SetActive(!cyclingController.isWatch);
+                //TitleImage.SetActive(!cyclingController.isWatch);
                 WatchTitle.SetActive(cyclingController.isWatch);
 
                 if (!cyclingController.isWatch)
@@ -243,5 +244,17 @@ namespace Assets.Scenes.Ride.Scripts
                 Utils.showToast(null, "未安装微信");
             }
         }
+
+        private void ShareWechatGp(BaseEventData baseEventData)
+        {
+            if (App.weChatController.IsWeChatAppInstalled())
+            {
+                App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname);
+            }
+            else
+            {
+                Utils.showToast(null, "未安装微信");
+            }
+        }
     }
 }

Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs

@@ -41,7 +41,7 @@ namespace Assets.Scenes.Ride.Scripts
         GameObject goResultBtn;
         GameObject cancelBtn;
         GameObject shareWxBtn;
-        GameObject shareButton;
+        GameObject shareWxGpButton;
         Transform toolbar;
         #endregion
 
@@ -74,7 +74,7 @@ namespace Assets.Scenes.Ride.Scripts
             toolbar = transform.Find("ToolBarPanel");
 #if UNITY_ANDROID || UNITY_IOS
             shareWxBtn = transform.Find("ToolBarPanel/WeChatButton").gameObject;
-            shareButton = transform.Find("ShareButton").gameObject;
+            shareWxGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject;
 #endif
         }
 
@@ -83,19 +83,25 @@ namespace Assets.Scenes.Ride.Scripts
             cyclingController = controller;
             cyclingController.AddEvent(goResultBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, GoResult);
             cyclingController.AddEvent(cancelBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Cancel);
+#if UNITY_ANDROID || UNITY_IOS
             cyclingController.AddEvent(shareWxBtn, EventTriggerType.PointerClick, shareToWx);
-            cyclingController.AddEvent(shareButton, EventTriggerType.PointerClick, opneShare);
-        }
-
-        private void opneShare(BaseEventData baseEventData)
-        {
-            ((RectTransform)toolbar).pivot = new Vector2(0, ((RectTransform)toolbar).pivot.y);
-            toolbar.gameObject.SetActive(true);
-            shareButton.SetActive(false);
-            toolbar.DOScaleX(1,1);
+            cyclingController.AddEvent(shareWxGpButton, EventTriggerType.PointerClick, shareToWxGp);
+#endif
         }
 
         private void shareToWx(BaseEventData b)
+        {
+            if (App.weChatController.IsWeChatAppInstalled())
+            {
+                App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname);
+            }
+            else
+            {
+                Utils.showToast(null, "未安装微信");
+            }
+        }
+
+        private void shareToWxGp(BaseEventData b)
         {
             if (App.weChatController.IsWeChatAppInstalled())
             {

Assets/Scripts/UI/Prefab/MultiTips.cs

@@ -19,7 +19,7 @@ public class MultiTips:PFUIText
         var tiplist = ConfigHelper.mapApi.GetTipsList();
         if (!string.IsNullOrEmpty(tiplist))
         {
-            tips = tiplist.Split(',');
+            tips = tiplist.Split('#');
         }
         var random = new System.Random();
         currentIndex = random.Next(0, tips.Length);