From b215d811a1981e20f35bb31df4e6cd2a74146193 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Thu, 4 Nov 2021 10:00:00 +0800
Subject: *misc

---
 Data/Libraries/GameLab/Editor/EditorWindow.lua     | 23 ++++++++++++++++++++++
 Data/Libraries/GameLab/Editor/GUI/EditorWindow.lua | 23 ----------------------
 Data/Libraries/GameLab/Editor/GUI/init.lua         |  2 --
 Data/Libraries/GameLab/Editor/init.lua             |  1 +
 4 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 Data/Libraries/GameLab/Editor/EditorWindow.lua
 delete mode 100644 Data/Libraries/GameLab/Editor/GUI/EditorWindow.lua

(limited to 'Data/Libraries')

diff --git a/Data/Libraries/GameLab/Editor/EditorWindow.lua b/Data/Libraries/GameLab/Editor/EditorWindow.lua
new file mode 100644
index 0000000..af79771
--- /dev/null
+++ b/Data/Libraries/GameLab/Editor/EditorWindow.lua
@@ -0,0 +1,23 @@
+local EditorWindow = GameLab.Class("GameLab.Editor.EditorWindow")
+
+EditorWindow.Ctor = function(self, title) 
+    self.title = title    -- 编辑器名称
+    self.guiWindow = nil  -- 绑定的GUIWindow 
+end
+
+EditorWindow.OnGUI = function(self)
+end
+
+EditorWindow.OnUpdate = function(self)
+end
+
+EditorWindow.OnStart = function(self)
+end
+
+EditorWindow.OnStop = function(self)
+end
+
+EditorWindow.OnFocus = function(self)
+end
+
+return EditorWindow
\ No newline at end of file
diff --git a/Data/Libraries/GameLab/Editor/GUI/EditorWindow.lua b/Data/Libraries/GameLab/Editor/GUI/EditorWindow.lua
deleted file mode 100644
index 4f0525f..0000000
--- a/Data/Libraries/GameLab/Editor/GUI/EditorWindow.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local EditorWindow = GameLab.Class("GameLab.Editor.GUI.EditorWindow")
-
-EditorWindow.Ctor = function(self, title) 
-    self.title = title    -- 编辑器名称
-    self.guiWindow = nil  -- 绑定的GUIWindow 
-end
-
-EditorWindow.OnGUI = function(self)
-end
-
-EditorWindow.OnUpdate = function(self)
-end
-
-EditorWindow.OnStart = function(self)
-end
-
-EditorWindow.OnStop = function(self)
-end
-
-EditorWindow.OnFocus = function(self)
-end
-
-return EditorWindow
\ No newline at end of file
diff --git a/Data/Libraries/GameLab/Editor/GUI/init.lua b/Data/Libraries/GameLab/Editor/GUI/init.lua
index def4237..a1ccb7c 100644
--- a/Data/Libraries/GameLab/Editor/GUI/init.lua
+++ b/Data/Libraries/GameLab/Editor/GUI/init.lua
@@ -3,8 +3,6 @@ local m = GameLab.Editor.GUI
 
 local import = GameLab.import(...)
 
-m.EditorWindow = import("EditorWindow")
-
 import("Functions")
 
 return m
\ No newline at end of file
diff --git a/Data/Libraries/GameLab/Editor/init.lua b/Data/Libraries/GameLab/Editor/init.lua
index 97b4b2e..c151aab 100644
--- a/Data/Libraries/GameLab/Editor/init.lua
+++ b/Data/Libraries/GameLab/Editor/init.lua
@@ -4,5 +4,6 @@ GameLab.Editor = m
 local import = GameLab.import(...)
 
 m.AssetManager = import("AssetManager")
+m.EditorWindow = import("EditorWindow")
 
 return m
\ No newline at end of file
-- 
cgit v1.1-26-g67d0