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

chenxin

2020-12-25 adb0dae8a82a7eabb4e686bc0e83c8859bf6445f

 Assets/Scripts/UI/FinalPanel/FinalPanelItem.cs

@@ -1,5 +1,4 @@
using System.Drawing;
using UnityEngine;
using UnityEngine;
using UnityEngine.UI;
using EnhancedUI.EnhancedScroller;
using TMPro;
@@ -23,6 +22,10 @@
    Vector3 offect;

    private RectTransform rt;

    //public TextMeshProUGUI rankUpbj;

    //bool isSelfPlayer;

    /// <summary>
    /// Start is called on the frame when a script is enabled just before
@@ -48,6 +51,7 @@

        if (data.httpInfo.username.Equals(GameConfig.Imei))
        {
            //isSelfPlayer = true;
            //是自己
            if (backGround.sprite != tmpBackGround)
                backGround.sprite = tmpBackGround;
@@ -60,6 +64,8 @@
        }
        else
        {
            //isSelfPlayer = false;

            if (backGround.sprite != otherBackGround)
                backGround.sprite = otherBackGround;
            if (playerNameTxt.color != otherColor)
@@ -78,9 +84,30 @@
        }
    }

    // /// <summary>
    // /// 检查排名上升
    // /// </summary>
    // /// <param name="rankUp"></param>
    // public void CheckRank(int rankUp)
    // {
    //     if (rankUp > 0)
    //     {
    //         Debug.Log($"排名上升：{rankUp}   isSelfPlayer:{isSelfPlayer}  rankUpbj.gameObject.activeSelf:{rankUpbj.gameObject.activeSelf}");
    //         if (isSelfPlayer && !rankUpbj.gameObject.activeSelf)
    //         {
    //             rankUpbj.gameObject.SetActive(true);
    //             rankUpbj.text = rankUp.ToString();
    //         }
    //     }
    //     else if (rankUpbj.gameObject.activeSelf)
    //     {
    //         rankUpbj.gameObject.SetActive(false);
    //     }
    // }

    public void SetPos()
    {
        backGround.rectTransform.anchoredPosition = new UnityEngine.Vector2(720, 0);
        backGround.rectTransform.anchoredPosition = new UnityEngine.Vector2(-796, 0);
    }

    public void PlayDoTween(float duration)