1

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -272,5 +272,7 @@ namespace GFGGame
         public const string BlindBox_BuyOne = "BlindBox_BuyOne";
         //盲盒购买所有
         public const string BlindBox_BuyAll = "BlindBox_BuyAll";
+        //手机号变动
+        public const string PhoneChange = "PhoneChange";
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -175,12 +175,21 @@ namespace GFGGame
             return;
         }
 
+        /// <summary>
+        /// 注册
+        /// </summary>
+        /// <param name="account">账号</param>
+        /// <param name="password">密码</param>
+        /// <param name="name">身份证名</param>
+        /// <param name="identityNum">身份证号码</param>
+        /// <param name="code">手机验证码</param>
+        /// <param name="phoneNumber">手机号码</param>
         public static async ETTask Register(string account, string password, string name, string identityNum,
-            string code)
+            string code, string phoneNumber)
         {
             ViewManager.Show<ModalStatusView>("注册中...");
             int errorCode = await LoginHelper.Register(GameGlobal.zoneScene, GameConfig.LoginAddress, account, password,
-                name, identityNum, code);
+                name, identityNum, code, phoneNumber);
 
             if (errorCode == ErrorCode.ERR_Success)
             {

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -445,6 +445,6 @@ namespace GFGGame
         public BlindBoxType typeOne = new BlindBoxType { type = 1, check = false };
         public BlindBoxType typeAll = new BlindBoxType { type = 6, check = false };
         /*****************************************************************/
-        public string PhoneNum = "";
+        public string PhoneNumber = "";
     }
 }

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs

@@ -81,7 +81,7 @@ namespace ET
                 return (a2CLoginAccount.Error, a2CLoginAccount.DeleteTime);
             }
 
-            OnLoginSuccess(zoneScene, a2CLoginAccount, accountSession, account, passwordMD5);
+            OnLoginSuccess(zoneScene, a2CLoginAccount, accountSession, account, password);
 
             return (ErrorCode.ERR_Success, 0);
         }
