Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

weixudong

2020-12-09 17c6e8b6f2aee4ed9a15c886f54a73f0cb61b125

 Assets/Scripts/UI/FinalPanel/FinalPanel.cs

@@ -202,6 +202,8 @@

    private void PlayDoTween()
    {
        AudioSourceManager.Ins.Play(AudioEnum.End);

        Sequence agentTweenSeq = DOTween.Sequence();
        //先出现
        Image tsTiele = transform.Find("Image_Tiele").GetComponent<Image>();
@@ -209,22 +211,29 @@
        agentTweenSeq.Join(tsTiele.DOFade(1, 0.3f));

        Image Image1 = transform.Find("Image1").GetComponent<Image>();
        agentTweenSeq.Append(Image1.transform.DOScale(Vector3.one, 0.2f));//变化图片大小
        agentTweenSeq.Join(Image1.DOFade(1, 0.2f));
        float imageTime = 0.3f;
        agentTweenSeq.Append(Image1.transform.DOScale(Vector3.one, imageTime).SetEase(Ease.InOutBack));//变化图片大小
        agentTweenSeq.Join(Image1.DOFade(1, imageTime));
        agentTweenSeq.Join(waveText.DOText(_waveInfo, 0.2f));

        Image Image2 = transform.Find("Image2").GetComponent<Image>();
        agentTweenSeq.Append(Image2.transform.DOScale(Vector3.one, 0.2f));//变化图片大小
        agentTweenSeq.Join(Image2.DOFade(1, 0.2f));
        agentTweenSeq.Append(Image2.transform.DOScale(Vector3.one, imageTime).SetEase(Ease.InOutBack));//变化图片大小
        agentTweenSeq.Join(Image2.DOFade(1, imageTime));

        Image Image3 = transform.Find("Image3").GetComponent<Image>();
        agentTweenSeq.Append(Image3.transform.DOScale(Vector3.one, 0.2f));//变化图片大小
        agentTweenSeq.Join(Image3.DOFade(1, 0.2f));

        agentTweenSeq.Append(Image3.transform.DOScale(Vector3.one, imageTime).SetEase(Ease.InOutBack));//变化图片大小
        agentTweenSeq.Join(Image3.DOFade(1, imageTime));
        agentTweenSeq.AppendCallback(() =>
       {
           Debug.Log("开始播放声音");
           AudioSourceManager.Ins.Play(AudioEnum.FinalScore);
       });
        agentTweenSeq.Join(DOTween.To(delegate (float value)
        {
            var temp = Math.Floor(value);
            scoreText.text = temp + "";
        }, 0, _myScore, 1.0f));
        }, 0, _myScore, 1.71f));
        agentTweenSeq.AppendCallback(StartLoadLargeData);

        tsLight = transform.Find("ImageLight");
@@ -271,16 +280,16 @@
            scrollerCanvasGroup.alpha = 1;
            Debug.Log("开始展示排行榜");
        }
        itemCanvasGroup.alpha = 1;
        float duration = 0.1f;
        for (int i = 0; i < playPSItem.Count; i++)
        {
            playPSItem[i].PlayDoTween(duration);
            yield return new WaitForSeconds(duration);
        }

        if (playPSItem.Count > 0)
        {
            itemCanvasGroup.alpha = 1;
            float duration = 0.1f;
            for (int i = 0; i < playPSItem.Count; i++)
            {
                playPSItem[i].PlayDoTween(duration);
                yield return new WaitForSeconds(duration);
            }
            image_HScore.SetActive(true);
            goonFade = true;
            ShowGoOnText();
@@ -292,7 +301,8 @@
    bool goonFade;
    private void ShowGoOnText()
    {
        goonText.DOFade(goonFade ? 0 : 1, 0.5f).OnComplete(ShowGoOnText);
        goonText.DOFade(goonFade ? 0 : 1, 0.8f).SetEase(Ease.InOutQuad).OnComplete(ShowGoOnText);
        goonText.transform.DOScale(goonFade ? 0.9f : 1.1f, 0.8f);
        goonFade = !goonFade;
    }

@@ -340,6 +350,7 @@
    /// </summary>
    protected void RotateLight()
    {
        Debug.Log("开始旋转");
        isRotate = true;
        offect = 0;
    }