summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/Asura.Framework/Asura.Framework.vcxproj1
-rw-r--r--Build/Asura.Framework/Asura.Framework.vcxproj.filters1
-rw-r--r--Docs/记录.docxbin16869 -> 18455 bytes
-rw-r--r--Source/Asura.Engine/Graphics/Canvas.h4
-rw-r--r--Source/Asura.Framework/Scene.lua3
5 files changed, 5 insertions, 4 deletions
diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj b/Build/Asura.Framework/Asura.Framework.vcxproj
index 9b187d7..dce695a 100644
--- a/Build/Asura.Framework/Asura.Framework.vcxproj
+++ b/Build/Asura.Framework/Asura.Framework.vcxproj
@@ -147,7 +147,6 @@
<None Include="..\..\Source\Asura.Framework\Path\Path.lua" />
<None Include="..\..\Source\Asura.Framework\Path\PathCalculator.lua" />
<None Include="..\..\Source\Asura.Framework\Path\PathManager.lua" />
- <None Include="..\..\Source\Asura.Framework\Prefab.lua" />
<None Include="..\..\Source\Asura.Framework\Scene.lua" />
<None Include="..\..\Source\Asura.Framework\Transform.lua" />
</ItemGroup>
diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters
index 4d7ac53..b669674 100644
--- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters
+++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters
@@ -48,7 +48,6 @@
<Filter>Graphics</Filter>
</None>
<None Include="..\..\Source\Asura.Framework\Class.lua" />
- <None Include="..\..\Source\Asura.Framework\Prefab.lua" />
<None Include="..\..\Source\Asura.Framework\AI\StateMachine.lua">
<Filter>AI</Filter>
</None>
diff --git a/Docs/记录.docx b/Docs/记录.docx
index 378737d..28fbda8 100644
--- a/Docs/记录.docx
+++ b/Docs/记录.docx
Binary files differ
diff --git a/Source/Asura.Engine/Graphics/Canvas.h b/Source/Asura.Engine/Graphics/Canvas.h
index 7f70e7c..dbb274a 100644
--- a/Source/Asura.Engine/Graphics/Canvas.h
+++ b/Source/Asura.Engine/Graphics/Canvas.h
@@ -1,5 +1,5 @@
-#ifndef __AE_Canvas_H__
-#define __AE_Canvas_H__
+#ifndef __AE_CANVAS_H__
+#define __AE_CANVAS_H__
#include "Component.h"
#include "Texture.h"
diff --git a/Source/Asura.Framework/Scene.lua b/Source/Asura.Framework/Scene.lua
index 1c9fd16..afe6344 100644
--- a/Source/Asura.Framework/Scene.lua
+++ b/Source/Asura.Framework/Scene.lua
@@ -1,3 +1,6 @@
+--[[
+ԭ½
+]]
local Scene = Class()