From 54181477c210344b037d88f17dbe2cddc5cbc930 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 02 Dec 2020 17:54:32 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Guide/TestButton.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Assets/Scripts/Guide/TestButton.cs b/Assets/Scripts/Guide/TestButton.cs
index 1156209..b587c34 100644
--- a/Assets/Scripts/Guide/TestButton.cs
+++ b/Assets/Scripts/Guide/TestButton.cs
@@ -25,9 +25,9 @@
// string s="<color=red>范围伤害</color>";
// t.text=s;
// Debug.Log(s.Length);
- //TestFinalPanel();
- isSending = false;
- TestHttp();
+ TestFinalPanel();
+ // isSending = false;
+ // TestHttp();
}
private void OnGUI()
@@ -164,15 +164,15 @@
private void OnEnable()
{
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.AddCard, AddCard);
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFireLv2, CreateFireLv2);
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFirstWave, CreateFirstWave);
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.RestartWave, RestartWave);
- EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.AddGold, AddGold);
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWaterLv1, CreateWaterLv1);
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateSecondWave, CreateSecondWave);
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillRelease, SkillRelease);
- EventCenter.Ins.Add((int)KTGMGemClient.EventType.GuideFinish, GuideFinish);
+ //EventCenter.Ins.Add((int)KTGMGemClient.EventType.AddCard, AddCard);
+ // EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFireLv2, CreateFireLv2);
+ // EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFirstWave, CreateFirstWave);
+ // EventCenter.Ins.Add((int)KTGMGemClient.EventType.RestartWave, RestartWave);
+ // EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.AddGold, AddGold);
+ // EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWaterLv1, CreateWaterLv1);
+ // EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateSecondWave, CreateSecondWave);
+ // EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillRelease, SkillRelease);
+ // EventCenter.Ins.Add((int)KTGMGemClient.EventType.GuideFinish, GuideFinish);
}
@@ -206,7 +206,7 @@
Debug.Log("出怪完毕，等待火元素完成第一次充能");
yield return new WaitForSeconds(1f);
Debug.Log("火元素充能效果结束,暂停出怪");
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.ChargingEnd);
+ //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.ChargingEnd);
}
@@ -236,7 +236,7 @@
private void GetOneTowerPos()
{
Debug.Log("解锁了第一排第二个塔位");
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GetOneTowerPos);
+ //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GetOneTowerPos);
}
--
Gitblit v1.9.1