Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

liuzhiwei

2020-11-30 31dbc3717e73353eaf5b8627489308adee9f51a6

 Assets/Scripts/Guide/CharForeach.cs

@@ -25,7 +25,7 @@

    public void StartShowWord(string str, Action cb)
    {
        Debug.Log("StartShowWord" + str);
        //Debug.Log("StartShowWord" + str);

        word = str;
        text.text = "";
@@ -39,7 +39,7 @@

    public void ShowWordImmediately()
    {
        Debug.Log("ShowWordImmediately");
       // Debug.Log("ShowWordImmediately");
        StopCoroutine("TypeText");
        text.text = "";
        char[] charArray = word.ToCharArray();