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

liuzhiwei

2020-12-26 56d95fa59a9f6dc12d0fc0723ea449e5b317f994

 Assets/Scripts/UI/FinalPanel/FinalPanel.cs

@@ -26,6 +26,7 @@
        closeBtn = transform.Find("BackGround").GetComponent<Button>();
        closeBtn.onClick.AddListener(() =>
        {
            goonText.DOKill();
            gameObject.SetActive(false);
            GameConfig.NextSceneName = endlessGameScene;
            SceneManager.LoadScene(loadingScene);
@@ -70,6 +71,7 @@
    TextMeshProUGUI rankUpbj;
    GameObject newPlayerImage;//新用户提示
    GameObject httpCountDownPanel;
    Text goonText;

    /// <summary>
    /// 入口函数
@@ -78,6 +80,8 @@
    /// <param name="myScore">789220</param>
    public void SetData(string waveInfo, int myScore)
    {
        AudioSourceManager.Ins.StopBGAudio();//进来后停止播放BGM

        _waveInfo = waveInfo;
        _myScore = myScore;
        isFirstStart = true;//首次启动下载到数据执行动效
@@ -142,6 +146,7 @@

        endPs = transform.Find("Effect_UI_JieSuanShengLi/03").GetComponent<ParticleSystem>();

        goonText = transform.Find("Image_HScore/GoOnText").GetComponent<Text>();
        //PlayerPrefs.DeleteKey("GemBattlePlayerNickName");

        playerNickName = PlayerPrefs.GetString(playerPrefs_NickName);
@@ -199,6 +204,8 @@

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

        Sequence agentTweenSeq = DOTween.Sequence();
        //先出现
        Image tsTiele = transform.Find("Image_Tiele").GetComponent<Image>();
@@ -206,22 +213,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.4f));
        agentTweenSeq.AppendCallback(StartLoadLargeData);

        tsLight = transform.Find("ImageLight");
@@ -268,20 +282,30 @@
            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();
        }

        yield break;
    }

    bool goonFade;
    private void 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;
    }

    /// <summary>
@@ -328,6 +352,7 @@
    /// </summary>
    protected void RotateLight()
    {
        Debug.Log("开始旋转");
        isRotate = true;
        offect = 0;
    }
@@ -438,9 +463,11 @@
                data.index = 1;
                itemFirst.gameObject.SetActive(true);
                itemFirst.SetData(data);
                itemFirst.SetPos();
                if (isFirstStart)
                {
                    itemFirst.SetPos();
                    playPSItem.Add(itemFirst);
                }
                //itemFirst.CheckRank(tmpRankUp);
            }
            else
@@ -457,9 +484,11 @@
                data.index = 2;
                itemSecond.gameObject.SetActive(true);
                itemSecond.SetData(data);
                itemSecond.SetPos();
                if (isFirstStart)
                {
                    itemSecond.SetPos();
                    playPSItem.Add(itemSecond);
                }
                //itemFirst.CheckRank(tmpRankUp);
            }
            else
@@ -475,9 +504,11 @@
                data.index = 3;
                itemThird.gameObject.SetActive(true);
                itemThird.SetData(data);
                itemThird.SetPos();
                if (isFirstStart)
                {
                    itemThird.SetPos();
                    playPSItem.Add(itemThird);
                }
                //itemFirst.CheckRank(tmpRankUp);
            }
            else