@@ -105,7 +105,7 @@ namespace ET
         }
 
         public static async ETTask<int> Register(Scene zoneScene, string address, string account, string password,
-            string name, string identityNum, string code)
+            string name, string identityNum, string code, string phoneNumber)
         {
             A2C_Register r2C_Register = null;
             Session session = null;
@@ -123,7 +123,8 @@ namespace ET
                         IdentityNum = identityNum,
                         Code = code,
                         PlatformId = LauncherConfig.platformId,
-                        ChannelId = LauncherConfig.ChannelId
+                        ChannelId = LauncherConfig.ChannelId,
+                        PhoneNumber = phoneNumber
                     });
                     if (r2C_Register.Error != ErrorCode.ERR_Success)
                     {

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Security.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9480152ba6194352b5db32d091a0ff1e
+timeCreated: 1761142720

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Security/SecurityHelper.cs

@@ -0,0 +1,185 @@
+using System;
+using ET;
+
+namespace GFGGame
+{
+    public static class SecurityHelper
+    {
+        /// <summary>
+        /// 未进入游戏前--请求获取验证码
+        /// </summary>
+        /// <param name="account"></param>
+        /// <param name="reqType"></param>
+        /// <returns></returns>
+        public static async ETTask<S2C_GetMobileVerificationCode> GetMobileVerificationCode(string account,
+            SendCodeType reqType)
+        {
+            S2C_GetMobileVerificationCode s2CGetMobileVerificationCode = null;
+            Session session = null;
+            try
+            {
+                session = GameGlobal.zoneScene.GetComponent<NetKcpComponent>()
+                    .Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
+
+                s2CGetMobileVerificationCode = (S2C_GetMobileVerificationCode)await session.Call(
+                    new C2S_GetMobileVerificationCode()
+                    {
+                        PhoneNumber = account,
+                        ReqType = reqType,
+                    });
+            }
+            catch (Exception e)
+            {
+                session?.Dispose();
+                Log.Debug(e.ToString());
+                return s2CGetMobileVerificationCode;
+            }
+            
+            return s2CGetMobileVerificationCode;
+        }
+
+        /// <summary>
+        /// 账号找回
+        /// </summary>
+        /// <param name="code"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns></returns>
+        public static async ETTask<A2C_GetAccountListByPhone> GetAccountListByPhone(string code,
+            string phoneNumber)
+        {
+            A2C_GetAccountListByPhone res = null;
+            Session session = null;
+            try
+            {
+                session = GameGlobal.zoneScene.GetComponent<NetKcpComponent>()
+                    .Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
+
+                res = (A2C_GetAccountListByPhone)await session.Call(
+                    new C2A_GetAccountListByPhone()
+                    {
+                        Code = code,
+                        ChannelId = LauncherConfig.ChannelId,
+                        PhoneNumber = phoneNumber
+                    });
+            }
+            catch (Exception e)
+            {
+                session?.Dispose();
+                Log.Debug(e.ToString());
+                return res;
+            }
+
+            return res;
+        }
+
+        /// <summary>
+        /// 修改密码
+        /// </summary>
+        /// <param name="code"></param>
+        /// <param name="phoneNumber"></param>
+        /// <param name="account"></param>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        public static async ETTask<A2C_UpPassword> UpPassword(string code,
+            string phoneNumber, string account, string password)
+        {
+            A2C_UpPassword res = null;
+            Session session = null;
+            password = MD5Helper.stringMD5(password);
+            try
+            {
+                session = GameGlobal.zoneScene.GetComponent<NetKcpComponent>()
+                    .Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
+
+                res = (A2C_UpPassword)await session.Call(
+                    new C2A_UpPassword()
+                    {
+                        Code = code,
+                        ChannelId = LauncherConfig.ChannelId,
+                        PhoneNumber = phoneNumber,
+                        Account = account,
+                        Password = password,
+                    });
+            }
+            catch (Exception e)
+            {
+                session?.Dispose();
+                Log.Debug(e.ToString());
+                return res;
+            }
+
+            return res;
+        }
+
+
+        /// <summary>
+        /// 游戏内获取验证码
+        /// </summary>
+        /// <param name="phoneNumber"></param>
+        /// <param name="reqType"></param>
+        /// <returns></returns>
+        public static async ETTask<S2C_GetMobileVerificationCodeUnit> GetMobileVerification(string phoneNumber,
+            SendCodeType reqType)
+        {
+            S2C_GetMobileVerificationCodeUnit res = null;
+            try
+            {
+                res = (S2C_GetMobileVerificationCodeUnit)await MessageHelper.SendToServer(
+                    new C2S_GetMobileVerificationCodeUnit() { PhoneNumber = phoneNumber, ReqType = reqType });
+            }
+            catch (Exception e)
+            {
+                Log.Debug(e.ToString());
+                return res;
+            }
+
+            return res;
+        }
+
+        /// <summary>
+        /// 游戏内绑定手机
+        /// </summary>
+        /// <param name="phoneNumber"></param>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public static async ETTask<S2C_BindMobilePhoneNumber> BindMobilePhoneNumber(string phoneNumber, string code)
+        {
+            S2C_BindMobilePhoneNumber res = null;
+            try
+            {
+                res = (S2C_BindMobilePhoneNumber)await MessageHelper.SendToServer(new C2S_BindMobilePhoneNumber()
+                    { PhoneNumber = phoneNumber, VerCode = code });
+            }
+            catch (Exception e)
+            {
+                Log.Debug(e.ToString());
+                return res;
+            }
+
+            return res;
+        }
+
+        /// <summary>
+        /// 游戏内解除手机号绑定
+        /// </summary>
+        /// <param name="phoneNumber"></param>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public static async ETTask<S2C_UnbindMobilePhoneNumber> UnbindMobilePhoneNumber(string phoneNumber, string code)
+        {
+            S2C_UnbindMobilePhoneNumber res = null;
+            try
+            {
+                res = (S2C_UnbindMobilePhoneNumber)await MessageHelper.SendToServer(new C2S_UnbindMobilePhoneNumber()
+                    { PhoneNumber = phoneNumber, VerCode = code });
+            }
+            catch (Exception e)
+            {
+                Log.Debug(e.ToString());
+                return res;
+            }
+
+            return res;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Security/SecurityHelper.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6540655f580f4f1db3da3e8868778bcc
+timeCreated: 1761142743

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App/Session/SessionComponent.cs

@@ -1,17 +1,23 @@
 namespace ET
 {
-	public enum SessionState
-	{
-		Login,
-		Gate
-	}
-	public class SessionComponent: Entity, IAwake, IDestroy
-	{
-		//登录会话
-		public Session AccountSession;
-		//游戏会话
-		public Session GateSession;
-		//连接状态
-		public SessionState SessionState;
-	}
-}
+    public enum SessionState
+    {
+        Login,
+        Gate
+    }
+
+    public class SessionComponent : Entity, IAwake, IDestroy
+    {
+        //用来请求获取验证码/找回账号/修改密码用的session
+        public Session TempSession;
+
+        //登录会话
+        public Session AccountSession;
+
+        //游戏会话
+        public Session GateSession;
+
+        //连接状态
+        public SessionState SessionState;
+    }
+}

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

@@ -8,7 +8,6 @@ namespace UI.Login
     {
         public GComponent target;
         public GComponent m_bg;
-        public GButton m_btnback;
         public GButton m_btnSendCode;
         public GTextInput m_txtPhone;
         public GTextInput m_txtCode;
@@ -62,7 +61,6 @@ namespace UI.Login
         private void Init(GComponent comp)
         {
             m_bg = (GComponent)comp.GetChild("bg");
-            m_btnback = (GButton)comp.GetChild("btnback");
             m_btnSendCode = (GButton)comp.GetChild("btnSendCode");
             m_txtPhone = (GTextInput)comp.GetChild("txtPhone");
             m_txtCode = (GTextInput)comp.GetChild("txtCode");
@@ -72,7 +70,6 @@ namespace UI.Login
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
-            m_btnback = null;
             m_btnSendCode = null;
             m_txtPhone = null;
             m_txtCode = null;

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

@@ -13,8 +13,9 @@ namespace UI.Login
         public GButton m_btnSure;
         public GComboBox m_boxChooseCanal;
         public UI_ComAccountInputBox m_comAccount;
-        public GButton m_btnSkipUpInfo;
+        public GButton m_btnSkipAccount;
         public GButton m_btnRegister;
+        public GButton m_btnSkipPasword;
         public const string URL = "ui://myoktu7pq08xc";
         public const string PACKAGE_NAME = "Login";
         public const string RES_NAME = "LoginInputUI";
@@ -68,8 +69,9 @@ namespace UI.Login
             m_btnSure = (GButton)comp.GetChild("btnSure");
             m_boxChooseCanal = (GComboBox)comp.GetChild("boxChooseCanal");
             m_comAccount = (UI_ComAccountInputBox)UI_ComAccountInputBox.Create(comp.GetChild("comAccount"));
-            m_btnSkipUpInfo = (GButton)comp.GetChild("btnSkipUpInfo");
+            m_btnSkipAccount = (GButton)comp.GetChild("btnSkipAccount");
             m_btnRegister = (GButton)comp.GetChild("btnRegister");
+            m_btnSkipPasword = (GButton)comp.GetChild("btnSkipPasword");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -80,8 +82,9 @@ namespace UI.Login
             m_boxChooseCanal = null;
             m_comAccount.Dispose();
             m_comAccount = null;
-            m_btnSkipUpInfo = null;
+            m_btnSkipAccount = null;
             m_btnRegister = null;
+            m_btnSkipPasword = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Login
+{
+    public partial class UI_UnbindPhoneUI
+    {
+        public GComponent target;
+        public GComponent m_bg;
+        public GButton m_btnback;
+        public GButton m_btnSendCode;
+        public GTextInput m_txtCode;
+        public GTextField m_txtPhone;
+        public GButton m_btnSubmit;
+        public const string URL = "ui://myoktu7pobd26b";
+        public const string PACKAGE_NAME = "Login";
+        public const string RES_NAME = "UnbindPhoneUI";
+        private static UI_UnbindPhoneUI _proxy;
+
+        public static UI_UnbindPhoneUI Create(GObject gObject = null)
+        {
+            var ui = new UI_UnbindPhoneUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_UnbindPhoneUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_UnbindPhoneUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GComponent)comp.GetChild("bg");
+            m_btnback = (GButton)comp.GetChild("btnback");
+            m_btnSendCode = (GButton)comp.GetChild("btnSendCode");
+            m_txtCode = (GTextInput)comp.GetChild("txtCode");
+            m_txtPhone = (GTextField)comp.GetChild("txtPhone");
+            m_btnSubmit = (GButton)comp.GetChild("btnSubmit");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_btnback = null;
+            m_btnSendCode = null;
+            m_txtCode = null;
+            m_txtPhone = null;
+            m_btnSubmit = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_UnbindPhoneUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fcba3c1f4f33bbc41ad466f93f8048a0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -7,9 +7,7 @@ namespace UI.Login
     public partial class UI_ZhaoHuiAccountUI
     {
         public GComponent target;
-        public Controller m_c1;
         public GComponent m_bg;
-        public GButton m_btnback;
         public GButton m_btnSendCode;
         public GTextInput m_txtPhone;
         public GTextInput m_txtCode;
@@ -62,9 +60,7 @@ namespace UI.Login
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
             m_bg = (GComponent)comp.GetChild("bg");
-            m_btnback = (GButton)comp.GetChild("btnback");
             m_btnSendCode = (GButton)comp.GetChild("btnSendCode");
             m_txtPhone = (GTextInput)comp.GetChild("txtPhone");
             m_txtCode = (GTextInput)comp.GetChild("txtCode");
@@ -73,9 +69,7 @@ namespace UI.Login
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
             m_bg = null;
-            m_btnback = null;
             m_btnSendCode = null;
             m_txtPhone = null;
             m_txtCode = null;

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

@@ -9,12 +9,12 @@ namespace UI.Login
         public GComponent target;
         public Controller m_c1;
         public GComponent m_bg;
-        public GButton m_btnback;
         public GTextInput m_txtPasword;
-        public GTextField m_txtAccountShow;
         public GTextInput m_txtPaswrod2;
         public GTextInput m_txtCode;
         public GButton m_btnSendCode;
+        public GTextInput m_txtPhone;
+        public GTextInput m_txtAccount;
         public GButton m_btnSubmit;
         public const string URL = "ui://myoktu7pk5ej69";
         public const string PACKAGE_NAME = "Login";
@@ -65,24 +65,24 @@ namespace UI.Login
         {
             m_c1 = comp.GetController("c1");
             m_bg = (GComponent)comp.GetChild("bg");
-            m_btnback = (GButton)comp.GetChild("btnback");
             m_txtPasword = (GTextInput)comp.GetChild("txtPasword");
-            m_txtAccountShow = (GTextField)comp.GetChild("txtAccountShow");
             m_txtPaswrod2 = (GTextInput)comp.GetChild("txtPaswrod2");
             m_txtCode = (GTextInput)comp.GetChild("txtCode");
             m_btnSendCode = (GButton)comp.GetChild("btnSendCode");
+            m_txtPhone = (GTextInput)comp.GetChild("txtPhone");
+            m_txtAccount = (GTextInput)comp.GetChild("txtAccount");
             m_btnSubmit = (GButton)comp.GetChild("btnSubmit");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_bg = null;
-            m_btnback = null;
             m_txtPasword = null;
-            m_txtAccountShow = null;
             m_txtPaswrod2 = null;
             m_txtCode = null;
             m_btnSendCode = null;
+            m_txtPhone = null;
+            m_txtAccount = null;
             m_btnSubmit = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_PhoneBindingUI.cs

@@ -10,14 +10,11 @@ namespace UI.RoleInfo
         public GImage m_bg;
         public GGraph m_holderLeftTop;
         public GGraph m_holderRightDowm;
-        public GTextInput m_inputName;
+        public GTextInput m_txtCode;
         public GTextInput m_inputPhoneNumber;
         public UI_Button19 m_btnSure;
-        public GTextField m_inputConfirmCode;
-        public GButton m_btnGetCode;
-        public GLoader m_countTime;
         public GButton m_btnClose;
-        public GLoader m_icon;
+        public GButton m_btnSendCode;
         public const string URL = "ui://374k3dwvr8a09fze";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "PhoneBindingUI";
@@ -68,29 +65,23 @@ namespace UI.RoleInfo
             m_bg = (GImage)comp.GetChild("bg");
             m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
             m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
-            m_inputName = (GTextInput)comp.GetChild("inputName");
+            m_txtCode = (GTextInput)comp.GetChild("txtCode");
             m_inputPhoneNumber = (GTextInput)comp.GetChild("inputPhoneNumber");
             m_btnSure = (UI_Button19)UI_Button19.Create(comp.GetChild("btnSure"));
-            m_inputConfirmCode = (GTextField)comp.GetChild("inputConfirmCode");
-            m_btnGetCode = (GButton)comp.GetChild("btnGetCode");
-            m_countTime = (GLoader)comp.GetChild("countTime");
             m_btnClose = (GButton)comp.GetChild("btnClose");
-            m_icon = (GLoader)comp.GetChild("icon");
+            m_btnSendCode = (GButton)comp.GetChild("btnSendCode");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
             m_holderLeftTop = null;
             m_holderRightDowm = null;
-            m_inputName = null;
+            m_txtCode = null;
             m_inputPhoneNumber = null;
             m_btnSure.Dispose();
             m_btnSure = null;
-            m_inputConfirmCode = null;
-            m_btnGetCode = null;
-            m_countTime = null;
             m_btnClose = null;
-            m_icon = null;
+            m_btnSendCode = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI.cs

@@ -13,7 +13,9 @@ namespace UI.RoleInfo
         public GLoader m_icon;
         public GList m_settingTypeList;
         public GButton m_btnExit;
+        public GTextField m_txtPhoneDes;
         public GButton m_btnBinding;
+        public GButton m_btnUnbind;
         public UI_Slider2 m_musicSlider;
         public GButton m_btnMusic;
         public UI_Slider2 m_soundSlider;
@@ -23,7 +25,6 @@ namespace UI.RoleInfo
         public GRichTextField m_gameProtectAgree;
         public GRichTextField m_privacyAgree;
         public GRichTextField m_childrenAgree;
-        public GRichTextField m_txtDeleteAccount;
         public GGroup m_groupAccount;
         public UI_Button19 m_btnLogout;
         public UI_Button20 m_btnGiftCode;
@@ -82,7 +83,9 @@ namespace UI.RoleInfo
             m_icon = (GLoader)comp.GetChild("icon");
             m_settingTypeList = (GList)comp.GetChild("settingTypeList");
             m_btnExit = (GButton)comp.GetChild("btnExit");
+            m_txtPhoneDes = (GTextField)comp.GetChild("txtPhoneDes");
             m_btnBinding = (GButton)comp.GetChild("btnBinding");
+            m_btnUnbind = (GButton)comp.GetChild("btnUnbind");
             m_musicSlider = (UI_Slider2)UI_Slider2.Create(comp.GetChild("musicSlider"));
             m_btnMusic = (GButton)comp.GetChild("btnMusic");
             m_soundSlider = (UI_Slider2)UI_Slider2.Create(comp.GetChild("soundSlider"));
@@ -92,7 +95,6 @@ namespace UI.RoleInfo
             m_gameProtectAgree = (GRichTextField)comp.GetChild("gameProtectAgree");
             m_privacyAgree = (GRichTextField)comp.GetChild("privacyAgree");
             m_childrenAgree = (GRichTextField)comp.GetChild("childrenAgree");
-            m_txtDeleteAccount = (GRichTextField)comp.GetChild("txtDeleteAccount");
             m_groupAccount = (GGroup)comp.GetChild("groupAccount");
             m_btnLogout = (UI_Button19)UI_Button19.Create(comp.GetChild("btnLogout"));
             m_btnGiftCode = (UI_Button20)UI_Button20.Create(comp.GetChild("btnGiftCode"));
@@ -107,7 +109,9 @@ namespace UI.RoleInfo
             m_icon = null;
             m_settingTypeList = null;
             m_btnExit = null;
+            m_txtPhoneDes = null;
             m_btnBinding = null;
+            m_btnUnbind = null;
             m_musicSlider.Dispose();
             m_musicSlider = null;
             m_btnMusic = null;
@@ -120,7 +124,6 @@ namespace UI.RoleInfo
             m_gameProtectAgree = null;
             m_privacyAgree = null;
             m_childrenAgree = null;
-            m_txtDeleteAccount = null;
             m_groupAccount = null;
             m_btnLogout.Dispose();
             m_btnLogout = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/RoleInfoSProxy.cs

@@ -31,6 +31,7 @@ namespace GFGGame
 
                     RoleDataManager.mainBgID = response.MyMainBgId;
                     RoleDataManager.achievementTaskCollect = response.AchievementTaskCollect;
+                    ActivityDataManager.Instance.PhoneNumber = response.Phone;
 
                     return true;
                 }
@@ -311,25 +312,5 @@ namespace GFGGame
             MainDataManager.Instance.CardBgID = 0;
             return true;
         }
-
-        //绑定获取验证码
-        public static async ETTask<bool> GetMobileVerification(string phoneNumber)
-        {
-            S2C_GetMobileVerificationCodeUnit response =
-                (S2C_GetMobileVerificationCodeUnit)await MessageHelper.SendToServer(
-                    new C2S_GetMobileVerificationCodeUnit() { PhoneNumber = phoneNumber });
-
-            return true;
-        }
-
-        //绑定手机
-        public static async ETTask<bool> BindMobilePhoneNumber(string phoneNumber, string code)
-        {
-            S2C_BindMobilePhoneNumber response =
-                (S2C_BindMobilePhoneNumber)await MessageHelper.SendToServer(new C2S_BindMobilePhoneNumber()
-                    { PhoneNumber = phoneNumber, VerCode = code });
-            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.RewardList));
-            return true;
-        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Login/LoginInputView.cs

@@ -36,7 +36,8 @@ namespace GFGGame
             _ui.m_btnSure.onClick.Add(OnClickBtnSure);
             _ui.m_btnCancel.onClick.Add(OnClickBtnCancel);
             _ui.m_btnRegister.onClick.Add(OnClickBtnRegister);
-            _ui.m_btnSkipUpInfo.onClick.Add(OnClickBtnOpenZhAccount);
+            _ui.m_btnSkipAccount.onClick.Add(OnClickBtnOpenZhAccount);
+            _ui.m_btnSkipPasword.onClick.Add(OnClickBtnOpenZhUpPassword);
 
             _ui.m_comAccount.m_selBtin.onClick.Add(OnClickOpenAccountListBtn);
             _ui.m_comAccount.m_txtAccount.restrict = "[0-9A-Za-z_]";
@@ -98,8 +99,9 @@ namespace GFGGame
             ViewManager.Show<ZhaoHuiAccountView>();
         }
 
-        private void OnClickBtnOpenZhUpPassword(string account)
+        private void OnClickBtnOpenZhUpPassword(EventContext context)
         {
+            string account = context.data as string;
             ViewManager.Show<ZhaoHuiPasswordView>(account);
         }
 
@@ -119,7 +121,7 @@ namespace GFGGame
             }
             else if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
             {
-                LoginController.LoginTest(account).Coroutine();
+                LoginController.Login(account, password).Coroutine();
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/Login/RegisterView.cs

@@ -1,3 +1,5 @@
+using System.Text.RegularExpressions;
+using ET;
 using UI.Login;
 using UnityEngine;
 using FairyGUI;
@@ -8,8 +10,6 @@ namespace GFGGame
     {
         private UI_RegisterUI _ui;
 
-        private const string CODE = "";
-
         public override void Dispose()
         {
             if (_ui != null)
@@ -17,6 +17,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -34,14 +35,25 @@ namespace GFGGame
             _ui.m_loaEventa.onClick.Add(() => { FullScreenTextController.Show("event:a"); });
             _ui.m_loaEventb.onClick.Add(() => { FullScreenTextController.Show("event:b"); });
             _ui.m_loaEventc.onClick.Add(() => { FullScreenTextController.Show("event:c"); });
-            // _ui.m_btnSendCode.onClick.Add(() => {
-            //     
-            //     _ui.m_btnSendCode.enabled = false;
-            //     _ui.m_inputCode.text = CODE;
-            //     float endTime = Time.time + 60;
-            //     Timers.inst.Add(1,0, timerCallback, endTime);
-            //     timerCallback(endTime);
-            // });
+            _ui.m_btnSendCode.onClick.Add(() =>
+            {
+                if (!Regex.IsMatch(_ui.m_inputPhone.text.Trim(), // 匹配所有中国大陆手机号（11 位，包括物联网和卫星电话）
+                        @"^(?:\+86)?1(?:3\d{3}|4[5-9]\d{2}|5[0-35-9]\d{2}|6[2567]\d{2}|7[0-8]\d{2}|8\d{3}|9[0-35-9]\d{2})\d{6}$"))
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("输入的手机号格式有误");
+                    return;
+                }
+
+                _ui.m_btnSendCode.enabled = false;
+
+                //在此发送验证码
+                SecurityHelper.GetMobileVerificationCode(_ui.m_inputPhone.text, SendCodeType.RegisterAccount)
+                    .Coroutine();
+
+                float endTime = Time.time + 60;
+                Timers.inst.Add(1, 0, timerCallback, endTime);
+                timerCallback(endTime);
+            });
 
             //输入限制
             _ui.m_inputAccount.restrict = "[0-9A-Za-z_]";
@@ -56,13 +68,13 @@ namespace GFGGame
             float remainTime = endTime - Time.time;
             if (remainTime <= 0)
             {
-                // _ui.m_btnSendCode.text = "发送验证码";
-                // _ui.m_btnSendCode.enabled = true;
+                _ui.m_btnSendCode.text = "发送验证码";
+                _ui.m_btnSendCode.enabled = true;
                 Timers.inst.Remove(timerCallback);
             }
             else
             {
-                // _ui.m_btnSendCode.text = (int)remainTime + "s后重发";
+                _ui.m_btnSendCode.text = (int)remainTime + "s后重发";
             }
         }
 
@@ -75,6 +87,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(timerCallback);
         }
 
         private void OnClickBtnSubmit()
@@ -89,31 +102,38 @@ namespace GFGGame
             string passwordSure = _ui.m_inputPassword2.text;
             string realName = _ui.m_inputName.text;
             string idNumberStr = _ui.m_inputIDNumber.text;
+            string phoneNumber = _ui.m_inputPhone.text;
+            string code = _ui.m_inputCode.text;
             if (string.IsNullOrEmpty(account))
             {
                 PromptController.Instance.ShowFloatTextPrompt("请输入账号");
                 return;
             }
-            if(account.Length < 8)//最长输入在UI编辑器中做了限制
+
+            if (account.Length < 8) //最长输入在UI编辑器中做了限制
             {
                 PromptController.Instance.ShowFloatTextPrompt("账号长度最少需要8位");
                 return;
             }
+
             if (string.IsNullOrEmpty(password))
             {
                 PromptController.Instance.ShowFloatTextPrompt("请输入密码");
                 return;
             }
-            if (password.Length < 8)//最长输入在UI编辑器中做了限制
+
+            if (password.Length < 8) //最长输入在UI编辑器中做了限制
             {
                 PromptController.Instance.ShowFloatTextPrompt("密码长度最少需要8位");
                 return;
             }
+
             if (passwordSure != password)
             {
                 PromptController.Instance.ShowFloatTextPrompt("确认密码不一致");
                 return;
             }
+
             GameController.CheckSpecialAccount(account);
             if (GameGlobal.antiAddiction)
             {
@@ -122,11 +142,13 @@ namespace GFGGame
                     PromptController.Instance.ShowFloatTextPrompt("请输入真实姓名");
                     return;
                 }
+
                 if (idNumberStr.Length <= 0)
                 {
                     PromptController.Instance.ShowFloatTextPrompt("请输入身份证号");
                     return;
                 }
+
                 if (!_ui.m_btnAgree.selected)
                 {
                     PromptController.Instance.ShowFloatTextPrompt("请仔细阅读并同意服务协议、隐私政策、保护规则");
@@ -134,8 +156,7 @@ namespace GFGGame
                 }
             }
 
-            LoginController.Register(account, password, realName, idNumberStr, CODE).Coroutine();
+            LoginController.Register(account, password, realName, idNumberStr, code, phoneNumber).Coroutine();
         }
-
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Login/ZhaoHuiAccountView.cs

@@ -4,12 +4,15 @@ using UnityEngine;
 using System.ComponentModel;
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using ET;
 
 namespace GFGGame
 {
     public class ZhaoHuiAccountView : BaseWindow
     {
         private UI_ZhaoHuiAccountUI _ui;
+        private List<AccountDataProto> _accountDataProtoList;
 
         public override void Dispose()
         {
@@ -30,6 +33,109 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
+
+            _ui.m_btnSendCode.onClick.Add(() =>
+            {
+                if (!Regex.IsMatch(_ui.m_txtPhone.text.Trim(), // 匹配所有中国大陆手机号（11 位，包括物联网和卫星电话）
+                        @"^(?:\+86)?1(?:3\d{3}|4[5-9]\d{2}|5[0-35-9]\d{2}|6[2567]\d{2}|7[0-8]\d{2}|8\d{3}|9[0-35-9]\d{2})\d{6}$"))
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("输入的手机号格式有误");
+                    return;
+                }
+
+                _ui.m_btnSendCode.enabled = false;
+
+                //在此发送验证码
+                SecurityHelper.GetMobileVerificationCode(_ui.m_txtPhone.text, SendCodeType.AccountRecovery)
+                    .Coroutine();
+
+                float endTime = Time.time + 60;
+                Timers.inst.Add(1, 0, timerCallback, endTime);
+                timerCallback(endTime);
+            });
+
+            _ui.m_comAccountList.itemRenderer = RenderListItem;
+
+            _ui.m_btnSubmit.onClick.Add(OnClickBtnSubmit);
+        }
+
+        private async void OnClickBtnSubmit()
+        {
+            if (!Regex.IsMatch(_ui.m_txtPhone.text.Trim(), // 匹配所有中国大陆手机号（11 位，包括物联网和卫星电话）
+                    @"^(?:\+86)?1(?:3\d{3}|4[5-9]\d{2}|5[0-35-9]\d{2}|6[2567]\d{2}|7[0-8]\d{2}|8\d{3}|9[0-35-9]\d{2})\d{6}$"))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("输入的手机号格式有误");
+                return;
+            }
+
+            A2C_GetAccountListByPhone res = await SecurityHelper.GetAccountListByPhone(_ui.m_txtCode.text,
+                _ui.m_txtPhone.text);
+            if (res is { Error: ErrorCode.ERR_Success })
+            {
+                _accountDataProtoList = new List<AccountDataProto>();
+                //查询数据成功
+                foreach (var accountDataProto in res.AccountDataList)
+                {
+                    _accountDataProtoList.Add(accountDataProto);
+                }
+
+                if (_accountDataProtoList.Count == 0)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("查询不到该手机号绑定的账号");
+                }
+
+                _ui.m_comAccountList.numItems = _accountDataProtoList.Count;
+                if (_accountDataProtoList.Count > 0)
+                {
+                    _ui.m_comAccountList.selectedIndex = 1;
+                }
+            }
+            else
+            {
+                ErrorCodeController.Handler(res.Error);
+            }
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            AccountDataProto accountPassword = _accountDataProtoList[index];
+            UI_ButAccountItem2 item = UI_ButAccountItem2.Proxy(obj);
+            item.m_txtAccountItem.text = accountPassword.Account;
+            item.m_btnPaswordUp.data = accountPassword;
+            item.m_btnPaswordUp.onClick.Add(OnClickAccountItem);
+            UI_ButAccountItem2.ProxyEnd();
+        }
+
+        private void OnClickAccountItem(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            AccountDataProto accountPassword = obj.data as AccountDataProto;
+            if (accountPassword == null)
+            {
+                ViewManager.Show<ZhaoHuiPasswordView>();
+                Hide();
+            }
+            else
+            {
+                ViewManager.Show<ZhaoHuiPasswordView>(accountPassword.Account);
+                Hide();
+            }
+        }
+
+        private void timerCallback(object param)
+        {
+            float endTime = (float)param;
+            float remainTime = endTime - Time.time;
+            if (remainTime <= 0)
+            {
+                _ui.m_btnSendCode.text = "发送验证码";
+                _ui.m_btnSendCode.enabled = true;
+                Timers.inst.Remove(timerCallback);
+            }
+            else
+            {
+                _ui.m_btnSendCode.text = (int)remainTime + "s后重发";
+            }
         }
 
         protected override void OnShown()
