diff options
author | chai <chaifix@163.com> | 2021-10-26 13:39:42 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2021-10-26 13:39:42 +0800 |
commit | 5a7824ae15742c0280e569c81f0923afab33f517 (patch) | |
tree | 19c9f3bfc15e5c739adcc7d0e69aad1794c67df3 | |
parent | 3b79158563fd2f7f72d502067f178d60c31b2c28 (diff) |
*config
-rw-r--r-- | Data/DefaultContent/Libraries/GameLab/Component.lua | 7 | ||||
-rw-r--r-- | Data/DefaultContent/Libraries/GameLab/Node.lua | 0 | ||||
-rw-r--r-- | Data/DefaultContent/Libraries/GameLab/Object.lua | 5 | ||||
-rw-r--r-- | Data/Resources/Configs/Excel/Extract_All.cmd | 2 | ||||
-rw-r--r-- | Data/Resources/Configs/Excel/Extract_Gizmos.cmd | 1 | ||||
-rw-r--r-- | Data/Resources/Configs/Excel/Extract_Icons.cmd | 1 | ||||
-rw-r--r-- | Data/Resources/Configs/Excel/Gizmos.xlsx | bin | 0 -> 8244 bytes | |||
-rw-r--r-- | Data/Resources/Configs/Excel/Icons.xlsx | bin | 0 -> 9170 bytes | |||
-rw-r--r-- | Data/Resources/Configs/Gizmos.csv | 1 | ||||
-rw-r--r-- | Data/Resources/Configs/Icons.csv | 8 | ||||
-rw-r--r-- | Data/Resources/Gizmos/Gizmos.xlsx | bin | 0 -> 6184 bytes | |||
-rw-r--r-- | Data/Resources/Icons/GameLab.ico (renamed from Data/Resources/Icon/GameLab.ico) | bin | 32870 -> 32870 bytes | |||
-rw-r--r-- | Runtime/Common/DataBuffer.h | 1 | ||||
-rw-r--r-- | Runtime/FileSystem/FileJobs.h | 1 |
14 files changed, 25 insertions, 2 deletions
diff --git a/Data/DefaultContent/Libraries/GameLab/Component.lua b/Data/DefaultContent/Libraries/GameLab/Component.lua new file mode 100644 index 0000000..3048397 --- /dev/null +++ b/Data/DefaultContent/Libraries/GameLab/Component.lua @@ -0,0 +1,7 @@ +local Component = GameLab.Object.Extend("GameLab.Component")
+
+Component.Ctor = function(self)
+ self.owner = nil -- Node
+end
+
+return Component
\ No newline at end of file diff --git a/Data/DefaultContent/Libraries/GameLab/Node.lua b/Data/DefaultContent/Libraries/GameLab/Node.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Data/DefaultContent/Libraries/GameLab/Node.lua diff --git a/Data/DefaultContent/Libraries/GameLab/Object.lua b/Data/DefaultContent/Libraries/GameLab/Object.lua new file mode 100644 index 0000000..94d4154 --- /dev/null +++ b/Data/DefaultContent/Libraries/GameLab/Object.lua @@ -0,0 +1,5 @@ +local Object = GameLab.Class("GameLab.Object")
+
+
+
+return Object
\ No newline at end of file diff --git a/Data/Resources/Configs/Excel/Extract_All.cmd b/Data/Resources/Configs/Excel/Extract_All.cmd new file mode 100644 index 0000000..f6dd7d2 --- /dev/null +++ b/Data/Resources/Configs/Excel/Extract_All.cmd @@ -0,0 +1,2 @@ +./Extract_Gizmos.cmd
+./Extract_Icons.cmd
\ No newline at end of file diff --git a/Data/Resources/Configs/Excel/Extract_Gizmos.cmd b/Data/Resources/Configs/Excel/Extract_Gizmos.cmd new file mode 100644 index 0000000..f4b2e41 --- /dev/null +++ b/Data/Resources/Configs/Excel/Extract_Gizmos.cmd @@ -0,0 +1 @@ +"../../../../Tools/XlsxToCsv/xlsxToCsv.exe" Gizmos.xlsx ../Gizmos.csv
\ No newline at end of file diff --git a/Data/Resources/Configs/Excel/Extract_Icons.cmd b/Data/Resources/Configs/Excel/Extract_Icons.cmd new file mode 100644 index 0000000..f43e1b4 --- /dev/null +++ b/Data/Resources/Configs/Excel/Extract_Icons.cmd @@ -0,0 +1 @@ +"../../../../Tools/XlsxToCsv/xlsxToCsv.exe" Icons.xlsx ../Icons.csv
\ No newline at end of file diff --git a/Data/Resources/Configs/Excel/Gizmos.xlsx b/Data/Resources/Configs/Excel/Gizmos.xlsx Binary files differnew file mode 100644 index 0000000..28be5c3 --- /dev/null +++ b/Data/Resources/Configs/Excel/Gizmos.xlsx diff --git a/Data/Resources/Configs/Excel/Icons.xlsx b/Data/Resources/Configs/Excel/Icons.xlsx Binary files differnew file mode 100644 index 0000000..501ae81 --- /dev/null +++ b/Data/Resources/Configs/Excel/Icons.xlsx diff --git a/Data/Resources/Configs/Gizmos.csv b/Data/Resources/Configs/Gizmos.csv new file mode 100644 index 0000000..48eaf25 --- /dev/null +++ b/Data/Resources/Configs/Gizmos.csv @@ -0,0 +1 @@ +Path,Type,Left,Right,Top,Bottom, diff --git a/Data/Resources/Configs/Icons.csv b/Data/Resources/Configs/Icons.csv new file mode 100644 index 0000000..04cb8d7 --- /dev/null +++ b/Data/Resources/Configs/Icons.csv @@ -0,0 +1,8 @@ +Path,Type,Left,Right,Top,Bottom, +UI.png,1,12,12,13,13, +UI.png,1,12,12,13,13, +UI.png,1,12,12,13,13, +UI.png,1,12,12,13,13, +UI.png,1,12,12,13,13, +UI.png,1,12,12,13,13, +UI.png,1,12,12,13,13, diff --git a/Data/Resources/Gizmos/Gizmos.xlsx b/Data/Resources/Gizmos/Gizmos.xlsx Binary files differnew file mode 100644 index 0000000..cb921d4 --- /dev/null +++ b/Data/Resources/Gizmos/Gizmos.xlsx diff --git a/Data/Resources/Icon/GameLab.ico b/Data/Resources/Icons/GameLab.ico Binary files differindex ae94a7d..ae94a7d 100644 --- a/Data/Resources/Icon/GameLab.ico +++ b/Data/Resources/Icons/GameLab.ico diff --git a/Runtime/Common/DataBuffer.h b/Runtime/Common/DataBuffer.h index 591fe89..1d66546 100644 --- a/Runtime/Common/DataBuffer.h +++ b/Runtime/Common/DataBuffer.h @@ -18,7 +18,6 @@ public: int length; private: - LUA_BIND_DECL_CLASS(DataBuffer); LUA_BIND_DECL_METHOD(_GetLength); diff --git a/Runtime/FileSystem/FileJobs.h b/Runtime/FileSystem/FileJobs.h index 0970c54..50e681d 100644 --- a/Runtime/FileSystem/FileJobs.h +++ b/Runtime/FileSystem/FileJobs.h @@ -18,7 +18,6 @@ public: void Process() override; bool IsFinished() override; - int cur = 0; //当前处理的文件 std::vector<std::string> files; // 文件路径 LuaBind::StrongRef callback; // 完成后的回调函数 |