lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc版首页；安卓google登录；解决fb登录ios问题

Browse Source
This commit is contained in:
Caiyanpeng committed 2022-01-12 16:55:57 +08:00
1 parent f0df68bbda
commit 91fa3cc82d
16 files changed
+3642 -2796
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/App.cs
+1 -1
View File
@@ -19,7 +19,7 @@ public delegate void ChangeLanguageDelegate();
public static class App
{
public static string Host = "http://192.168.0.101:5083/";
public static string Host = "http://192.168.0.101:5084/";
public static string AppVersion = Application.version;
Assets/Scripts/Mobile/LoginControllerMobile.cs
+6 -3
View File
@@ -19,8 +19,6 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
void Awake()
{
transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Wechat")
.gameObject.SetActive(App.weChatController.IsWeChatAppInstalled());
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,
@@ -44,6 +42,10 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
DateTime.Now.ToString("HH:mm");
weChat = App.weChatController;
weChat.Init(App.WxAppId);
#if UNITY_IOS
transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Wechat")
.gameObject.SetActive(App.weChatController.IsWeChatAppInstalled());
#endif
#if UNITY_IOS
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Apple").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
@@ -64,7 +66,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
});
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
//Utils.CallAndroidMethod("signInWithGoogle");
Utils.CallAndroidMethod("signInWithGoogle");
});
//App.weChatController.Init(App.WxAppId);
//var s = App.weChatController.isApplicationAvilible("com.gugoumainapp","powerfun").ToString();
@@ -200,6 +202,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
public void OnMobileGoogleLoginResp(string res)
{
Utils.showToast(null, res);
Debug.Log(res);
//if (res.Contains("true;"))
//{
// GetComponent<LoginController>().goWxLoginWithCode(res.Replace("true;", ""), "mobile");
Assets/Scripts/Scenes/LoginController.cs
+3 -1
View File
@@ -1156,11 +1156,13 @@ public class LoginController : BaseScene
imagexf.localPosition = new Vector3(0, -669, 0);
LoginBg.localPosition = Vector3.zero;
LoginBg.GetComponent<RectTransform>().sizeDelta = new Vector2(360, 573);
#endif
#else
imagedf.GetComponent<Image>().color = new Color(255, 255, 255, 0);
imagexf.GetComponent<Image>().color = new Color(255, 255, 255, 0);
LoginBg.GetComponent<RectTransform>().sizeDelta = new Vector2(354, 370);
LoginBg.GetComponent<RectTransform>().localPosition = new Vector2(LoginBg.GetComponent<RectTransform>().localPosition.x, 0);
#endif
var scrollValue = 1f / (pageNums - 1);
var value = 1 * scrollValue;
Assets/Scripts/Scenes/MainController.cs
+1 -1
View File
@@ -179,7 +179,7 @@ public class MainController : BaseScene
msgIndex++;
}
#if UNITY_STANDALONE_WIN
float moveOffset = 46;
float moveOffset = 74;
#else
float moveOffset = 38;
#endif
Assets/Scripts/UI/Prefab/Panel/HomeController.cs
+2 -2
View File
@@ -257,8 +257,8 @@ public class HomeController : PFUIPanel
todayData.Find("Datas/Climb/Rank").GetComponent<Text>().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0.0")}";
todayData.Find("Datas/Carlories/Rank").GetComponent<Text>().text = summary.CurrentTotalKcal == 0 ? "——" : $"+{summary.CurrentTotalKcal.ToString("#0")}";
#if UNITY_STANDALONE_WIN
todayData.Find("NickName").GetComponent<Text>().text = App.CurrentUser.Nickname;
todayData.Find("ID").GetComponent<Text>().text = $"ID:{App.CurrentUser.Id.ToString("000000")}";
//todayData.Find("NickName").GetComponent<Text>().text = App.CurrentUser.Nickname;
//todayData.Find("ID").GetComponent<Text>().text = $"ID:{App.CurrentUser.Id.ToString("000000")}";
#endif
}