@@ -41,6 +147,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(timerCallback);
         }
 
         protected override void AddEventListener()

GameClient/Assets/Game/HotUpdate/Views/Login/ZhaoHuiPasswordView.cs

@@ -4,6 +4,8 @@ using UnityEngine;
 using System.ComponentModel;
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using ET;
 
 namespace GFGGame
 {
@@ -30,17 +32,93 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
+
+            _ui.m_btnSendCode.onClick.Add(() =>
+            {
+                if (!Regex.IsMatch(_ui.m_txtPhone.text.Trim(), // 匹配所有中国大陆手机号（11 位，包括物联网和卫星电话）
+                        @"^(?:\+86)?1(?:3\d{3}|4[5-9]\d{2}|5[0-35-9]\d{2}|6[2567]\d{2}|7[0-8]\d{2}|8\d{3}|9[0-35-9]\d{2})\d{6}$"))
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("输入的手机号格式有误");
+                    return;
+                }
+
+                _ui.m_btnSendCode.enabled = false;
+
+                //在此发送验证码
+                SecurityHelper.GetMobileVerificationCode(_ui.m_txtPhone.text, SendCodeType.ChangePassword)
+                    .Coroutine();
+
+                float endTime = Time.time + 60;
+                Timers.inst.Add(1, 0, timerCallback, endTime);
+                timerCallback(endTime);
+            });
+
+            _ui.m_btnSubmit.onClick.Add(OnClickBtnSubmit);
+        }
+
+        private async void OnClickBtnSubmit()
+        {
+            if (!Regex.IsMatch(_ui.m_txtPhone.text.Trim(), // 匹配所有中国大陆手机号（11 位，包括物联网和卫星电话）
+                    @"^(?:\+86)?1(?:3\d{3}|4[5-9]\d{2}|5[0-35-9]\d{2}|6[2567]\d{2}|7[0-8]\d{2}|8\d{3}|9[0-35-9]\d{2})\d{6}$"))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("输入的手机号格式有误");
+                return;
+            }
+
+            string code = _ui.m_txtCode.text.Trim();
+            string phoneNumber = _ui.m_txtPhone.text.Trim();
+            string account = _ui.m_txtAccount.text.Trim();
+            string password = _ui.m_txtPasword.text.Trim();
+            string password2 = _ui.m_txtPaswrod2.text.Trim();
+            if (password != password2)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("两次输入的密码不一致");
+            }
+
+            A2C_UpPassword res = await SecurityHelper.UpPassword(code, phoneNumber, account, password);
+            if (res is { Error: ErrorCode.ERR_Success })
+            {
+                LoginController.Login(account, password).Coroutine();
+                Hide();
+            }
+            else
+            {
+                ErrorCodeController.Handler(res.Error);
+            }
+        }
+
+
+        private void timerCallback(object param)
+        {
+            float endTime = (float)param;
+            float remainTime = endTime - Time.time;
+            if (remainTime <= 0)
+            {
+                _ui.m_btnSendCode.text = "发送验证码";
+                _ui.m_btnSendCode.enabled = true;
+                Timers.inst.Remove(timerCallback);
+            }
+            else
+            {
+                _ui.m_btnSendCode.text = (int)remainTime + "s后重发";
+            }
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            //
+            _ui.m_txtAccount.editable = true;
+            if (viewData != null)
+            {
+                _ui.m_txtAccount.text = (string)viewData;
+                _ui.m_txtAccount.editable = false;
+            }
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(timerCallback);
         }
 
         protected override void AddEventListener()

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PhoneBindingView.cs

