From 6e42b7d4f0370f9659aa397ff909aab477a3e676 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 23 一月 2019 14:30:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival
---
Core/MapEditor/Data/MapTrigger.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/Core/MapEditor/Data/MapTrigger.cs b/Core/MapEditor/Data/MapTrigger.cs
index cd04dae..9184af1 100644
--- a/Core/MapEditor/Data/MapTrigger.cs
+++ b/Core/MapEditor/Data/MapTrigger.cs
@@ -6,7 +6,14 @@
[System.Serializable]
public class MapTrigger
{
+ public enum E_TriggerType
+ {
+ Trigger,
+ EnterStage
+ }
+
public Evt.E_EventType type;
+ public E_TriggerType triggerType;
public int prevID;
public int id;
public int[] evevntIDs;
@@ -17,6 +24,7 @@
public void Load(BinaryReader br)
{
id = br.ReadInt32();
+ triggerType = (E_TriggerType)br.ReadByte();
type = (Evt.E_EventType)br.ReadByte();
prevID = br.ReadInt32();
float _pX = br.ReadSingle();
--
Gitblit v1.8.0