From e83bd6acf4401fb0e7e358bca2c0db0e23e4d18f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 01 三月 2019 18:14:54 +0800
Subject: [PATCH] 6317 【前端】【2.0】场景化单机战斗 编辑器相关内容

---
 Core/MapEditor/Behavior/Bhv_MapTrigger.cs |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Core/MapEditor/Behavior/Bhv_MapTrigger.cs b/Core/MapEditor/Behavior/Bhv_MapTrigger.cs
index 7081694..28d9196 100644
--- a/Core/MapEditor/Behavior/Bhv_MapTrigger.cs
+++ b/Core/MapEditor/Behavior/Bhv_MapTrigger.cs
@@ -19,6 +19,8 @@
         [HideInInspector]
         public int prevID = -1;
         [HideInInspector]
+        public int nextID = -1;
+        [HideInInspector]
         public List<int> eventIDList = new List<int>();
 
 #if UNITY_EDITOR
@@ -35,6 +37,7 @@
             bw.Write((byte)triggerType);
             bw.Write((byte)type);
             bw.Write(prevID);
+            bw.Write(nextID);
             bw.Write((float)System.Math.Round(transform.position.x, 2));
             bw.Write((float)System.Math.Round(transform.position.y, 2));
             bw.Write((float)System.Math.Round(transform.position.z, 2));
@@ -59,6 +62,7 @@
             triggerType = (MapTrigger.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();
@@ -98,10 +102,24 @@
             if (showDetail)
             {
                 EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
-                EditorGUILayout.LabelField("鍓嶇疆瑙﹀彂鍣�", guiSkin.customStyles[0], GUILayout.Height(22), GUILayout.Width(80));
-                prevID = EditorGUILayout.IntField(prevID, guiSkin.textField, GUILayout.Height(20));
                 EditorGUILayout.LabelField("瑙﹀彂鍣ㄧ被鍨�", guiSkin.customStyles[0], GUILayout.Height(22), GUILayout.Width(80));
                 triggerType = (MapTrigger.E_TriggerType)EditorGUILayout.EnumPopup(triggerType, guiSkin.customStyles[1], GUILayout.Height(20), GUILayout.Width(100));
+                if (triggerType != MapTrigger.E_TriggerType.EnterStage)
+                {
+                    var _descript = string.Empty;
+                    if (triggerType == MapTrigger.E_TriggerType.Trigger)
+                    {
+                        _descript = "鍓嶇疆ID";
+                    }
+                    else if (triggerType == MapTrigger.E_TriggerType.Mission)
+                    {
+                        _descript = "浠诲姟ID";
+                    }
+                    EditorGUILayout.LabelField(_descript, guiSkin.customStyles[0], GUILayout.Height(22), GUILayout.Width(55));
+                    prevID = EditorGUILayout.IntField(prevID, guiSkin.textField, GUILayout.Height(20));
+                }
+                EditorGUILayout.LabelField("缁撴潫瑙﹀彂", guiSkin.customStyles[0], GUILayout.Height(22), GUILayout.Width(55));
+                nextID = EditorGUILayout.IntField(nextID, guiSkin.textField, GUILayout.Height(20));
                 EditorGUILayout.EndHorizontal();
 
                 EditorGUILayout.BeginVertical(guiSkin.customStyles[1]);

--
Gitblit v1.8.0