From c6bc396fe264cd53ba594e7430011c623cc26c4a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 10 十月 2018 14:21:47 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能
---
System/Role/RoleRenameWin.cs | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/System/Role/RoleRenameWin.cs b/System/Role/RoleRenameWin.cs
index 14d6866..599b7ff 100644
--- a/System/Role/RoleRenameWin.cs
+++ b/System/Role/RoleRenameWin.cs
@@ -100,14 +100,18 @@
return;
}
- if (Encoding.UTF8.GetBytes(renameInput.text).Length < 6)
+ int error = 0;
+ if (!UIHelper.SatisfyNameLength(renameInput.text, out error))
{
- MessageWin.Inst.ShowFixedTip(Language.Get("CreateRole_NameShort"));
- return;
- }
- if (!CheckNameLengthLimit(renameInput.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(renameInput.text) || UIHelper.HasSpecialCharac(renameInput.text)
@@ -141,21 +145,5 @@
});
}
-
- 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;
- }
-
-
}
}
--
Gitblit v1.8.0