|
|
@@ -65,7 +65,7 @@ public class RegisterView : MonoBehaviour
|
|
|
registerInUser.SetActive(!isNext);
|
|
|
registerInPWD1.SetActive(!isNext);
|
|
|
registerInPWD2.SetActive(!isNext);
|
|
|
- registerInEmail.SetActive(!isNext);
|
|
|
+ registerInEmail.SetActive(!isNext && CommonConfig.serverIndex == 1);
|
|
|
registerInPhone.SetActive(!isNext && CommonConfig.serverIndex == 0);
|
|
|
if (CommonConfig.banBindRelateAccount)
|
|
|
{
|
|
|
@@ -156,13 +156,21 @@ public class RegisterView : MonoBehaviour
|
|
|
PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("两次输入的密码不一致"));
|
|
|
return;
|
|
|
}
|
|
|
- if (!CommonConfig.banBindRelateAccount)
|
|
|
- {
|
|
|
- if (string.IsNullOrEmpty(_bindingEmail) && string.IsNullOrEmpty(_bindingPhone)) {
|
|
|
- if (CommonConfig.serverIndex == 0) PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("至少需要绑定邮箱号或者手机号"));
|
|
|
- else PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("尚未绑定邮箱号"));
|
|
|
- return;
|
|
|
- }
|
|
|
+ // if (!CommonConfig.banBindRelateAccount)
|
|
|
+ // {
|
|
|
+ // if (string.IsNullOrEmpty(_bindingEmail) && string.IsNullOrEmpty(_bindingPhone)) {
|
|
|
+ // if (CommonConfig.serverIndex == 0) PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("至少需要绑定邮箱号或者手机号"));
|
|
|
+ // else PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("尚未绑定邮箱号"));
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ if (registerInEmail.activeSelf && string.IsNullOrEmpty(_bindingEmail)) {
|
|
|
+ PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("尚未绑定邮箱号"));
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (registerInPhone.activeSelf && string.IsNullOrEmpty(_bindingPhone)) {
|
|
|
+ PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("尚未绑定手机号"));
|
|
|
+ return;
|
|
|
}
|
|
|
InputField captcha = GetInputField(registerInCaptcha);
|
|
|
if (!captcha.text.Equals(captcha_Register.ToString())) {
|