Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2019-03-26 291ccee6cdf1812f8b3b1f7b0e52c1ebd70cfe4c

 Core/MapEditor/Editor/MapEditor.cs

@@ -10,18 +10,6 @@
        private string LS_KEY_SAVEPATH;
        private string LS_KEY_EXPORTPATH;

        private int m_TriggerSeed;
        private int m_EventSeed;
        private int m_TransferSeed;
        private int RequestTriggerID()
        {
            return m_TriggerSeed++;
        }
        private int RequestEventID()
        {
            return m_EventSeed++;
        }

        private Evt.E_EventType eventType = Evt.E_EventType.Enemy;

        [MenuItem("程序/MapEditor | 地图编辑器")]
@@ -52,6 +40,7 @@
                        _root.AddComponent<MeshCollider>();
                        _root.transform.position = _go.transform.position;
                        _root.transform.rotation = _go.transform.rotation;
                        _root.transform.localScale = _go.transform.localScale;
                        _root.layer = LayerUtility.Walkble;
                        break;
                    }
@@ -85,11 +74,7 @@
        {
            if (GUILayout.Button("测试"))
            {
                var m = MapData.LoadFormFile(10120);
                if (m == null)
                {
                    Debug.Log("加载失败");
                }
                ClientSceneManager.Instance.TriggerTest(8);
            }
            if (gUISkin == null)
            {
@@ -269,7 +254,7 @@
        private void CreateTrigger()
        {
            var _mapData = target as Bhv_MapData;
            var _id = RequestTriggerID();
            var _id = _mapData.RequestTriggerID();
            var _trigger = CreateNewGO(Bhv_MapData.NodeName_Trigger + _id);
            var _triggerBhv = _trigger.AddComponent<Bhv_MapTrigger>();
            _triggerBhv.id = _id;
@@ -284,7 +269,7 @@

            if (type == Evt.E_EventType.Enemy)
            {
                int _id = RequestEventID();
                int _id = _mapData.RequestEventID();
                var _event = CreateNewGO(Bhv_MapData.NodeName_Event + "RefreshEvemy_" + _id);
                var _eventBhv = _event.AddComponent<Bhv_Evt_RefreshMonster>();
                _eventBhv.id = _id;
@@ -296,7 +281,7 @@
            }
            else if (type == Evt.E_EventType.SceneObject)
            {
                int _id = RequestEventID();
                int _id = _mapData.RequestEventID();
                var _event = CreateNewGO(Bhv_MapData.NodeName_Event + "RefreshSceneObject_" + _id);
                var _eventBhv = _event.AddComponent<Bhv_Evt_RefreshSceneObject>();
                _eventBhv.id = _id;
@@ -374,19 +359,20 @@
                    _mapData.Load(_binaryReader);
                    EditorPrefs.SetString(LS_KEY_SAVEPATH, Directory.GetParent(_path).FullName);


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

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