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

liuzhiwei

2020-12-22 987fd66dc6d6c28e3ed08a08141ddc3dbd772cea

 Assets/Scripts/Guide/TestButton.cs

@@ -25,31 +25,132 @@
        // string s="<color=red>范围伤害</color>";
        // t.text=s;
        // Debug.Log(s.Length);
        TestFinalPanel();
        //TestFinalPanel();
        // isSending = false;
        // score = 0;

        // TestHttp();

    }
    public DoubleHitImg OneTimeKillObj;

    /// <summary>
    /// 显示一次性击杀飘字
    /// </summary>
    /// <param name="count"></param>
    private void ShowOneTimeKill()
    {
        OneTimeKillObj.SetkillCount();
    }


    int score;
    private void OnGUI()
    {
        GUILayout.BeginArea(new Rect(5, 330, 150, 300));
        if (GUILayout.Button("SendRequest", GUILayout.Width(150), GUILayout.Height(70)))
        // if (GUILayout.Button("SendRequest", GUILayout.Width(150), GUILayout.Height(70)))
        // {
        //     //SendRequest("aa", 4700, 28);
        //     score += 10;
        //     SendPost(score.ToString(), score, 1, "25关 3波");
        // }

        // if (GUILayout.Button("SendGet", GUILayout.Width(150), GUILayout.Height(70)))
        // {
        //     SendGet();

        // }

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

        // }

        // if (GUILayout.Button("生成Nick", GUILayout.Width(150), GUILayout.Height(70)))
        // {

        //     CreateNick();
        // }
        if (GUILayout.Button("击杀10", GUILayout.Width(150), GUILayout.Height(50)))
        {
            //SendRequest("aa", 4700, 28);
            score += 100;
            SendPost(score.ToString(), score, 1, "成绩 25关 3波");
            ShowOneTimeKill();
        }

        if (GUILayout.Button("SendGet", GUILayout.Width(150), GUILayout.Height(70)))
        {
            SendGet();

        }
        GUILayout.EndArea();

    }

    int killCoun1t = 0;
    private void CreateNick()
    {
        TimeSpan timeStamp = new TimeSpan(DateTime.Now.Ticks);
        Debug.Log(timeStamp.TotalMilliseconds);

        DateTime dt = DateTime.Now;
        Debug.Log(dt.ToString("fffff"));


        return;

        //--DateTime各种ToString("")//https://www.cnblogs.com/wangyuelang0526/archive/2012/06/27/2565289.html
        Debug.Log("DateTime");
        Debug.Log("MaxValue     " + DateTime.MaxValue.ToString());
        Debug.Log("MinValue     " + DateTime.MinValue.ToString());
        Debug.Log("Now      " + DateTime.Now.ToString());
        Debug.Log("Today        " + DateTime.Today.ToString());
        Debug.Log("UtcNow       " + DateTime.UtcNow.ToString());
        Debug.Log("Now.Date     " + DateTime.Now.Date.ToString());
        Debug.Log("Now.Day      " + DateTime.Now.Day.ToString());
        Debug.Log("Now.DayOfWeek    " + DateTime.Now.DayOfWeek.ToString());
        Debug.Log("Now.DayOfYear        " + DateTime.Now.DayOfYear.ToString());
        // string[] TimeFormats = DateTime.Now.GetDateTimeFormats();
        // for (int i = 0; i < TimeFormats.Length; i++)
        // {
        //     Debug.Log("Now.GetDateTimeFormats()     " + i.ToString() + "     " + TimeFormats[i]);
        // }
        Debug.Log("Now.Hour     " + DateTime.Now.Hour.ToString());
        Debug.Log("Now.IsDaylightSavingTime()       " + DateTime.Now.IsDaylightSavingTime());
        Debug.Log("Now.Kind     " + DateTime.Now.Kind.ToString());
        Debug.Log("Now.Millisecond      " + DateTime.Now.Millisecond.ToString());
        Debug.Log("Now.Minute       " + DateTime.Now.Minute.ToString());
        Debug.Log("Now.Month        " + DateTime.Now.Month.ToString());
        Debug.Log("Now.Second       " + DateTime.Now.Second.ToString());

        Debug.Log("Now.Subtract(DateTime)       " + DateTime.Now.Subtract(new DateTime(1970, 1, 1)).Ticks.ToString());
        Debug.Log("Now.Ticks        " + DateTime.Now.Ticks.ToString());
        Debug.Log("DateTime(1970, 1, 1).Ticks     " + new DateTime(1970, 1, 1).Ticks.ToString());
        Debug.Log("Now.TimeOfDay        " + DateTime.Now.TimeOfDay.ToString());
        Debug.Log("Now.ToBinary()       " + DateTime.Now.ToBinary().ToString());
        Debug.Log("Now.ToFileTime()     " + DateTime.Now.ToFileTime().ToString());
        Debug.Log("Now.ToFileTimeUtc()      " + DateTime.Now.ToFileTimeUtc().ToString());
        Debug.Log("Now.ToLocalTime()        " + DateTime.Now.ToLocalTime().ToString());
        Debug.Log("Now.ToLongDateString()       " + DateTime.Now.ToLongDateString());
        Debug.Log("Now.ToLongTimeString()       " + DateTime.Now.ToLongTimeString());
        Debug.Log("Now.ToOADate()       " + DateTime.Now.ToOADate().ToString());
        Debug.Log("Now.ToShortDateString()      " + DateTime.Now.ToShortDateString());
        Debug.Log("Now.ToShortTimeString()      " + DateTime.Now.ToShortTimeString());
        Debug.Log("Now.ToUniversalTime()        " + DateTime.Now.ToUniversalTime().ToString());

        Debug.Log("TimeSpan");
        TimeSpan timeSpan = DateTime.Now.TimeOfDay;
        Debug.Log("Days     " + timeSpan.Days.ToString());
        Debug.Log("Duration()       " + timeSpan.Duration().ToString());
        Debug.Log("Hours        " + timeSpan.Hours.ToString());
        Debug.Log("Milliseconds     " + timeSpan.Milliseconds.ToString());
        Debug.Log("Minutes      " + timeSpan.Minutes.ToString());
        Debug.Log("Negate()     " + timeSpan.Negate().ToString());
        Debug.Log("Seconds      " + timeSpan.Seconds.ToString());
        Debug.Log("Subtract(timeSpan)       " + timeSpan.Subtract(timeSpan).ToString());
        Debug.Log("Ticks        " + timeSpan.Ticks.ToString());
        Debug.Log(new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day).AddTicks(timeSpan.Ticks).Ticks.ToString());
        Debug.Log("TotalDays        " + timeSpan.TotalDays.ToString());
        Debug.Log("TotalHours       " + timeSpan.TotalHours.ToString());
        Debug.Log("TotalMilliseconds        " + timeSpan.TotalMilliseconds.ToString());
        Debug.Log("TotalMinutes     " + timeSpan.TotalMinutes.ToString());
        Debug.Log("TotalSeconds     " + timeSpan.TotalSeconds.ToString());
        Debug.Log(timeSpan.ToString(@"hh\:mm\:ss"));

    }
    private JsonData loginData;
@@ -168,22 +269,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 +308,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波", 101);
        //panelUI.SetPlayEffectAC(null);
    }


@@ -348,14 +439,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;
}