From 8d5a6d5514cd8766d105293f395ddf861675b25b Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 22 Jan 2019 16:28:23 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9asset=E6=96=87=E4=BB=B6=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Samples/Hello/entities.folder.asset | 2 -- Samples/Hello/entities/player.gameobject.asset | 6 +++++- Samples/Hello/gfx.folder.asset | 2 -- Samples/Hello/hello.asuraproject | 4 +--- Samples/Hello/loaders.folder.asset | 2 -- Samples/Hello/scripts.folder.asset | 2 -- Samples/Hello/scripts/hello.lua.asset | 2 -- Samples/Hello/shaders.folder.asset | 2 -- Samples/Hello/sprite.folder.asset | 2 -- Samples/Hello/tiledmap.folder.asset | 2 -- Samples/Hello/tiledmap/boat.tiledmap.asset.asset | 2 -- Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset | 2 -- 12 files changed, 6 insertions(+), 24 deletions(-) (limited to 'Samples/Hello') diff --git a/Samples/Hello/entities.folder.asset b/Samples/Hello/entities.folder.asset index 18677b5..bca6159 100644 --- a/Samples/Hello/entities.folder.asset +++ b/Samples/Hello/entities.folder.asset @@ -1,4 +1,2 @@ -{ type="folder", extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/entities/player.gameobject.asset b/Samples/Hello/entities/player.gameobject.asset index c57d3a0..03785bc 100644 --- a/Samples/Hello/entities/player.gameobject.asset +++ b/Samples/Hello/entities/player.gameobject.asset @@ -5,5 +5,9 @@ components={ "/scripts/components/move.lua", }, child_gameobjects={ - + ["axe keeper"] = { + components = { + + }, + } } diff --git a/Samples/Hello/gfx.folder.asset b/Samples/Hello/gfx.folder.asset index c94c496..3aefe62 100644 --- a/Samples/Hello/gfx.folder.asset +++ b/Samples/Hello/gfx.folder.asset @@ -1,4 +1,2 @@ -{ type="folder", extern="gfx" -} \ No newline at end of file diff --git a/Samples/Hello/hello.asuraproject b/Samples/Hello/hello.asuraproject index 158e3d9..a086f81 100644 --- a/Samples/Hello/hello.asuraproject +++ b/Samples/Hello/hello.asuraproject @@ -1,3 +1 @@ -{ -projectname="hello", -} \ No newline at end of file +projectname="hello", \ No newline at end of file diff --git a/Samples/Hello/loaders.folder.asset b/Samples/Hello/loaders.folder.asset index 18677b5..bca6159 100644 --- a/Samples/Hello/loaders.folder.asset +++ b/Samples/Hello/loaders.folder.asset @@ -1,4 +1,2 @@ -{ type="folder", extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/scripts.folder.asset b/Samples/Hello/scripts.folder.asset index 18677b5..bca6159 100644 --- a/Samples/Hello/scripts.folder.asset +++ b/Samples/Hello/scripts.folder.asset @@ -1,4 +1,2 @@ -{ type="folder", extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/scripts/hello.lua.asset b/Samples/Hello/scripts/hello.lua.asset index 00bde24..32725a5 100644 --- a/Samples/Hello/scripts/hello.lua.asset +++ b/Samples/Hello/scripts/hello.lua.asset @@ -1,4 +1,2 @@ -{ type="script", extern="hello.lua" -} \ No newline at end of file diff --git a/Samples/Hello/shaders.folder.asset b/Samples/Hello/shaders.folder.asset index 18677b5..bca6159 100644 --- a/Samples/Hello/shaders.folder.asset +++ b/Samples/Hello/shaders.folder.asset @@ -1,4 +1,2 @@ -{ type="folder", extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/sprite.folder.asset b/Samples/Hello/sprite.folder.asset index 18677b5..bca6159 100644 --- a/Samples/Hello/sprite.folder.asset +++ b/Samples/Hello/sprite.folder.asset @@ -1,4 +1,2 @@ -{ type="folder", extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/tiledmap.folder.asset b/Samples/Hello/tiledmap.folder.asset index 18677b5..bca6159 100644 --- a/Samples/Hello/tiledmap.folder.asset +++ b/Samples/Hello/tiledmap.folder.asset @@ -1,4 +1,2 @@ -{ type="folder", extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/tiledmap/boat.tiledmap.asset.asset b/Samples/Hello/tiledmap/boat.tiledmap.asset.asset index b1feb62..957fb9a 100644 --- a/Samples/Hello/tiledmap/boat.tiledmap.asset.asset +++ b/Samples/Hello/tiledmap/boat.tiledmap.asset.asset @@ -1,4 +1,2 @@ -{ type="asset", --默认的asset extern="boat.tiledmap" -} \ No newline at end of file diff --git a/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset b/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset index e502ccd..5f0f2be 100644 --- a/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset +++ b/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset @@ -1,4 +1,2 @@ -{ type="tiledmap", --根据type找到loader,把此asset和extern内容传入 extern="boat.tiledmap" -} \ No newline at end of file -- cgit v1.1-26-g67d0