Merge pull request #232 from UnityTech/emoji_new

zhuxingwei · web-flow · commit fe61321cd4c8 · 2019-06-17T17:11:42.000+08:00
Fix emoji bug: range covers some Chinese symbols.
diff --git a/Runtime/ui/txt/emoji.cs b/Runtime/ui/txt/emoji.cs
@@ -255,11 +255,11 @@ public static Rect getUVRect(int code) {
         }
 
         public static bool isSingleCharEmoji(int c) {
-            return (0x2100 <= c && c < 0x3300) || isEmptyEmoji(c);
+            return isSingleCharNonEmptyEmoji(c) || isEmptyEmoji(c);
         }
 
         public static bool isSingleCharNonEmptyEmoji(int c) {
-            return 0x2100 <= c && c < 0x3300;
+            return emojiLookupTable.ContainsKey(c);
         }
 
         public static bool isEmptyEmoji(int c) {
@@ -290,6 +290,8 @@ public static List<string> splitByEmoji(string text) {
                             start = i;
                         }
                     }
+
+                    currentEmoji = true;
                 }
                 else {
                     if (currentEmoji != false) {

Original file line number	Diff line number	Diff line change
`@@ -255,11 +255,11 @@ public static Rect getUVRect(int code) {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`public static bool isSingleCharEmoji(int c) {`
`258`		`- return (0x2100 <= c && c < 0x3300) \|\| isEmptyEmoji(c);`
	`258`	`+ return isSingleCharNonEmptyEmoji(c) \|\| isEmptyEmoji(c);`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`public static bool isSingleCharNonEmptyEmoji(int c) {`
`262`		`- return 0x2100 <= c && c < 0x3300;`
	`262`	`+ return emojiLookupTable.ContainsKey(c);`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`public static bool isEmptyEmoji(int c) {`
`@@ -290,6 +290,8 @@ public static List<string> splitByEmoji(string text) {`
`290`	`290`	`start = i;`
`291`	`291`	`}`
`292`	`292`	`}`
	`293`	`+`
	`294`	`+ currentEmoji = true;`
`293`	`295`	`}`
`294`	`296`	`else {`
`295`	`297`	`if (currentEmoji != false) {`