+ job system

3 files changed, 5 insertions, 9 deletions

diff --git a/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/Color.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/Color.lua
index fb3e773..bf908a4 100644
--- a/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/Color.lua
+++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/Color.lua
@@ -1,7 +1,4 @@
 local Color = GameLab.Class("GameLab.Engine.Rendering.Color")
-GameLab.Engine.Rendering.Color = Color -- 避免require循环
-
-local Color32 = GameLab.Engine.Rendering.Color32 or require("GameLab.Engine.Rendering.Color32")
 
 Color.Ctor = function(self, r, g, b, a)
     self.r = r
@@ -11,6 +8,7 @@ Color.Ctor = function(self, r, g, b, a)
 end
 
 Color.ToColor32 = function(self)
+    local Color32 = GameLab.find("GameLab.Engine.Rendering.Color32")
     local c32 = Color32.New()
     c32.r = self.r * 255
     c32.g = self.g * 255
diff --git a/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/Color32.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/Color32.lua
index c17187a..d108dfb 100644
--- a/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/Color32.lua
+++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/Color32.lua
@@ -1,7 +1,4 @@
 local Color32 = GameLab.Class("GameLab.Engine.Rendering.Color32")
-GameLab.Engine.Rendering.Color32 = Color32 -- 避免require循环
-
-local Color = GameLab.Engine.Rendering.Color or  require("GameLab.Engine.Rendering.Color")
 
 Color32.Ctor = function(self, r, g, b, a) 
     self.r = r
@@ -11,6 +8,7 @@ Color32.Ctor = function(self, r, g, b, a)
 end 
 
 Color32.ToColor = function(self)
+    local Color = GameLab.find("GameLab.Engine.Rendering.Color")
     local c = Color.New()
     c.r = self.r / 255
     c.g = self.g / 255
diff --git a/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/init.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/init.lua
index 933adc1..d9b4e3e 100644
--- a/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/init.lua
+++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Rendering/init.lua
@@ -1,10 +1,10 @@
 local m = GameLab.Engine.Rendering or {} 
 GameLab.Engine.Rendering = m
 
-local require = GameLab.require(...)
+local import = GameLab.import(...)
 
-m.Color = require("Color")
-m.Color32 = require("Color32")
+m.Color = import("Color")
+m.Color32 = import("Color32")
 
 m.LoadTexture = function(path)