@@ -1,4 +1,6 @@
 using System.Collections;
+using System.Text.RegularExpressions;
+using ET;
 using UnityEngine;
 using UI.RoleInfo;
 using FairyGUI;
@@ -7,7 +9,6 @@ namespace GFGGame
 {
     public class PhoneBindingView : BaseWindow
     {
-
         private UI_PhoneBindingUI _ui;
         private float countTimeSpeed = 0.000035f;
         private bool isCountTime = false;
@@ -26,6 +27,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -40,81 +42,83 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnSure.target.onClick.Add(OnBtnSureClick);
-            _ui.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(ConstItemID.DIAMOND_RED));
-            _ui.m_btnGetCode.onClick.Add(OnBtnGetCode);
             _ui.m_btnClose.onClick.Add(Hide);
 
+            _ui.m_btnSendCode.onClick.Add(() =>
+            {
+                if (!Regex.IsMatch(_ui.m_inputPhoneNumber.text.Trim(), // 匹配所有中国大陆手机号（11 位，包括物联网和卫星电话）
+                        @"^(?:\+86)?1(?:3\d{3}|4[5-9]\d{2}|5[0-35-9]\d{2}|6[2567]\d{2}|7[0-8]\d{2}|8\d{3}|9[0-35-9]\d{2})\d{6}$"))
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("输入的手机号格式有误");
+                    return;
+                }
+
+                _ui.m_btnSendCode.enabled = false;
+
+                //在此发送验证码
+                SecurityHelper.GetMobileVerification(_ui.m_inputPhoneNumber.text, SendCodeType.BindPhone)
+                    .Coroutine();
+
+                float endTime = Time.time + 60;
+                Timers.inst.Add(1, 0, timerCallback, endTime);
+                timerCallback(endTime);
+            });
+
             AddEffect();
         }
 
