按设计稿修改登录页登录样式；修改主页动画顺序；增加我的收藏列表可切换

Assets/Scripts/Scenes/LoginController.cs

@@ -405,16 +405,10 @@ public class LoginController : BaseScene
                 {
                     if (pageNums == 5)
                     {
-#if UNITY_ANDROID || UNITY_IOS
-                        MobileAni(false);
-#endif
                         StartScrollPanel(3);
                     }
                     else if (pageNums == 4)
                     {
-#if UNITY_ANDROID || UNITY_IOS
-                        MobileAni(false);
-#endif
                         StartScrollPanel(2);
                     }
                     else
@@ -529,7 +523,6 @@ public class LoginController : BaseScene
                 wxLogin3.gameObject.SetActive(true);
                 signContainer.gameObject.SetActive(false);
                 pageNums = 3;
-                MobileAni(true);
                 StartScrollPanel(2);
             }
         }
@@ -561,7 +554,6 @@ public class LoginController : BaseScene
                 wxLogin3.gameObject.SetActive(true);
                 signContainer.gameObject.SetActive(false);
                 pageNums = 3;
-                MobileAni(true);
                 StartScrollPanel(2);
             }
         }
@@ -782,7 +774,6 @@ public class LoginController : BaseScene
                 //wxLogin3.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
                 signContainer.gameObject.SetActive(false);
                 pageNums = 3;
-                MobileAni(true);
                 //this.goSign();
                 StartScrollPanel(2);
             }
@@ -964,7 +955,6 @@ public class LoginController : BaseScene
             {
                 var u = JObject.FromObject(r.data).ToObject<UserResultModel>();
                 RefreshWx3(u, 1);
-                MobileAni(true);
                 StartScrollPanel(4);
             }
             else
@@ -1040,9 +1030,6 @@ public class LoginController : BaseScene
     void goRegEnd()
     {
         if (!UpdateInfo()) return;
-#if UNITY_ANDROID || UNITY_IOS
-        MobileAni(true);
-#endif
         if (pageNums == 5)
         {
             this.StartScrollPanel(4);
@@ -1139,7 +1126,7 @@ public class LoginController : BaseScene
             wxReturnLogin();
         }
 #else
-        transform.GetComponent<LoginControllerMobile>().HideThirdLoginPage();
+        //transform.GetComponent<LoginControllerMobile>().HideThirdLoginPage();
 #endif
         Canvas.ForceUpdateCanvases();
         this.StartScrollPanel(1);
@@ -1192,8 +1179,6 @@ public class LoginController : BaseScene
             LoginBg.GetComponent<RectTransform>().DOSizeDelta(new Vector2(360, 385), 0.3f);
             LoginBg.GetComponent<RectTransform>().DOLocalMoveY(-94, 0.3f);
         }
-#else
-        MobileAni(true);
 #endif
         this.StartScrollPanel(0);
     }
@@ -1217,8 +1202,6 @@ public class LoginController : BaseScene
             LoginBg.GetComponent<RectTransform>().DOSizeDelta(new Vector2(360, 573), 0.3f);
             LoginBg.GetComponent<RectTransform>().DOLocalMoveY(0, 0.3f);
         }
-#else
-        MobileAni(false);
 #endif
         //DOTween.To(() => o, x => o = x, t, 0.3f);
         this.StartScrollPanel(1);
@@ -1496,7 +1479,22 @@ public class LoginController : BaseScene
     }
     //float adjTime = 0;
     //bool startJs = false;
-#region 主页面滑动逻辑
+    #region 主页面滑动逻辑
+    private void handleAnimate(int index) 
+    {
+        if (pageNums == 3)
+        {
+            MobileAni(index == 0 || index == 2);
+        }
+        else if (pageNums == 4)
+        {
+            MobileAni(index == 0 || index == 3);
+        }
+        else if (pageNums == 5) 
+        {
+            MobileAni(index == 0 || index == 2 || index == 4);
+        }
+    }
     private int tmpImdex = 0;
     private int scrollPanelIndex = 2;
     //private float scrollValue = 0.5f;
@@ -1504,6 +1502,9 @@ public class LoginController : BaseScene
     private void StartScrollPanel(int index)
     {
         if (startScrollPanel) return;
+#if UNITY_ANDROID || UNITY_IOS
+        handleAnimate(index);
+#endif
         scrollPanelIndex = index;
         startScrollPanel = true;
     }

Assets/Scripts/Scenes/MainController.cs

@@ -85,7 +85,7 @@ public class MainController : BaseScene
         msgs = List<CanvasGroup> { msg, msg2, msg3 };
         rightMessage = transform.Find("GameObject/MessageRight").GetComponent<CanvasGroup>();
 #else
-        msgLocation = new Vector3(168, -153, 0);
+        msgLocation = new Vector3(168, 37, 0);
         var go = transform.Find("GameObject");
         go.GetComponent<RectTransform>().anchorMin = Vector2.zero;
         go.GetComponent<RectTransform>().anchorMax = Vector2.one;
@@ -182,7 +182,7 @@ public class MainController : BaseScene
                 m.DOFade(1, 0.5f);
                 foreach (var item in msgs.Where((x, i) => i != selectIndex))
                 {
-                    item.transform.DOLocalMoveY(item.transform.localPosition.y + 38, 0.5f);
+                    item.transform.DOLocalMoveY(item.transform.localPosition.y - 38, 0.5f);
                 }
             };
         }
@@ -193,7 +193,7 @@ public class MainController : BaseScene
             for (int i = 0; i < msgIndex; i++) 
             {
                 var rect = msgs[i].GetComponent<RectTransform>();
-                rect.DOLocalMoveY(rect.localPosition.y + 38, 0.5f);
+                rect.DOLocalMoveY(rect.localPosition.y - 38, 0.5f);
             }
             m.DOFade(1, 0.5f);
         }

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

@@ -236,7 +236,7 @@ namespace Assets.Scenes.Ride.Scripts
         {
             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);
+                App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname, null);
             }
             else
             {

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

@@ -99,7 +99,7 @@ namespace Assets.Scenes.Ride.Scripts
         {
             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);
+                App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname,null);
             }
             else
             {