按设计稿修改登录页登录样式;修改主页动画顺序;增加我的收藏列表可切换
This commit is contained in:
1 parent
f23fc4b4c0
commit
3ca297ee96
40 files changed
+5474
-1548
No files matched your search
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user