From 90d6578412b713ec00f31a9e5a1a1d865e484803 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 06 三月 2019 15:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Auction

---
 Core/MapEditor/Data/MapTrigger.cs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Core/MapEditor/Data/MapTrigger.cs b/Core/MapEditor/Data/MapTrigger.cs
index 8c34b43..3e485d8 100644
--- a/Core/MapEditor/Data/MapTrigger.cs
+++ b/Core/MapEditor/Data/MapTrigger.cs
@@ -16,6 +16,7 @@
         public Evt.E_EventType type;
         public E_TriggerType triggerType;
         public int prevID;
+        public int nextID;
         public int id;
         public int[] evevntIDs;
         public Vector3 position;
@@ -28,6 +29,7 @@
             triggerType = (E_TriggerType)br.ReadByte();
             type = (Evt.E_EventType)br.ReadByte();
             prevID = br.ReadInt32();
+            nextID = br.ReadInt32();
             float _pX = br.ReadSingle();
             float _pY = br.ReadSingle();
             float _pZ = br.ReadSingle();

--
Gitblit v1.8.0