按设计稿修改登录页登录样式;修改主页动画顺序;增加我的收藏列表可切换
This commit is contained in:
1 parent
f23fc4b4c0
commit
3ca297ee96
40 files changed
+5474
-1548
No files matched your search
@@ -21,13 +21,13 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
|
||||
{
|
||||
loginScrollView = transform.Find("Panel/LoginContainer/LoginScrollView").GetComponent<ScrollRect>();
|
||||
thirdLoginPage = loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer-third");
|
||||
UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer/BtnThirdLogin").gameObject,
|
||||
UnityEngine.EventSystems.EventTriggerType.PointerClick,
|
||||
(b)=> ShowThirdLoginPage());
|
||||
UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer-third/BtnReturn").gameObject,
|
||||
UnityEngine.EventSystems.EventTriggerType.PointerClick,
|
||||
(b) => HideThirdLoginPage());
|
||||
UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer-third/otherContainer/Wechat").gameObject,
|
||||
//UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer/BtnThirdLogin").gameObject,
|
||||
// UnityEngine.EventSystems.EventTriggerType.PointerClick,
|
||||
// (b)=> ShowThirdLoginPage());
|
||||
//UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer-third/BtnReturn").gameObject,
|
||||
// UnityEngine.EventSystems.EventTriggerType.PointerClick,
|
||||
// (b) => HideThirdLoginPage());
|
||||
UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer/otherContainer/Wechat").gameObject,
|
||||
UnityEngine.EventSystems.EventTriggerType.PointerClick,
|
||||
(b) => goWxLogin());
|
||||
}
|
||||
@@ -43,7 +43,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
|
||||
weChat = App.weChatController;
|
||||
weChat.Init(App.WxAppId);
|
||||
#if UNITY_IOS
|
||||
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer-third/otherContainer/Apple").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Apple").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
GetComponent<LoginController>()
|
||||
@@ -53,9 +53,9 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
|
||||
#endif
|
||||
});
|
||||
#else
|
||||
transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer-third/otherContainer/Apple").gameObject.SetActive(false);
|
||||
transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Apple").gameObject.SetActive(false);
|
||||
#endif
|
||||
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer-third/otherContainer/Facebook").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Facebook").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
FB.LogOut();
|
||||
FB.LogInWithReadPermissions(callback: onFaceBookResp);
|
||||
@@ -71,8 +71,8 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
|
||||
private async void CheckUpdate()
|
||||
{
|
||||
#if UNITY_ANDROID
|
||||
transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/BtnThirdLogin")
|
||||
.gameObject.SetActive(true);
|
||||
//transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/BtnThirdLogin")
|
||||
// .gameObject.SetActive(true);
|
||||
#endif
|
||||
var r = await ConfigHelper.userApi.GetVersions();
|
||||
if (r.result)
|
||||
@@ -92,8 +92,8 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
|
||||
//var sw = r.data.Value<string>("ThirdPartSwitch");
|
||||
//transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/BtnThirdLogin")
|
||||
// .gameObject.SetActive(sw.Equals("on") && App.weChatController.IsWeChatAppInstalled());
|
||||
transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/BtnThirdLogin")
|
||||
.gameObject.SetActive(true);
|
||||
//transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/BtnThirdLogin")
|
||||
// .gameObject.SetActive(true);
|
||||
var info = r.data.Value<JObject>("UnityIos");
|
||||
if (Utils.isUpdate(App.AppVersion, info.Value<string>("Version")))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user