Merge remote-tracking branch 'origin/master' into Equip

client_Wu Xijin

2019-03-08 afb266da01d7fb99af1cee0dd4749ca3a56a3e2f

 Core/MapEditor/Editor/MapEditor.cs

@@ -268,8 +268,10 @@
        private void CreateTrigger()
        {
            var _mapData = target as Bhv_MapData;
            var _trigger = CreateNewGO(Bhv_MapData.NodeName_Trigger + RequestTriggerID());
            var _id = RequestTriggerID();
            var _trigger = CreateNewGO(Bhv_MapData.NodeName_Trigger + _id);
            var _triggerBhv = _trigger.AddComponent<Bhv_MapTrigger>();
            _triggerBhv.id = _id;
            _triggerBhv.boxCollider = _trigger.AddComponent<BoxCollider>();
            _trigger.transform.SetParent(_mapData.transform.Find(Bhv_MapData.NodeName_TriggerList));
            _mapData.triggerList.Add(_triggerBhv);
@@ -281,8 +283,10 @@

            if (type == Evt.E_EventType.Enemy)
            {
                var _event = CreateNewGO(Bhv_MapData.NodeName_Event + "RefreshEvemy_" + RequestEventID());
                int _id = RequestEventID();
                var _event = CreateNewGO(Bhv_MapData.NodeName_Event + "RefreshEvemy_" + _id);
                var _eventBhv = _event.AddComponent<Bhv_Evt_RefreshMonster>();
                _eventBhv.id = _id;
                _eventBhv.type = type;
                _event.transform.SetParent(_mapData.transform.Find(Bhv_MapData.NodeName_EventList));
                _mapData.eventList.Add(_eventBhv);
@@ -291,8 +295,10 @@
            }
            else if (type == Evt.E_EventType.SceneObject)
            {
                var _event = CreateNewGO(Bhv_MapData.NodeName_Event + "RefreshSceneObject_" + RequestEventID());
                int _id = RequestEventID();
                var _event = CreateNewGO(Bhv_MapData.NodeName_Event + "RefreshSceneObject_" + _id);
                var _eventBhv = _event.AddComponent<Bhv_Evt_RefreshSceneObject>();
                _eventBhv.id = _id;
                _eventBhv.type = type;
                _event.transform.SetParent(_mapData.transform.Find(Bhv_MapData.NodeName_EventList));
                _mapData.eventList.Add(_eventBhv);
@@ -366,6 +372,22 @@
                {
                    _mapData.Load(_binaryReader);
                    EditorPrefs.SetString(LS_KEY_SAVEPATH, Directory.GetParent(_path).FullName);

                    foreach (var _event in _mapData.eventList)
                    {
                        if (_event.id >= m_EventSeed)
                        {
                            m_EventSeed = _event.id + 1;
                        }
                    }

                    foreach (var _trigger in _mapData.triggerList)
                    {
                        if (_trigger.id >= m_TriggerSeed)
                        {
                            m_TriggerSeed = _trigger.id + 1;
                        }
                    }
                }
            }
        }