+        private void timerCallback(object param)
+        {
+            float endTime = (float)param;
+            float remainTime = endTime - Time.time;
+            if (remainTime <= 0)
+            {
+                _ui.m_btnSendCode.text = "发送验证码";
+                _ui.m_btnSendCode.enabled = true;
+
+                Timers.inst.Remove(timerCallback);
+            }
+            else
+            {
+                _ui.m_btnSendCode.text = (int)remainTime + "s后重发";
+            }
+        }
+
         protected override void OnShown()
         {
             base.OnShown();
             _ui.m_inputPhoneNumber.text = "";
-            _ui.m_inputName.text = "";
+            _ui.m_txtCode.text = "";
             isCountTime = false;
-            _ui.m_countTime.visible = false;
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-            Timers.inst.Remove(UpdateCountTime);
-        }
-        private void UpdateCountTime(object param = null)
-        {
-            if (_ui.m_countTime.fillAmount <= 0)
-            {
-                _ui.m_countTime.fillAmount = 0;
-                _ui.m_countTime.visible = false;
-                isCountTime = false;
-                Timers.inst.Remove(UpdateCountTime);
-            }
-            _ui.m_countTime.fillAmount -= countTimeSpeed;
+            Timers.inst.Remove(timerCallback);
         }
+
         private async void OnBtnSureClick()
         {
-            if(ActivityDataManager.Instance.PhoneNum != null && ActivityDataManager.Instance.PhoneNum != "")
+            if (!string.IsNullOrEmpty(ActivityDataManager.Instance.PhoneNumber))
             {
-                PromptController.Instance.ShowFloatTextPrompt(string.Format("号码{0}已绑定！", ActivityDataManager.Instance.PhoneNum));
+                PromptController.Instance.ShowFloatTextPrompt(string.Format("号码{0}已绑定！",
+                    ActivityDataManager.Instance.PhoneNumber));
                 Hide();
             }
-            bool result = await RoleInfoSProxy.BindMobilePhoneNumber(_ui.m_inputPhoneNumber.text ,_ui.m_inputName.text);
-            if(result)
-            {
-                //PromptController.Instance.ShowFloatTextPrompt("绑定成功！");
-                //Hide();
-            }
-            else
-            {
-                //PromptController.Instance.ShowFloatTextPrompt("绑定失败！");
-            }   
-        }
 
