From 04337e2a136af1f6f2f11cf8bf27409e753976df Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 22 一月 2019 22:12:09 +0800
Subject: [PATCH] 382 地图编辑器功能提交
---
Core/MapEditor/Behavior/Bhv_MapTrigger.cs | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/Core/MapEditor/Behavior/Bhv_MapTrigger.cs b/Core/MapEditor/Behavior/Bhv_MapTrigger.cs
index d301b00..7081694 100644
--- a/Core/MapEditor/Behavior/Bhv_MapTrigger.cs
+++ b/Core/MapEditor/Behavior/Bhv_MapTrigger.cs
@@ -10,16 +10,10 @@
{
public class Bhv_MapTrigger : MonoBehaviour
{
- public enum E_TriggerType
- {
- Trigger,
- EnterStage
- }
-
[HideInInspector]
public int id;
[HideInInspector]
- public E_TriggerType triggerType = E_TriggerType.Trigger;
+ public MapTrigger.E_TriggerType triggerType = MapTrigger.E_TriggerType.Trigger;
[HideInInspector]
public Evt.E_EventType type = Evt.E_EventType.Enemy;
[HideInInspector]
@@ -62,7 +56,7 @@
public void Load(BinaryReader br)
{
id = br.ReadInt32();
- triggerType = (E_TriggerType)br.ReadByte();
+ triggerType = (MapTrigger.E_TriggerType)br.ReadByte();
type = (Evt.E_EventType)br.ReadByte();
prevID = br.ReadInt32();
float _pX = br.ReadSingle();
@@ -107,7 +101,7 @@
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));
+ triggerType = (MapTrigger.E_TriggerType)EditorGUILayout.EnumPopup(triggerType, guiSkin.customStyles[1], GUILayout.Height(20), GUILayout.Width(100));
EditorGUILayout.EndHorizontal();
EditorGUILayout.BeginVertical(guiSkin.customStyles[1]);
--
Gitblit v1.8.0