From 38bbe9af958cac89c56b35ee6c7ba5b2ed44185c Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 21 一月 2019 21:34:33 +0800
Subject: [PATCH] 382 地图编辑器逻辑提交
---
Core/MapEditor/Behavior/Bhv_MapTrigger.cs | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/Core/MapEditor/Behavior/Bhv_MapTrigger.cs b/Core/MapEditor/Behavior/Bhv_MapTrigger.cs
index c482dbe..d301b00 100644
--- a/Core/MapEditor/Behavior/Bhv_MapTrigger.cs
+++ b/Core/MapEditor/Behavior/Bhv_MapTrigger.cs
@@ -10,24 +10,35 @@
{
public class Bhv_MapTrigger : MonoBehaviour
{
+ public enum E_TriggerType
+ {
+ Trigger,
+ EnterStage
+ }
+
[HideInInspector]
public int id;
+ [HideInInspector]
+ public E_TriggerType triggerType = E_TriggerType.Trigger;
[HideInInspector]
public Evt.E_EventType type = Evt.E_EventType.Enemy;
[HideInInspector]
public int prevID = -1;
[HideInInspector]
- public BoxCollider boxCollider;
- private bool showDetail = false;
- private bool showEventList = false;
- [HideInInspector]
public List<int> eventIDList = new List<int>();
#if UNITY_EDITOR
+ [HideInInspector]
+ public BoxCollider boxCollider;
+
+ private bool showDetail = false;
+ private bool showEventList = false;
+
public void Save(BinaryWriter bw)
{
bw.Write(id);
+ bw.Write((byte)triggerType);
bw.Write((byte)type);
bw.Write(prevID);
bw.Write((float)System.Math.Round(transform.position.x, 2));
@@ -51,6 +62,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();
@@ -92,18 +104,31 @@
if (showDetail)
{
EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
- EditorGUILayout.LabelField("鍓嶇疆瑙﹀彂鍣↖D", guiSkin.customStyles[0], GUILayout.Height(22), GUILayout.Width(80));
+ 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 = (E_TriggerType)EditorGUILayout.EnumPopup(triggerType, guiSkin.customStyles[1], GUILayout.Height(20), GUILayout.Width(100));
EditorGUILayout.EndHorizontal();
+
EditorGUILayout.BeginVertical(guiSkin.customStyles[1]);
+
EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
- showEventList = EditorGUILayout.Foldout(showEventList, " 瑙﹀彂浜嬩欢鍒楄〃", true, guiSkin.customStyles[3]);
+ if (eventIDList.Count > 0)
+ {
+ showEventList = EditorGUILayout.Foldout(showEventList, " 瑙﹀彂浜嬩欢鍒楄〃", true, guiSkin.customStyles[3]);
+ }
+ else
+ {
+ EditorGUILayout.LabelField(" 瑙﹀彂浜嬩欢鍒楄〃:", guiSkin.customStyles[0], GUILayout.Height(22), GUILayout.Width(100));
+ GUILayout.FlexibleSpace();
+ }
if (GUILayout.Button("娣诲姞", guiSkin.button, GUILayout.Width(60), GUILayout.Height(22)))
{
eventIDList.Add(0);
showEventList = true;
}
EditorGUILayout.EndHorizontal();
+
if (showEventList)
{
for (int i = eventIDList.Count - 1; i >= 0; --i)
--
Gitblit v1.8.0