*misc

15 files changed, 37 insertions, 10 deletions

diff --git a/Docs/记录.docx b/Docs/记录.docx
index 25b00b3..378737d 100644
--- a/Docs/记录.docx
+++ b/Docs/记录.docx
diff --git a/Samples/Hello/entities.asset b/Samples/Hello/entities.asset
new file mode 100644
index 0000000..18677b5
--- /dev/null
+++ b/Samples/Hello/entities.asset
@@ -0,0 +1,4 @@
+{
+type="folder",
+extern="./folder"
+}
\ No newline at end of file
diff --git a/Samples/Hello/entities/anim.asset b/Samples/Hello/entities/anim.asset
index 966098f..312aeb5 100644
--- a/Samples/Hello/entities/anim.asset
+++ b/Samples/Hello/entities/anim.asset
@@ -1,4 +1,4 @@
 {
-type="animation",
+type="gameobject",
 
 }
\ No newline at end of file
diff --git a/Samples/Hello/entities/player.asset b/Samples/Hello/entities/player.asset
index 7415a9c..5c1a82d 100644
--- a/Samples/Hello/entities/player.asset
+++ b/Samples/Hello/entities/player.asset
@@ -5,4 +5,7 @@ components={
     "/scripts/components/fly.lua",
     "/scripts/components/move.lua",
 },
+child_gameobjects={
+    
+}
 }
\ No newline at end of file
diff --git a/Samples/Hello/gfx.asset b/Samples/Hello/gfx.asset
new file mode 100644
index 0000000..c94c496
--- /dev/null
+++ b/Samples/Hello/gfx.asset
@@ -0,0 +1,4 @@
+{
+type="folder",
+extern="gfx"
+}
\ No newline at end of file
diff --git a/Samples/Hello/gfx/particles.asset b/Samples/Hello/gfx/particles.asset
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Samples/Hello/gfx/particles.asset
diff --git a/Samples/Hello/gfx/test.animation.asset b/Samples/Hello/gfx/test.animation.asset
index 89ca0df..e429d4c 100644
--- a/Samples/Hello/gfx/test.animation.asset
+++ b/Samples/Hello/gfx/test.animation.asset
@@ -4,11 +4,12 @@ duration=3,
 loop=true,
 update_sprite=true,
 update_transform=false,
+update_color=true,
 key_frames=4,
 frames={
-    {time=0.0,sprite="/sprites/hero_0.spr"},
-    {time=0.1,sprite="/sprites/hero_1.spr"},
-    {time=0.2,sprite="/sprites/hero_2.spr"},
-    {time=1.0,sprite="/sprites/hero_3.spr"},
+    {time=0.0,sprite="/sprites/hero_0.spr",color={255,0,0,255}},
+    {time=0.1,sprite="/sprites/hero_1.spr",color={255,255,0,255}},
+    {time=0.2,sprite="/sprites/hero_2.spr",color={255,0,255,255}},
+    {time=1.0,sprite="/sprites/hero_3.spr",color={255,0,0,255}},
 },
 }
\ No newline at end of file
diff --git a/Samples/Hello/loaders.asset b/Samples/Hello/loaders.asset
new file mode 100644
index 0000000..18677b5
--- /dev/null
+++ b/Samples/Hello/loaders.asset
@@ -0,0 +1,4 @@
+{
+type="folder",
+extern="./folder"
+}
\ No newline at end of file
diff --git a/Samples/Hello/scripts.asset b/Samples/Hello/scripts.asset
new file mode 100644
index 0000000..18677b5
--- /dev/null
+++ b/Samples/Hello/scripts.asset
@@ -0,0 +1,4 @@
+{
+type="folder",
+extern="./folder"
+}
\ No newline at end of file
diff --git a/Samples/Hello/scripts/components.asset b/Samples/Hello/scripts/components.asset
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Samples/Hello/scripts/components.asset
diff --git a/Samples/Hello/scripts/entities.asset b/Samples/Hello/scripts/entities.asset
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Samples/Hello/scripts/entities.asset
diff --git a/Samples/Hello/shaders.asset b/Samples/Hello/shaders.asset
new file mode 100644
index 0000000..18677b5
--- /dev/null
+++ b/Samples/Hello/shaders.asset
@@ -0,0 +1,4 @@
+{
+type="folder",
+extern="./folder"
+}
\ No newline at end of file
diff --git a/Samples/Hello/sprite.asset b/Samples/Hello/sprite.asset
new file mode 100644
index 0000000..18677b5
--- /dev/null
+++ b/Samples/Hello/sprite.asset
@@ -0,0 +1,4 @@
+{
+type="folder",
+extern="./folder"
+}
\ No newline at end of file
diff --git a/Samples/Hello/tiledmap.asset b/Samples/Hello/tiledmap.asset
new file mode 100644
index 0000000..18677b5
--- /dev/null
+++ b/Samples/Hello/tiledmap.asset
@@ -0,0 +1,4 @@
+{
+type="folder",
+extern="./folder"
+}
\ No newline at end of file
diff --git a/Source/Asura.Framework/Prefab.lua b/Source/Asura.Framework/Prefab.lua
deleted file mode 100644
index f03ed1d..0000000
--- a/Source/Asura.Framework/Prefab.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local Prefab = Class()
-
-
-
-return Prefab
\ No newline at end of file