-        private  async void OnBtnGetCode()
-        {
-            if (_ui.m_inputPhoneNumber.text == null || _ui.m_inputPhoneNumber.text == "")
-            {
-                PromptController.Instance.ShowFloatTextPrompt("麻烦输入手机号码！");
-                return;
-            }
-            if (isCountTime)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("刷新冷却中,请耐心等待!");
-                return;
-            }
-            isCountTime = true;
-            _ui.m_countTime.visible = true;
-            _ui.m_countTime.fillAmount = 1.0f;
-            Timers.inst.AddUpdate(UpdateCountTime);
-            bool result = await RoleInfoSProxy.GetMobileVerification(_ui.m_inputPhoneNumber.text);
-            if (result)
+            S2C_BindMobilePhoneNumber res =
+                await SecurityHelper.BindMobilePhoneNumber(_ui.m_inputPhoneNumber.text, _ui.m_txtCode.text);
+            if (res is { Error: ErrorCode.ERR_Success })
             {
-                //PromptController.Instance.ShowFloatTextPrompt("获取成功！");
+                PromptController.Instance.ShowFloatTextPrompt("绑定成功！");
+                ActivityDataManager.Instance.PhoneNumber = res.PhoneNumber;
+                Hide();
+                EventAgent.DispatchEvent(ConstMessage.PhoneChange);
             }
             else
             {
-                //PromptController.Instance.ShowFloatTextPrompt("获取失败！麻烦输入正确的手机号码！");
+                ErrorCodeController.Handler(res.Error);
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs

@@ -9,12 +9,10 @@ namespace GFGGame
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
         private static bool _refresh;
+
         public static bool refresh
         {
-            set
-            {
-                _refresh = value;
-            }
+            set { _refresh = value; }
         }
 
 
@@ -30,6 +28,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -53,14 +52,21 @@ namespace GFGGame
             _ui.m_voiceSlider.target.onChanged.Add(OnChangeVoiceVolumn);
             _ui.m_musicSlider.target.onChanged.Add(OnChangeMusicVolumn);
             _ui.m_soundSlider.target.onChanged.Add(OnChangeSoundVolumn);
-            _ui.m_btnBinding.onClick.Add(OnClickPhoneBinding);
+
             _ui.m_btnGiftCode.target.onClick.Add(OnClickGiftCode);
             _ui.m_settingTypeList.itemRenderer = RenderListType;
             _ui.m_settingTypeList.numItems = _ui.m_settingTypeList.numItems;
             _ui.m_gameProtectAgree.onClick.Add(OnGameProtectAgreeClick);
             _ui.m_privacyAgree.onClick.Add(OnPrivacyAgreeClick);
             _ui.m_childrenAgree.onClick.Add(OnChildrenAgreeClick);
-            _ui.m_txtDeleteAccount.onClick.Add(OnClickTxtDeleteAccount);
+
+            _ui.m_btnBinding.onClick.Add(OnClickPhoneBinding);
+            _ui.m_btnBinding.text = "点击绑定";
+            _ui.m_btnBinding.visible = false;
+
+            _ui.m_btnUnbind.onClick.Add(OnClickPhoneUnbind);
+            _ui.m_btnUnbind.text = "解绑";
+            _ui.m_btnUnbind.visible = false;
 
             _ui.m_groupAccount.visible = GameConfig.tsStatus > 0;
         }
