summaryrefslogtreecommitdiff
path: root/Resources
diff options
context:
space:
mode:
Diffstat (limited to 'Resources')
-rw-r--r--Resources/DefaultContent/Libraries/GameLab/InternalClass.lua12
-rw-r--r--Resources/Scripts/Editor/Properties.lua1
-rw-r--r--Resources/Scripts/EditorApplication.lua2
-rw-r--r--Resources/boot.lua8
-rw-r--r--Resources/macro.lua3
5 files changed, 21 insertions, 5 deletions
diff --git a/Resources/DefaultContent/Libraries/GameLab/InternalClass.lua b/Resources/DefaultContent/Libraries/GameLab/InternalClass.lua
new file mode 100644
index 0000000..36ad568
--- /dev/null
+++ b/Resources/DefaultContent/Libraries/GameLab/InternalClass.lua
@@ -0,0 +1,12 @@
+local Class = GameLab.Class or require("GameLab.Class")
+
+-- 声明类的同时添加到G表
+local InternalClass = function(className)
+ local cls = Class(className)
+ _G[className] = className
+ return cls
+end
+
+GameLab.InternalClass = InternalClass
+
+return InternalClass \ No newline at end of file
diff --git a/Resources/Scripts/Editor/Properties.lua b/Resources/Scripts/Editor/Properties.lua
new file mode 100644
index 0000000..b520072
--- /dev/null
+++ b/Resources/Scripts/Editor/Properties.lua
@@ -0,0 +1 @@
+-- 属性检查器properties
diff --git a/Resources/Scripts/EditorApplication.lua b/Resources/Scripts/EditorApplication.lua
index 747e443..6ac68aa 100644
--- a/Resources/Scripts/EditorApplication.lua
+++ b/Resources/Scripts/EditorApplication.lua
@@ -59,7 +59,7 @@ local files = {
"README.txt",
}
-GameLab.IO.ReadFiles(files, function()
+GameLab.IO.ReadFilesAsync(files, function()
Debug.Log("finished")
end)
diff --git a/Resources/boot.lua b/Resources/boot.lua
index a07c96a..6f49da7 100644
--- a/Resources/boot.lua
+++ b/Resources/boot.lua
@@ -1,6 +1,4 @@
--- "macros"
-GAMELAB_PROFILE = true
-GAMELAB_DEBUG = true
+require("macro")
-- 模块搜索目录
local engineLuaLibs = "./DefaultContent/Libraries/?.lua" .. ";./DefaultContent/Libraries/?/init.lua" .. ";./DefaultContent/Libraries/?/?.lua" .. ";./DefaultContent/Libraries/?/?" ..
@@ -18,7 +16,9 @@ package.cpath=package.cpath .. ";" .. engineCLibs .. ";" .. editorCLibs
require("LuaPanda").start("127.0.0.1",8818)
-- redirect
-print = GameLab.Debug.Log
+if GAMELAB_DEBUG then
+ print = GameLab.Debug.Log
+end
-- load gamelab modules
require "GameLab"
diff --git a/Resources/macro.lua b/Resources/macro.lua
new file mode 100644
index 0000000..c8a4895
--- /dev/null
+++ b/Resources/macro.lua
@@ -0,0 +1,3 @@
+-- "macros"
+GAMELAB_PROFILE = true
+GAMELAB_DEBUG = true