Merge branch 'liuchengxin_branch' into develop

# Conflicts: # src/src/core/core_func.cpp
lcx complete /src/core_func.cpp
2 changed files with 1670 additions and 1184 deletions
--- a/src/src/core/chars_identify.cpp
+++ b/src/src/core/chars_identify.cpp
--- a/src/src/core/core_func.cpp
+++ b/src/src/core/core_func.cpp
Author	SHA1	Message	Date
zoeda	7ae4300828	Merge branch 'liuchengxin_branch' into develop # Conflicts: # src/src/core/core_func.cpp	11 months ago
zoeda	7b4abff14f	lcx complete /src/core_func.cpp	11 months ago