@@ -75,10 +81,25 @@ namespace GFGGame
                 _ui.m_suit.Play();
                 _ui.m_c1.SetSelectedIndex(0);
             }
+
             _ui.m_icon.visible = false;
             _ui.m_iconBg.visible = false;
             _ui.m_settingTypeList.visible = false;
             _ui.m_btnGiftCode.target.visible = GameConfig.hCode == 0;
+
+            if (!string.IsNullOrEmpty(ActivityDataManager.Instance.PhoneNumber))
+            {
+                //已经绑定, 需要解绑
+                _ui.m_txtPhoneDes.text = ActivityDataManager.Instance.PhoneNumber;
+                _ui.m_btnBinding.visible = false;
+                _ui.m_btnUnbind.visible = true;
+            }
+            else
+            {
+                _ui.m_txtPhoneDes.text = "手机号绑定";
+                _ui.m_btnBinding.visible = true;
+                _ui.m_btnUnbind.visible = false;
+            }
         }
 
         protected override void OnHide()
@@ -86,25 +107,45 @@ namespace GFGGame
             base.OnHide();
         }
 
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.PhoneChange, OnPhoneChange);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.PhoneChange, OnPhoneChange);
+        }
+
+        private void OnPhoneChange()
+        {
+            if (!string.IsNullOrEmpty(ActivityDataManager.Instance.PhoneNumber))
+            {
+                //已经绑定, 需要解绑
+                _ui.m_txtPhoneDes.text = ActivityDataManager.Instance.PhoneNumber;
+                _ui.m_btnBinding.visible = false;
+                _ui.m_btnUnbind.visible = true;
+            }
+            else
+            {
+                _ui.m_txtPhoneDes.text = "手机号绑定";
+                _ui.m_btnBinding.visible = true;
+                _ui.m_btnUnbind.visible = false;
+            }
+        }
+
         private void OnClickBtnBack()
         {
             Hide();
-            //AlertSystem.Show("确认返回登录页吗？")
-            //    .SetLeftButton(true)
-            //    .SetRightButton(true, "确认", (object data) =>
-            //    {
-            //        GameController.QuitToLoginView(false);
-            //    });
         }
 
         private void OnClickBtnLogout()
         {
             AlertSystem.Show("确认注销当前账号吗？")
                 .SetLeftButton(true)
-                .SetRightButton(true, "确认", (object data) =>
-                {
-                    GameController.QuitToLoginView(true);
-                });
+                .SetRightButton(true, "确认", (object data) => { GameController.QuitToLoginView(true); });
         }
 
         private void OnClickBtnSound()
