Merge remote-tracking branch 'remotes/origin/xiaojie' into douYouTap

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_RoleInfoRegisterUI.cs

@@ -9,9 +9,7 @@ namespace UI.Login
         public GComponent target;
         public GComponent m_bg;
         public GButton m_btnSubmit;
-        public GButton m_btnSendCode;
         public GTextInput m_inputPhone;
-        public GTextInput m_inputCode;
         public GTextInput m_inputAccount;
         public GTextInput m_inputIDNumber;
         public GTextInput m_inputName;
@@ -66,9 +64,7 @@ namespace UI.Login
         {
             m_bg = (GComponent)comp.GetChild("bg");
             m_btnSubmit = (GButton)comp.GetChild("btnSubmit");
-            m_btnSendCode = (GButton)comp.GetChild("btnSendCode");
             m_inputPhone = (GTextInput)comp.GetChild("inputPhone");
-            m_inputCode = (GTextInput)comp.GetChild("inputCode");
             m_inputAccount = (GTextInput)comp.GetChild("inputAccount");
             m_inputIDNumber = (GTextInput)comp.GetChild("inputIDNumber");
             m_inputName = (GTextInput)comp.GetChild("inputName");
@@ -79,9 +75,7 @@ namespace UI.Login
         {
             m_bg = null;
             m_btnSubmit = null;
-            m_btnSendCode = null;
             m_inputPhone = null;
-            m_inputCode = null;
             m_inputAccount = null;
             m_inputIDNumber = null;
             m_inputName = null;

GameClient/Assets/Game/HotUpdate/Views/RoleInfoRegister/RoleInfoRegisterView.cs

@@ -29,7 +29,7 @@ namespace GFGGame
             this.modal = true;
 
             _ui.m_btnSubmit.onClick.Add(OnClickBtnSubmit);
-            _ui.m_btnSendCode.onClick.Add(OnBtnGetCode);
+            //_ui.m_btnSendCode.onClick.Add(OnBtnGetCode);
 
             //输入限制
             _ui.m_inputAccount.restrict = "[0-9A-Za-z_]";
@@ -80,18 +80,18 @@ namespace GFGGame
             //手机号码
             string phoneNumber = _ui.m_inputPhone.text;
             //验证码
-            string code = _ui.m_inputCode.text;
+            //string code = _ui.m_inputCode.text;
             if (string.IsNullOrEmpty(account))
             {
                 PromptController.Instance.ShowFloatTextPrompt("请输入账号");
                 return;
             }
             
-            if (string.IsNullOrEmpty(code))
-            {
-                PromptController.Instance.ShowFloatTextPrompt("请输入验证码");
-                return;
-            }
+            // if (string.IsNullOrEmpty(code))
+            // {
+            //     PromptController.Instance.ShowFloatTextPrompt("请输入验证码");
+            //     return;
+            // }
             
             if (account.Length < 6) //最长输入在UI编辑器中做了限制
             {
@@ -133,7 +133,7 @@ namespace GFGGame
                 }
             }
 
-            LoginController.RegisterRoleInfo(account, password, realName, idNumberStr, code, phoneNumber).Coroutine();
+            LoginController.RegisterRoleInfo(account, password, realName, idNumberStr, "", phoneNumber).Coroutine();
         }
     }
 }