Merge branch 'master' of https://github.com/cjsjy123/TextInlineSprite

# Conflicts:
#	Assets/TextInlineSprite/Scripts/InlineText.cs
#	Assets/TextInlineSprite/Scripts/Parser/EmojiParser.cs.meta
#	Assets/TextInlineSprite/Scripts/Parser/HrefParser.cs.meta
#	Assets/TextInlineSprite/Scripts/Parser/IParser.cs
#	Assets/TextInlineSprite/Scripts/Parser/ParserTransmit.cs

Author: cjsjy123

Assets/Examples.meta

@@ -12,38 +12,39 @@
 using UnityEngine.UI;
 using EmojiUI;
 
-public class ChatTest : MonoBehaviour {
-
-    [SerializeField]
-    private GameObject _PreChatItem;
-    [SerializeField]
-    private RectTransform _ChatParent;
-    [SerializeField]
-    private RectTransform _ViewContent;
-    [SerializeField]
-    private InputField _InputText;
-
-    public int testcnt;
-
-    #region 点击发送
-    public void OnClickSend()
-    {
-        string _chatString = _InputText.text;
-        if (string.IsNullOrEmpty(_chatString))
-            return;
-
-        for(int i =0;i < testcnt;++i)
-        {
-            GameObject _chatClone = Instantiate(_PreChatItem);
-            _chatClone.transform.SetParent(_ChatParent);
-
-            InlineText _chatText = _chatClone.GetComponentInChildren<InlineText>();
-            if (_chatText != null)
-            {
-                _chatText.text = _chatString;
-            }
-        }
-
-    }
-    #endregion
+public class ChatTest : MonoBehaviour
+{
+
+	[SerializeField]
+	private GameObject _PreChatItem;
+	[SerializeField]
+	private RectTransform _ChatParent;
+	[SerializeField]
+	private RectTransform _ViewContent;
+	[SerializeField]
+	private InputField _InputText;
+
+	public int testcnt;
+
+	#region 点击发送
+	public void OnClickSend()
+	{
+		string _chatString = _InputText.text;
+		if (string.IsNullOrEmpty(_chatString))
+			return;
+
+		for (int i = 0; i < testcnt; ++i)
+		{
+			GameObject _chatClone = Instantiate(_PreChatItem);
+			_chatClone.transform.SetParent(_ChatParent);
+
+			InlineText _chatText = _chatClone.GetComponentInChildren<InlineText>();
+			if (_chatText != null)
+			{
+				_chatText.text = _chatString;
+			}
+		}
+
+	}
+	#endregion
 }

Assets/Examples/Prefabs/ChatItem.prefab

@@ -11,28 +11,29 @@
 using UnityEngine;
 using EmojiUI;
 
-public class ClickTest : MonoBehaviour {
+public class ClickTest : MonoBehaviour
+{
 
-    private InlineText _text;
+	private InlineText _text;
 
-    void Awake()
-    {
-        _text = GetComponent<InlineText>();
-    }
+	void Awake()
+	{
+		_text = GetComponent<InlineText>();
+	}
 
-    void OnEnable()
-    {
-        _text.OnHrefClick.AddListener(OnHrefClick);
-    }
+	void OnEnable()
+	{
+		_text.OnHrefClick.AddListener(OnHrefClick);
+	}
 
-    void OnDisable()
-    {
-        _text.OnHrefClick.RemoveListener(OnHrefClick);
-    }
+	void OnDisable()
+	{
+		_text.OnHrefClick.RemoveListener(OnHrefClick);
+	}
 
-    private void OnHrefClick(string hrefName,int id)
-    {
-        Debug.Log("点击了 " + hrefName+"  id:"+id);
-        //  Application.OpenURL("www.baidu.com");  
-    }
+	private void OnHrefClick(string hrefName, int id)
+	{
+		Debug.Log("点击了 " + hrefName + "  id:" + id);
+		//  Application.OpenURL("www.baidu.com");  
+	}
 }