@@ -198,7 +239,12 @@ namespace GFGGame
 
         private void OnClickPhoneBinding()
         {
-            ViewManager.Show<PhoneBindingView>(); 
+            ViewManager.Show<PhoneBindingView>();
+        }
+
+        private void OnClickPhoneUnbind()
+        {
+            ViewManager.Show<UnbindPhoneView>();
         }
 
         private void OnClickGiftCode()
@@ -237,6 +283,5 @@ namespace GFGGame
         {
             ViewManager.Show<DeleteAccountView>();
         }
-
     }
 }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/UnbindPhoneView.cs

@@ -0,0 +1,123 @@
+using UI.Login;
+using FairyGUI;
+using UnityEngine;
+using System.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using ET;
+
+namespace GFGGame
+{
+    public class UnbindPhoneView : BaseWindow
+    {
+        private UI_UnbindPhoneUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_UnbindPhoneUI.PACKAGE_NAME;
+            _ui = UI_UnbindPhoneUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_btnSendCode.onClick.Add(() =>
+            {
+                if (!Regex.IsMatch(_ui.m_txtPhone.text.Trim(), // 匹配所有中国大陆手机号（11 位，包括物联网和卫星电话）
+                        @"^(?:\+86)?1(?:3\d{3}|4[5-9]\d{2}|5[0-35-9]\d{2}|6[2567]\d{2}|7[0-8]\d{2}|8\d{3}|9[0-35-9]\d{2})\d{6}$"))
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("输入的手机号格式有误");
+                    return;
+                }
+
+                _ui.m_btnSendCode.enabled = false;
+
+                //在此发送验证码
+                SecurityHelper.GetMobileVerification(_ui.m_txtPhone.text, SendCodeType.UnbindPhone)
+                    .Coroutine();
+
+                float endTime = Time.time + 60;
+                Timers.inst.Add(1, 0, timerCallback, endTime);
+                timerCallback(endTime);
+            });
+
+            _ui.m_btnSubmit.onClick.Add(OnClickBtnSubmit);
+        }
+
+        private async void OnClickBtnSubmit()
+        {
+            if (!Regex.IsMatch(_ui.m_txtPhone.text.Trim(), // 匹配所有中国大陆手机号（11 位，包括物联网和卫星电话）
+                    @"^(?:\+86)?1(?:3\d{3}|4[5-9]\d{2}|5[0-35-9]\d{2}|6[2567]\d{2}|7[0-8]\d{2}|8\d{3}|9[0-35-9]\d{2})\d{6}$"))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("输入的手机号格式有误");
+                return;
+            }
+
+            string code = _ui.m_txtCode.text.Trim();
+            string phoneNumber = _ui.m_txtPhone.text.Trim();
+
+            S2C_UnbindMobilePhoneNumber res = await SecurityHelper.UnbindMobilePhoneNumber(phoneNumber, code);
+            if (res is { Error: ErrorCode.ERR_Success })
+            {
+                ActivityDataManager.Instance.PhoneNumber = res.PhoneNumber;
+                Hide();
+                EventAgent.DispatchEvent(ConstMessage.PhoneChange);
+            }
+            else
+            {
+                ErrorCodeController.Handler(res.Error);
+            }
+        }
+
+        private void timerCallback(object param)
+        {
+            float endTime = (float)param;
+            float remainTime = endTime - Time.time;
+            if (remainTime <= 0)
+            {
+                _ui.m_btnSendCode.text = "发送验证码";
+                _ui.m_btnSendCode.enabled = true;
+
+                Timers.inst.Remove(timerCallback);
+            }
+            else
+            {
+                _ui.m_btnSendCode.text = (int)remainTime + "s后重发";
+            }
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_txtPhone.text = ActivityDataManager.Instance.PhoneNumber;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            Timers.inst.Remove(timerCallback);
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/UnbindPhoneView.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d8dfc45135a444eca110b5c89280a228
+timeCreated: 1761148397

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

@@ -54,17 +54,6 @@ namespace GFGGame
             CheckToSubmit();
         }
 
-        private async void OnBtnGetCode()
-        {
-            if (_ui.m_inputPhone.text == null || _ui.m_inputPhone.text == "")
-            {
-                PromptController.Instance.ShowFloatTextPrompt("麻烦输入手机号码！");
-                return;
-            }
-
-            bool result = await RoleInfoSProxy.GetMobileVerification(_ui.m_inputPhone.text);
-        }
-
         private void CheckToSubmit()
         {
             //账号
@@ -86,31 +75,31 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("请输入账号");
                 return;
             }
-            
+
             // if (string.IsNullOrEmpty(code))
             // {
             //     PromptController.Instance.ShowFloatTextPrompt("请输入验证码");
             //     return;
             // }
-            
+
             if (account.Length < 6) //最长输入在UI编辑器中做了限制
             {
                 PromptController.Instance.ShowFloatTextPrompt("账号长度最少需要6位");
                 return;
             }
-            
+
             if (string.IsNullOrEmpty(password))
             {
                 PromptController.Instance.ShowFloatTextPrompt("请输入密码");
                 return;
             }
-            
+
             if (password.Length < 6) //最长输入在UI编辑器中做了限制
             {
                 PromptController.Instance.ShowFloatTextPrompt("密码长度最少需要5位");
                 return;
             }
-            
+
             if (passwordSure != password)
             {
                 PromptController.Instance.ShowFloatTextPrompt("确认密码不一致");
@@ -125,7 +114,7 @@ namespace GFGGame
                     PromptController.Instance.ShowFloatTextPrompt("请输入真实姓名");
                     return;
                 }
-            
+
                 if (idNumberStr.Length <= 0)
                 {
                     PromptController.Instance.ShowFloatTextPrompt("请输入身份证号");