diff options
Diffstat (limited to 'Data')
| -rw-r--r-- | Data/Resources/Metatable/Excel/Icons.xlsx | bin | 12385 -> 12404 bytes | |||
| -rw-r--r-- | Data/Resources/Metatable/Icons.csv | 4 | ||||
| -rw-r--r-- | Data/Resources/Shaders/UI.glsl | 1 | ||||
| -rw-r--r-- | Data/boot.lua | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Data/Resources/Metatable/Excel/Icons.xlsx b/Data/Resources/Metatable/Excel/Icons.xlsx Binary files differindex bc359e5..5f21f2d 100644 --- a/Data/Resources/Metatable/Excel/Icons.xlsx +++ b/Data/Resources/Metatable/Excel/Icons.xlsx diff --git a/Data/Resources/Metatable/Icons.csv b/Data/Resources/Metatable/Icons.csv index 0b7221a..85ea0fd 100644 --- a/Data/Resources/Metatable/Icons.csv +++ b/Data/Resources/Metatable/Icons.csv @@ -1,7 +1,7 @@ Name,Category,Path,Filter,Wrap,Slicing,Left,Right,Top,Bottom, btn_add,Button,buttons/add.png,,,,,,,, -btn_alpha,Button,buttons/alpha.png,,,,,,,, -btn_checker,Button,buttons/checker.png,,,,,,,, +btn_alpha,Button,buttons/alpha.png,Nearest,,,,,,, +btn_checker,Button,buttons/checker.png,,Repeat,,,,,, ,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,, diff --git a/Data/Resources/Shaders/UI.glsl b/Data/Resources/Shaders/UI.glsl index 12a94db..c4b1f92 100644 --- a/Data/Resources/Shaders/UI.glsl +++ b/Data/Resources/Shaders/UI.glsl @@ -8,5 +8,4 @@ FRAGMENT_SHADER_BEGIN - FRAGMENT_SHADER_END
\ No newline at end of file diff --git a/Data/boot.lua b/Data/boot.lua index 62b5d96..ad8f4da 100644 --- a/Data/boot.lua +++ b/Data/boot.lua @@ -14,7 +14,7 @@ package.cpath=package.cpath .. ";" .. engineCLibs .. ";" .. editorCLibs -- debugging
-- 在这里会报一个异常， 不知道为什么
-require("LuaPanda").start("127.0.0.1",8818)
+--require("LuaPanda").start("127.0.0.1",8818)
-- redirect
if GAMELAB_DEBUG then
@@ -32,7 +32,7 @@ require "GameLab.Editor" require "GameLab.Editor.GUI"
-- debugging
---require("LuaPanda").start("127.0.0.1",8818)
+require("LuaPanda").start("127.0.0.1",8818)
-- launch editor
dofile("./Scripts/EditorApplication.lua")
|