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

Merge branch 'dev_lishuo' into dev_cyp

Browse Source 
# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
This commit is contained in:
Caiyanpeng committed 2021-11-23 09:51:10 +08:00
2 parents 8c5ad08475 eb9338390c
commit 190a66bb68
89 files changed
+9195 -1628
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/LoginController.cs
+10 -10
View File
@@ -187,9 +187,9 @@ public class LoginController : BaseScene
years.options = regOptions.years;
months.options = regOptions.months;
days.options = regOptions.days;
years.captionText.text = "Year";
months.captionText.text = "Month";
days.captionText.text = "Day";
years.captionText.text = App.GetLocalString("Year");
months.captionText.text = App.GetLocalString("Month");
days.captionText.text = App.GetLocalString("Day");
years.onValueChanged.AddListener((int index) =>
{
if (index != -1 && months.value != -1)
@@ -207,7 +207,7 @@ public class LoginController : BaseScene
}
});
genders.options = regOptions.genders;
genders.captionText.text = "Gender";
genders.captionText.text = App.GetLocalString("Gender");
countrys.options = regOptions.countrys;
countrys.value = regOptions.countryDefaultValue;
countrys.onValueChanged.AddListener((int index) =>
@@ -215,7 +215,7 @@ public class LoginController : BaseScene
countrys.transform.Find("RawImage").GetComponent<RawImage>().texture = regOptions.GetCountryImage(index);
});
units.options = regOptions.units;
units.captionText.text = "Display Units";
units.captionText.text = App.GetLocalString("Display Units");
signForm = new SignForm()
{
email = email,
@@ -782,16 +782,16 @@ public class LoginController : BaseScene
{
var btn = signPage1.Find("Captcha").Find("BtnGet");
var btnText = signPage1.Find("Captcha").Find("BtnGet").Find("Text").GetComponent<Text>();
btnText.text = $"Again({time--})";
btnText.text = $"{App.GetLocalString("Again")}({time--})";
if (time < 0)
{
btnText.text = "Get";
btnText.text = App.GetLocalString("Get");
btn.GetComponent<Button>().enabled = true;
btn.GetComponent<Button>().interactable = true;
startCaptcha = false;
//timer.Stop();
}
timer = 1.0f;
timer += 1.0f;
}
}
@@ -1184,7 +1184,7 @@ public class LoginController : BaseScene
if (type == 0)
{
pageNums = 4;
signContainer.Find("signText").GetComponent<Text>().text = "SIGN UP";
signContainer.Find("signText").GetComponent<Text>().text = App.GetLocalString("SIGN UP");
wxLogin2.gameObject.SetActive(false);
signPage1.Find("next").gameObject.SetActive(true);
signPage1.Find("BtnModiPass").gameObject.SetActive(false);
@@ -1197,7 +1197,7 @@ public class LoginController : BaseScene
else
{
pageNums = 4;
signContainer.Find("signText").GetComponent<Text>().text = "RESET PASSWORD";
signContainer.Find("signText").GetComponent<Text>().text = App.GetLocalString("RESET PASSWORD");
wxLogin2.gameObject.SetActive(false);
signPage1.Find("next").gameObject.SetActive(false);
signPage1.Find("BtnModiPass").gameObject.SetActive(true);