Merge commit '31f0c1761b37dfd47408a93df9ed18468b50ef40' into master

chenxin

2020-12-11 fac697773b8cb65b3ab54569413e15fca03ad1d7

 Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs

@@ -22,7 +22,16 @@

    private Text versionTxt;//版本号
    private Text resVersion;//资源版本号
    float waitTime;//切换场景等待时间

    [SerializeField]
    private Sprite nextSprite;

    [SerializeField]
    private Image bg;

    [SerializeField]
    private GameObject other;

    // Start is called before the first frame update
    void Start()
@@ -32,14 +41,12 @@

        isLogining = false;

        repairBtn = transform.Find("Panel/RepairBtn").GetComponent<Button>();
        noticeBtn = transform.Find("Panel/NoticeBtn").GetComponent<Button>();
        repairBtn = transform.Find("Panel/Other/RepairBtn").GetComponent<Button>();
        startBtn = transform.Find("Panel/StartBtn").GetComponent<Button>();

        versionTxt = transform.Find("Panel/Version").GetComponent<Text>();
        resVersion = transform.Find("Panel/ResVersion").GetComponent<Text>();
        versionTxt = transform.Find("Panel/Other/Version").GetComponent<Text>();

        progressSlider = transform.Find("Panel/Progress").GetComponent<Slider>();
        progressSlider = transform.Find("Panel/Other/Progress").GetComponent<Slider>();
        progressSlider.value = 0;
        progressSlider.gameObject.SetActive(false);

@@ -68,24 +75,45 @@

        versionTxt.text = "版本号：" + Application.version;
        //resVersion.text 暂时没有使用
        transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
        transform.Find("Panel/Other/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;


        if (!GameConfig.isFirstStart)//后续直接加载
        {
            waitTime = 2f;

            loginNext();
        }
        else
        if (GameConfig.isFirstStart)
        {
            waitTime = 0f;
            //第一次启动，初始化并且埋点
            //TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
            //TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
            if (!GameConfig.useSDK)
            {
                TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
                TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
            }
        }

        SetStart();
    }

    /// <summary>
    /// 设置开始状态
    /// </summary>
    private void SetStart()
    {
        startBtn.gameObject.SetActive(true);
        int resId = Mathf.FloorToInt(Mathf.Clamp01(GameConfig.GameCompletedCount));
        Image img = startBtn.transform.GetChild(0).GetComponent<Image>();
        img.sprite = Resources.Load<Sprite>($"UI/Loading/{resId}");
        img.SetNativeSize();

        if (GameConfig.GameCompletedCount > 0)
        {
            other.SetActive(false);
            bg.sprite = nextSprite;
            bg.SetNativeSize();
        }
    }

    /// <summary>
    /// 开始游戏
    /// </summary>
    void loginNext()
    {
        progressSlider.gameObject.SetActive(true);
@@ -98,24 +126,16 @@
        StartCoroutine(loginMy());
    }

    float waitTime;

    // private void OnEnable()
    // {
    //     SocketEvent.Ins.Add<IMessage>((int)Opcode.LoginS2C, LoginS2C);
    // }

    // private void OnDestroy()
    // {
    //     SocketEvent.Ins.Remove<IMessage>((int)Opcode.LoginS2C, LoginS2C);

    // }

    #region 获得安卓手机上的IMEI号
    public string imei0 = "";
    public string imei1 = "";
    public string meid = "";

    /// <summary>
    /// 已弃用
    /// </summary>
    void GetetDeviceIMEI()
    {
        var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");