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

chenxin

2020-12-04 988e7226f6799263fed8e8e2afe04288f357df29

 Assets/Scripts/Guide/TestButton.cs

@@ -49,6 +49,13 @@
            SendGet();

        }

        if (GUILayout.Button("清理本地存储", GUILayout.Width(150), GUILayout.Height(70)))
        {
            PlayerPrefs.DeleteAll();
            Debug.Log("清理本地存储");

        }
        GUILayout.EndArea();

    }
@@ -168,22 +175,11 @@
        JsonData rank = getData["rank"];

        List<HttpGetInfo> allHttpGetInfoLis = new List<HttpGetInfo>();
        HttpGetInfo info;
        foreach (JsonData item in rank)
        {
            allHttpGetInfoLis.Add(
                new HttpGetInfo
                {
                    id = int.Parse(item["id"].ToString()),
                    username = item["username"].ToString(),

                    nickname = item["nickname"].ToString(),
                    score = int.Parse(item["score"].ToString()),
                    level = int.Parse(item["level"].ToString()),
                    extra = item["nickname"],
                    waveInfo = item["extra"].ToString(),
                    create_time = int.Parse(item["create_time"].ToString()),
                }
            );
            info = new HttpGetInfo(item);
            allHttpGetInfoLis.Add(info);
        }

        foreach (HttpGetInfo item in allHttpGetInfoLis)
@@ -218,10 +214,11 @@

    void TestFinalPanel()
    {
        GameObject go = Instantiate(Resources.Load<GameObject>("UI/Final/FinalPanel"), transform);
        GameObject a = Resources.Load<GameObject>("UI/Final/FinalPanel");
        GameObject go = Instantiate(a, transform);
        FinalPanel panelUI = go.GetComponent<FinalPanel>();
        panelUI.SetData("25关 3波", 101);
        panelUI.SetPlayEffectAC(null);
        panelUI.SetData("1关 1波", 401);
        //panelUI.SetPlayEffectAC(null);
    }


@@ -348,14 +345,4 @@

}

public class HttpGetInfo
{
    public int id;
    public string username;
    public string nickname;
    public int score;
    public int level;
    public JsonData extra;
    public string waveInfo;
    public int create_time;
}