From adb0dae8a82a7eabb4e686bc0e83c8859bf6445f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 25 Dec 2020 10:48:53 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master

---
 Assets/Scripts/Guide/TestButton.cs |   64 ++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/Assets/Scripts/Guide/TestButton.cs b/Assets/Scripts/Guide/TestButton.cs
index 11b602b..8fdfa6e 100644
--- a/Assets/Scripts/Guide/TestButton.cs
+++ b/Assets/Scripts/Guide/TestButton.cs
@@ -25,46 +25,64 @@
         // 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 += 10;
-            SendPost(score.ToString(), score, 1, "25关 3波");
+            ShowOneTimeKill();
         }
 
-        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();
-        }
         GUILayout.EndArea();
 
     }
+
+    int killCoun1t = 0;
     private void CreateNick()
     {
         TimeSpan timeStamp = new TimeSpan(DateTime.Now.Ticks);

--
Gitblit v1.9.1