Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-10 c6bc396fe264cd53ba594e7430011c623cc26c4a

 System/Login/CreateRoleWin.cs

@@ -102,8 +102,8 @@
                ChangeUserName(true);

                return;

            }

            ChangeUserName(false);

            userJob = 3;

            ChangeUserName(false);

            RoleShow(0f);

        }



@@ -114,8 +114,8 @@
                ChangeUserName(true);

                return;

            }

            ChangeUserName(false);

            userJob = 2;

            ChangeUserName(false);

            RoleShow(0f);

        }



@@ -126,8 +126,8 @@
                ChangeUserName(true);

                return;

            }

            ChangeUserName(false);

            userJob = 1;

            ChangeUserName(false);

            RoleShow(0f);

        }



@@ -186,14 +186,18 @@
                MessageWin.Inst.ShowFixedTip(Language.Get("CreateRole_NameNull"));

                return;

            }

            if (Encoding.UTF8.GetBytes(userNameInput.text).Length < 6)

            int error = 0;

            if (!UIHelper.SatisfyNameLength(userNameInput.text, out error))

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("CreateRole_NameShort"));

                return;

            }

            if (!CheckNameLengthLimit(userNameInput.text))

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("CreateRole_NameLimit"));

                switch (error)

                {

                    case 1:

                        MessageWin.Inst.ShowFixedTip(Language.Get("CreateRole_NameLimit"));

                        break;

                    case 2:

                        MessageWin.Inst.ShowFixedTip(Language.Get("CreateRole_NameShort"));

                        break;

                }

                return;

            }

            if (DirtyWordConfig.IsDirtWord(userNameInput.text) || UIHelper.HasSpecialCharac(userNameInput.text)

@@ -267,21 +271,6 @@
        {

            m_CreateRoleShow.Dispose();

        }



        private bool CheckNameLengthLimit(string _value)

        {

            var _chs = Regex.Replace(_value, "[^\u4e00-\u9fa5]", string.Empty);

            if (_chs.Length > GeneralConfig.Instance.playerNameLength / 3)

            {

                return false;

            }

            if (_value.Length > 6)

            {

                return false;

            }

            return true;

        }



    }



}