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/Event/EventType.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Assets/Scripts/Event/EventType.cs b/Assets/Scripts/Event/EventType.cs
index bcda310..4f69eda 100644
--- a/Assets/Scripts/Event/EventType.cs
+++ b/Assets/Scripts/Event/EventType.cs
@@ -10,22 +10,28 @@
// MasterSocket连接结果
MasterSocketConnectResult,
//合成宝石
- AddCard,
+ //AddCard,
//生成一个2级的火焰塔
- CreateFireLv2,
+ CreateWoodLv2,
//第一关小怪出木元素小怪
CreateFirstWave,
//火元素充能效果结束
- ChargingEnd,
+ //ChargingEnd,
//恢复出怪
RestartWave,
//怪物被杀光
KillDone,
+ //第二关怪物被杀光
+ KillSecondDone,
+ //第三关怪物被杀光
+ KillThirdDone,
//增加200金币
AddGold,
//解锁了一个塔位
GetOneTowerPos,
- //生成一个1级的水元素塔
+ //生成一个1级的火元素塔
+ CreateFireLv1,
+ //生成一个1级的火元素塔
CreateWaterLv1,
//第二关小怪出火属性小怪
CreateSecondWave,
@@ -35,10 +41,13 @@
DragStep,
//显示大波敌人来袭文字
ShowWarningTips,
- //第三关小怪5路全出
+ //第三关小怪
CreateThirdWave,
+ //第四关小怪5路全出
+ CreateFourthWave,
+
//第三关小怪5路全出完毕
- CreateThirdWaveDone,
+ CreateFourthWaveDone,
//新手引导增加能量
GuideEnergyUp,
//释放技能
@@ -46,7 +55,7 @@
//释放技能完毕
SkillReleaseDone,
// 火元素塔充能使用结束
- FireTowerChargeEnd,
+ //FireTowerChargeEnd,
//新手引导结束
GuideFinish,
// 无尽模式成功通过第*关，第*波
--
Gitblit v1.9.1