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

liuzhiwei

2020-10-29 22d482183aa44aa2ffd837d8939a7b0bd15d28b9

 Assets/Scripts/Guide/CharForeach.cs

@@ -13,14 +13,14 @@
    public delegate void CallBack();
    private Action callBack;

    RectTransform contentRect;
    //RectTransform contentRect;

    Vector2 offsetV;
    //Vector2 offsetV;
    void Awake()
    {
        contentRect = transform.Find("Scroll View/Viewport/Content").GetComponent<RectTransform>();
        text = transform.Find("Scroll View/Viewport/Content/Text").GetComponent<Text>();
        offsetV = new Vector2(0, 20);
        //contentRect = transform.Find("Scroll View/Viewport/Content").GetComponent<RectTransform>();
        //offsetV = new Vector2(0, 20);
        text = transform.Find("Text").GetComponent<Text>();
    }

    public void StartShowWord(string str, Action cb)
@@ -30,10 +30,10 @@
        word = str;
        text.text = "";
        callBack = cb;
        if (contentRect.anchoredPosition.y != 0)
        {
            contentRect.anchoredPosition = Vector2.zero;
        }
        // if (contentRect.anchoredPosition.y != 0)
        // {
        //     contentRect.anchoredPosition = Vector2.zero;
        // }
        StartCoroutine("TypeText");
    }

@@ -43,33 +43,38 @@
        StopCoroutine("TypeText");
        text.text = "";
        char[] charArray = word.ToCharArray();
        length = 0;
        //length = 0;
        for (int i = 0; i < charArray.Length; i++)
        {
            if (charArray[i].Equals('$'))
            {
                text.text += GuideConfig.showWordsUBB[0];
                length += 19;
                //length += 19;
            }
            else if (charArray[i].Equals('%'))
            {
                length += 19;
                //length += 19;
                text.text += GuideConfig.showWordsUBB[1];
            }
            else if (charArray[i].Equals('`'))
            {
                length += 23;
                //length += 23;
                text.text += GuideConfig.showWordsUBB[2];
            }
            else if (charArray[i].Equals('&'))
            {
                length += 19;
                //length += 19;
                text.text += GuideConfig.showWordsUBB[3];
            }
            else if (charArray[i].Equals('*'))
            {
                length += 23;
                //length += 23;
                text.text += GuideConfig.showWordsUBB[4];
            }
            else if (charArray[i].Equals('<'))
            {
                //length += 23;
                text.text += GuideConfig.showWordsUBB[5];
            }
            else
            {
@@ -79,14 +84,14 @@
        }
        //text.text = word;

        if (text.text.Length - length >= 39 && contentRect.anchoredPosition != offsetV)
        {
            contentRect.anchoredPosition = offsetV;
        }
        else
        {
            contentRect.anchoredPosition = Vector2.zero;
        }
        // if (text.text.Length - length >= 39 && contentRect.anchoredPosition != offsetV)
        // {
        //     contentRect.anchoredPosition = offsetV;
        // }
        // else
        // {
        //     contentRect.anchoredPosition = Vector2.zero;
        // }
        if (callBack != null)
        {
            callBack();
@@ -95,47 +100,52 @@

    }

    int length = 0;
    //int length = 0;
    private IEnumerator TypeText()
    {
        char[] charArray = word.ToCharArray();
        length = 0;
        //length = 0;
        for (int i = 0; i < charArray.Length; i++)
        {
            if (charArray[i].Equals('$'))
            {
                text.text += GuideConfig.showWordsUBB[0];
                length += 19;
                //length += 19;
            }
            else if (charArray[i].Equals('%'))
            {
                length += 19;
                //length += 19;
                text.text += GuideConfig.showWordsUBB[1];
            }
            else if (charArray[i].Equals('`'))
            {
                length += 23;
                //length += 23;
                text.text += GuideConfig.showWordsUBB[2];
            }
            else if (charArray[i].Equals('&'))
            {
                length += 19;
                //length += 19;
                text.text += GuideConfig.showWordsUBB[3];
            }
            else if (charArray[i].Equals('*'))
            {
                length += 23;
                //length += 23;
                text.text += GuideConfig.showWordsUBB[4];
            }
            else if (charArray[i].Equals('<'))
            {
                //length += 23;
                text.text += GuideConfig.showWordsUBB[5];
            }
            else
            {
                text.text += charArray[i];
            }

            if (text.text.Length - length >= 39 && contentRect.anchoredPosition != offsetV)
            {
                contentRect.anchoredPosition = offsetV;
            }
            // if (text.text.Length - length >= 39 && contentRect.anchoredPosition != offsetV)
            // {
            //     contentRect.anchoredPosition = offsetV;
            // }
            yield return new WaitForSeconds(letterPause);
        }