diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a906a09..ed96cdf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="a6482d4a-e1b2-49e9-b033-f4637948b153" name="Default" comment="">
+    <list default="true" id="a6482d4a-e1b2-49e9-b033-f4637948b153" name="Default" comment="create stage ui">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/assets/graphics/Faces/1.png" beforeDir="false" afterPath="$PROJECT_DIR$/assets/graphics/Faces/face_001.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Actor.lua" beforeDir="false" afterPath="$PROJECT_DIR$/Actor.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/GameObject.lua" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/assets/data/actorData.lua" beforeDir="false" afterPath="$PROJECT_DIR$/assets/data/actorData.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/assets/data/actorDataNew.lua" beforeDir="false" afterPath="$PROJECT_DIR$/assets/data/actorDataNew.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/assets/data/objs.lua" beforeDir="false" afterPath="$PROJECT_DIR$/assets/data/objs.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/assets/data/simsun.ttf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/assets/graphics/Faces/face_001.png" beforeDir="false" afterPath="$PROJECT_DIR$/assets/graphics/Faces/1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/globle.lua" beforeDir="false" afterPath="$PROJECT_DIR$/globle.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/gooi/component.lua" beforeDir="false" afterPath="$PROJECT_DIR$/lib/gooi/component.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/util.lua" beforeDir="false" afterPath="$PROJECT_DIR$/lib/util.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.lua" beforeDir="false" afterPath="$PROJECT_DIR$/main.lua" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/objects/CreateStage.lua" beforeDir="false" afterPath="$PROJECT_DIR$/objects/CreateStage.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/objects/MainStage.lua" beforeDir="false" afterPath="$PROJECT_DIR$/objects/MainStage.lua" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,73 +27,74 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="MainStage.lua" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/objects/MainStage.lua">
+      <file leaf-file-name="CreateStage.lua" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/objects/CreateStage.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+            <state relative-caret-position="158">
+              <caret line="168" selection-start-line="168" selection-end-line="168" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Stage.lua" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/objects/Stage.lua">
+      <file leaf-file-name="Area.lua" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/objects/Area.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-410">
-              <caret line="9" column="3" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+            <state relative-caret-position="928">
+              <caret line="32" selection-start-line="32" selection-end-line="32" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="checkbox.lua" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/gooi/checkbox.lua">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file leaf-file-name="button.lua" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/gooi/button.lua">
-          <provider selected="true" editor-type-id="text-editor" />
+      <file leaf-file-name="Food.lua" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/objects/Food.lua">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2001">
+              <caret line="69" column="27" selection-start-line="69" selection-start-column="27" selection-end-line="69" selection-end-column="27" />
+            </state>
+          </provider>
         </entry>
       </file>
-      <file leaf-file-name="component.lua" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/gooi/component.lua">
+      <file leaf-file-name="actorDataNew.lua" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/assets/data/actorDataNew.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="159">
-              <caret line="413" column="42" lean-forward="true" selection-start-line="413" selection-start-column="42" selection-end-line="413" selection-end-column="42" />
+            <state>
+              <caret selection-end-line="67" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CreateStage.lua" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/objects/CreateStage.lua">
+      <file leaf-file-name="main.lua" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/main.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1363">
-              <caret line="47" column="22" lean-forward="true" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
+            <state>
+              <caret column="23" lean-forward="true" selection-start-column="23" selection-end-column="23" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="init.lua" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/gooi/init.lua">
+      <file leaf-file-name="MainScreen.lua" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/MainScreen.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-765" />
+            <state relative-caret-position="97">
+              <caret line="20" column="52" selection-start-line="20" selection-start-column="48" selection-end-line="20" selection-end-column="52" />
+            </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.lua" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/main.lua">
+      <file leaf-file-name="MainStage.lua" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/objects/MainStage.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="721">
-              <caret line="72" column="35" selection-start-line="72" selection-start-column="35" selection-end-line="72" selection-end-column="35" />
+            <state relative-caret-position="174">
+              <caret line="6" column="28" lean-forward="true" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="globle.lua" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/globle.lua">
+      <file leaf-file-name="Actor.lua" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Actor.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="70" column="30" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
+            <state relative-caret-position="-905">
+              <caret line="95" selection-start-line="95" selection-end-line="95" />
             </state>
           </provider>
         </entry>
@@ -90,8 +102,17 @@
       <file leaf-file-name="util.lua" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/util.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1556">
-              <caret line="1231" column="41" selection-start-line="1231" selection-start-column="32" selection-end-line="1231" selection-end-column="41" />
+            <state relative-caret-position="186">
+              <caret line="1329" column="28" lean-forward="true" selection-start-line="1329" selection-start-column="28" selection-end-line="1329" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="globle.lua" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/globle.lua">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-22">
+              <caret line="103" column="8" lean-forward="true" selection-start-line="103" selection-start-column="8" selection-end-line="103" selection-end-column="8" />
             </state>
           </provider>
         </entry>
@@ -172,27 +193,31 @@
         <option value="$PROJECT_DIR$/NewScreen.lua" />
         <option value="$PROJECT_DIR$/HelpScreen.lua" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/Actor.lua" />
-        <option value="$PROJECT_DIR$/assets/data/objs.lua" />
         <option value="$PROJECT_DIR$/objects/Food.lua" />
         <option value="$PROJECT_DIR$/objects/SkillTree.lua" />
         <option value="$PROJECT_DIR$/conf.lua" />
         <option value="$PROJECT_DIR$/objects/NewGameObject.lua" />
         <option value="$PROJECT_DIR$/objects/Player.lua" />
         <option value="$PROJECT_DIR$/objects/NewStage.lua" />
-        <option value="$PROJECT_DIR$/lib/util.lua" />
         <option value="$PROJECT_DIR$/objects/CreatStage.lua" />
-        <option value="$PROJECT_DIR$/main.lua" />
         <option value="$PROJECT_DIR$/objects/Stage.lua" />
+        <option value="$PROJECT_DIR$/lib/gooi/component.lua" />
+        <option value="$PROJECT_DIR$/assets/data/objs.lua" />
+        <option value="$PROJECT_DIR$/assets/data/actorData.lua" />
+        <option value="$PROJECT_DIR$/assets/data/actorDataNew.lua" />
+        <option value="$PROJECT_DIR$/objects/CreateStage.lua" />
+        <option value="$PROJECT_DIR$/lib/util.lua" />
+        <option value="$PROJECT_DIR$/main.lua" />
         <option value="$PROJECT_DIR$/globle.lua" />
+        <option value="$PROJECT_DIR$/Actor.lua" />
         <option value="$PROJECT_DIR$/objects/MainStage.lua" />
-        <option value="$PROJECT_DIR$/objects/CreateStage.lua" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
+    <option name="x" value="33" />
     <option name="y" value="23" />
-    <option name="width" value="1387" />
+    <option name="width" value="1396" />
     <option name="height" value="877" />
   </component>
   <component name="ProjectView">
@@ -217,30 +242,24 @@
               <item name="wuxiaLove2d" type="b2602c69:ProjectViewProjectNode" />
               <item name="wuxiaLove2d" type="462c0819:PsiDirectoryNode" />
               <item name="assets" type="462c0819:PsiDirectoryNode" />
-              <item name="graphics" type="462c0819:PsiDirectoryNode" />
+              <item name="data" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wuxiaLove2d" type="b2602c69:ProjectViewProjectNode" />
               <item name="wuxiaLove2d" type="462c0819:PsiDirectoryNode" />
               <item name="assets" type="462c0819:PsiDirectoryNode" />
-              <item name="graphics" type="462c0819:PsiDirectoryNode" />
-              <item name="Faces" type="462c0819:PsiDirectoryNode" />
+              <item name="font" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wuxiaLove2d" type="b2602c69:ProjectViewProjectNode" />
               <item name="wuxiaLove2d" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="graphics" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wuxiaLove2d" type="b2602c69:ProjectViewProjectNode" />
               <item name="wuxiaLove2d" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
-              <item name="gooi" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wuxiaLove2d" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wuxiaLove2d" type="462c0819:PsiDirectoryNode" />
-              <item name="objects" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -255,7 +274,7 @@
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-    <property name="settings.editor.selected.configurable" value="vcs.Git" />
+    <property name="settings.editor.selected.configurable" value="preferences.Lua" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -521,7 +540,14 @@
       <option name="project" value="LOCAL" />
       <updated>1539874369811</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="create stage ui">
+      <created>1539876972760</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1539876972761</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="TodoView">
@@ -534,11 +560,12 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1387" height="877" extended-state="0" />
+    <frame x="33" y="23" width="1396" height="877" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="2" />
       <window_info anchor="bottom" id="TODO" order="10" sideWeight="0.49962935" weight="0.32948717" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49962935" weight="0.32948717" />
       <window_info anchor="right" id="Palette&#9;" order="0" />
       <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.51672864" side_tool="true" weight="0.32948717" />
       <window_info anchor="right" id="Maven Projects" order="1" />
@@ -547,7 +574,7 @@
       <window_info anchor="bottom" id="Version Control" order="1" sideWeight="0.4944238" weight="0.32948717" />
       <window_info anchor="bottom" id="Terminal" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="3" visible="true" weight="0.12193309" />
+      <window_info content_ui="combo" id="Project" order="3" visible="true" weight="0.12703101" />
       <window_info id="Structure" order="4" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="4" weight="0.25" />
       <window_info id="UI Designer" order="0" />
@@ -556,22 +583,21 @@
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="9" weight="0.4" />
       <window_info anchor="right" id="Commander" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49962935" weight="0.32948717" />
       <window_info anchor="bottom" id="Message" order="4" />
       <window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="5" sideWeight="0.49888477" weight="0.32948717" />
+      <window_info anchor="bottom" id="Find" order="5" sideWeight="0.49888477" visible="true" weight="0.32948717" />
     </layout>
     <layout-to-restore>
       <window_info anchor="right" id="Palette" order="2" />
       <window_info anchor="bottom" id="LuaCheck" order="0" sideWeight="0.49814677" weight="0.32948717" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="5" weight="0.25" />
       <window_info active="true" anchor="bottom" id="Run" order="6" sideWeight="0.4832714" visible="true" weight="0.32948717" />
-      <window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
       <window_info content_ui="combo" id="Project" order="3" visible="true" weight="0.12193309" />
       <window_info id="Structure" order="4" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Commander" order="3" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="4" weight="0.25" />
       <window_info anchor="bottom" id="TODO" order="10" sideWeight="0.49962935" weight="0.32948717" />
+      <window_info anchor="bottom" id="Version Control" order="1" sideWeight="0.4944238" weight="0.32948717" />
       <window_info anchor="bottom" id="Find" order="5" sideWeight="0.49888477" weight="0.32948717" />
       <window_info id="Designer" order="2" />
       <window_info id="UI Designer" order="0" />
@@ -580,13 +606,23 @@
       <window_info anchor="bottom" id="Terminal" order="2" />
       <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.51672864" side_tool="true" visible="true" weight="0.32948717" />
       <window_info anchor="bottom" id="Inspection" order="9" weight="0.4" />
-      <window_info anchor="bottom" id="Version Control" order="1" sideWeight="0.4944238" weight="0.32948717" />
+      <window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="4" />
       <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49962935" weight="0.32948717" />
       <window_info anchor="right" id="Maven Projects" order="1" />
       <window_info id="Favorites" order="1" side_tool="true" />
     </layout-to-restore>
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
@@ -637,34 +673,63 @@
     <MESSAGE value="gooi lib test." />
     <MESSAGE value="gooi lib test.switch stage test." />
     <MESSAGE value="gooi test" />
-    <option name="LAST_COMMIT_MESSAGE" value="gooi test" />
+    <MESSAGE value="create stage ui" />
+    <option name="LAST_COMMIT_MESSAGE" value="create stage ui" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/MainScreen.lua">
+    <entry file="file://$PROJECT_DIR$/objects/Player.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="580">
-          <caret line="20" column="52" selection-start-line="20" selection-start-column="48" selection-end-line="20" selection-end-column="52" />
+        <state relative-caret-position="2291">
+          <caret line="79" column="7" lean-forward="true" selection-start-line="79" selection-start-column="7" selection-end-line="79" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/objects/CreateStage.lua">
+    <entry file="file://$PROJECT_DIR$/objects/Area.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="928">
+          <caret line="32" selection-start-line="32" selection-end-line="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/objects/Food.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2001">
+          <caret line="69" column="27" selection-start-line="69" selection-start-column="27" selection-end-line="69" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/assets/data/actorDataNew.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="14" column="41" selection-start-line="14" selection-end-line="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/assets/data/actorData.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1015">
-          <caret line="35" column="33" lean-forward="true" selection-start-line="35" selection-start-column="33" selection-end-line="35" selection-end-column="33" />
+        <state relative-caret-position="4321">
+          <caret line="149" column="18" selection-start-line="149" selection-start-column="15" selection-end-line="149" selection-end-column="18" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/main.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2668">
-          <caret line="92" column="63" lean-forward="true" selection-start-line="92" selection-start-column="63" selection-end-line="92" selection-end-column="91" />
+        <state relative-caret-position="435">
+          <caret line="15" column="41" lean-forward="true" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/objects/MainStage.lua">
+    <entry file="file://$PROJECT_DIR$/lib/util.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="35902">
+          <caret line="1238" column="44" lean-forward="true" selection-start-line="1238" selection-start-column="44" selection-end-line="1238" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Actor.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="609">
-          <caret line="21" column="46" selection-start-line="21" selection-start-column="37" selection-end-line="21" selection-end-column="46" />
+        <state relative-caret-position="9338">
+          <caret line="322" column="46" selection-start-line="322" selection-start-column="46" selection-end-line="322" selection-end-column="46" />
         </state>
       </provider>
     </entry>
@@ -738,20 +803,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/HelpScreen.lua">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-539">
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Actor.lua">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="381">
-          <caret line="322" column="46" selection-start-line="322" selection-start-column="46" selection-end-line="322" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/NewScreen.lua">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
@@ -759,13 +810,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/objects/Food.lua">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="174">
-          <caret line="56" column="20" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/assets/data/skills.lua">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4233">
@@ -773,13 +817,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/assets/data/objs.lua">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="29">
-          <caret line="1" column="25" lean-forward="true" selection-start-line="1" selection-start-column="25" selection-end-line="1" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/BattleScreen.lua">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-817" />
@@ -807,13 +844,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/objects/Player.lua">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2552">
-          <caret line="88" column="3" selection-start-line="88" selection-start-column="3" selection-end-line="88" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/objects/NewGameObject.lua">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="261">
@@ -844,87 +874,143 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/objects/NewStage.lua" />
-    <entry file="file://$PROJECT_DIR$/MainScreen.lua">
+    <entry file="file://$PROJECT_DIR$/lib/gooi/gooi.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1061">
-          <caret line="20" column="52" selection-start-line="20" selection-start-column="48" selection-end-line="20" selection-end-column="52" />
+        <state relative-caret-position="556">
+          <caret line="68" column="23" lean-forward="true" selection-start-line="68" selection-start-column="23" selection-end-line="68" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/objects/Area.lua">
+    <entry file="file://$PROJECT_DIR$/objects/Stage.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-268">
-          <caret line="32" selection-start-line="32" selection-end-line="32" />
+        <state relative-caret-position="261">
+          <caret line="9" column="3" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/gooi/bar.lua">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/api/love.graphics.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="42775">
+          <caret line="1475" column="26" selection-start-line="1475" selection-start-column="26" selection-end-line="1475" selection-end-column="26" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/gooi/checkbox.lua">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/lib/gooi/component.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4350">
+          <caret line="150" column="59" selection-start-line="150" selection-start-column="59" selection-end-line="150" selection-end-column="59" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/gooi/init.lua">
+    <entry file="file://$PROJECT_DIR$/DoSomeThing.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-765" />
+        <state relative-caret-position="70">
+          <caret line="44" selection-start-line="44" selection-end-line="44" />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/gooi/gooi.lua">
+    <entry file="file://$PROJECT_DIR$/assets/data/rooms.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="556">
-          <caret line="68" column="23" lean-forward="true" selection-start-line="68" selection-start-column="23" selection-end-line="68" selection-end-column="23" />
+        <state relative-caret-position="232">
+          <caret line="8" column="29" selection-start-line="8" selection-start-column="29" selection-end-line="8" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/gooi/button.lua">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/HelpScreen.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="87">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/util.lua">
+    <entry file="file://$PROJECT_DIR$/assets/data/objs.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1556">
-          <caret line="1231" column="41" selection-start-line="1231" selection-start-column="32" selection-end-line="1231" selection-end-column="41" />
+        <state relative-caret-position="174">
+          <caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.lua">
+    <entry file="file://$PROJECT_DIR$/assets/data/actorData.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="721">
-          <caret line="72" column="35" selection-start-line="72" selection-start-column="35" selection-end-line="72" selection-end-column="35" />
+        <state relative-caret-position="4321">
+          <caret line="149" column="18" selection-start-line="149" selection-start-column="15" selection-end-line="149" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/globle.lua">
+    <entry file="file://$PROJECT_DIR$/objects/Player.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="70" column="30" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
+        <state relative-caret-position="2291">
+          <caret line="79" column="7" selection-start-line="79" selection-start-column="7" selection-end-line="79" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/gooi/component.lua">
+    <entry file="file://$PROJECT_DIR$/objects/Area.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="159">
-          <caret line="413" column="42" lean-forward="true" selection-start-line="413" selection-start-column="42" selection-end-line="413" selection-end-column="42" />
+        <state relative-caret-position="928">
+          <caret line="32" selection-start-line="32" selection-end-line="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/objects/Stage.lua">
+    <entry file="file://$PROJECT_DIR$/objects/Food.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-410">
-          <caret line="9" column="3" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        <state relative-caret-position="2001">
+          <caret line="69" column="27" selection-start-line="69" selection-start-column="27" selection-end-line="69" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/objects/MainStage.lua">
+    <entry file="file://$PROJECT_DIR$/objects/CreateStage.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="158">
+          <caret line="168" selection-start-line="168" selection-end-line="168" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/MainScreen.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="97">
+          <caret line="20" column="52" selection-start-line="20" selection-start-column="48" selection-end-line="20" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.lua">
       <provider selected="true" editor-type-id="text-editor">
         <state>
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+          <caret column="23" lean-forward="true" selection-start-column="23" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/objects/CreateStage.lua">
+    <entry file="file://$PROJECT_DIR$/assets/data/actorDataNew.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-line="67" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/util.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="1329" column="28" lean-forward="true" selection-start-line="1329" selection-start-column="28" selection-end-line="1329" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/globle.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-22">
+          <caret line="103" column="8" lean-forward="true" selection-start-line="103" selection-start-column="8" selection-end-line="103" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Actor.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1363">
-          <caret line="47" column="22" lean-forward="true" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
+        <state relative-caret-position="-905">
+          <caret line="95" selection-start-line="95" selection-end-line="95" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/objects/MainStage.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="6" column="28" lean-forward="true" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/Actor.lua b/Actor.lua
index f07e85b..0f86bae 100644
--- a/Actor.lua
+++ b/Actor.lua
@@ -1,3 +1,76 @@
+-- id                               string                           角色ID
+-- name                             string                           名称
+-- fname                            string                           姓
+-- lname                            string                           名
+-- nickname                         string                           绰号
+-- title                            string                           头衔
+-- unique                           boolean                          独特
+-- country                          string                           国家
+-- description                      string                           描述
+-- gender                           string                           性别
+-- sect                             string                           门派
+-- age                              int                              年龄
+-- turn                             int                              回合
+-- exp                              int                              历练
+-- faith                            string                           信仰
+-- moral                            int                              道德
+-- attitude                         string                           态度
+-- reputation                       int                              声望
+-- force                            int                              内力
+-- strike                           int                              攻击
+-- dodge                            int                              躲闪
+-- parry                            int                              招架
+-- skill                            tableString[k:#1(string)|v:#2(int)]   技能
+-- mapSkill                         tableString[k:#1(string)|v:#2(string)]   装备技能
+-- Str                              int                              臂力
+-- Con                              int                              根骨
+-- Dex                              int                              身法
+-- Int                              int                              悟性
+-- Wis                              int                              五感
+-- Cha                              int                              容貌
+-- Luc                              int                              福源
+-- maxHP                            int                              最大气血
+-- maxMP                            int                              最大真气
+-- maxAP                            int                              最大精力
+-- maxEP                            int                              最大精神
+-- hp                               int                              气血
+-- mp                               int                              真气
+-- ap                               int                              体力
+-- ep                               int                              精神
+-- weapon                           string                           武器
+-- armor                            tableString[k:#seq|v:#1(string)]   防具
+-- misc                             tableString[k:#seq|v:#1(string)]   杂物
+-- state                            string                           状态
+-- action                           string                           动作
+-- region                           string                           区域
+-- room                             string                           房间
+-- obj                              string                           发现物品
+-- target                           string                           遇见角色
+-- food                             string                           食物
+-- water                            string                           饮水
+-- money                            int                              金钱
+-- x                                int                              坐标x
+-- y                                int                              坐标y
+-- tx                               int                              tiled坐标x
+-- ty                               int                              tiled坐标y
+-- actorImg                         string                           行走图
+-- anim                             tableString[k:#1(string)|v:#2(int)]   动画
+-- image                            tableString[k:#1(string)|v:#2(int)]   图像
+-- faceImg                          string                           头像
+-- toward                           string                           朝向
+-- condition                        tableString[k:#1(string)|v:#2(int)]   状态
+-- isBusy                           boolean                          忙碌中
+-- isFighting                       boolean                          战斗中
+-- jobName                          mapString[name=string,number=int,state=string,obj=string]   工作名称
+-- mark                             tableString[k:#1(string)|v:#2(int)]   标记
+-- encumbrance                      int                              负重
+-- message                          tableString[k:#seq|v:#1(string)]   讯息
+
+
+
+
+
+
 Class = require "lib/middleclass"
 local anim8 = require "lib/anim8"
 require("keymap")
@@ -12,6 +85,15 @@ require("objects.Food")
 GameObject = require("objects.GameObject")
 --- 角色数据
 --- @class Actor
+--- @param area Area
+--- @param x number
+--- @param y number
+--- @param opts table
+--- @field id string
+--- @field fname string 姓
+--- @field lname string 名
+--- @field name string 姓名
+
 Actor = Class("Actor",GameObject)
 function Actor:init(area,x,y,opts)
     --GameObject.init(self,area,x,y,opts)
@@ -20,7 +102,18 @@ function Actor:init(area,x,y,opts)
     self.grid_x = math.ceil(self.x / 32)
     self.grid_y = math.ceil(self.y / 32)
     self.actorImg = assets.graphics.characters.actor_001
-    self:getAnims(self["actorImg"] or "actor (1)")
+    --self:getAnims(self["actorImg"] or "actor (1)")
+    self.id = UUID()
+    self.fname = ""
+    self.lname = ""
+    self.name = ""
+    self.gender = ""
+    self.age = 16
+    self.nickname = ""
+    self.country = ""
+    self.family = ""
+    self.sect = ""
+    self.title = ""
     self.turn = 0
     self.cd = 1
     self.sleep = false
diff --git a/GameObject.lua b/GameObject.lua
deleted file mode 100644
index 598d414..0000000
--- a/GameObject.lua
+++ /dev/null
@@ -1,29 +0,0 @@
----
---- Generated by EmmyLua(https://github.com/EmmyLua)
---- Created by apple.
---- DateTime: 2018/8/22 下午10:19
----
-
-require("lib.middleclass")
-
-GameObject = Class("GameObject")
-
-function GameObject:init(x,y,sets)
-    self.x = x
-    self.y = y
-    local sets = sets or {}
-    for k, v in pairs(sets) do
-        self[k] = v
-    end
-    self.dead = false
-end
-
-function GameObject:update(dt)
-
-end
-
-function GameObject:draw()
-    local w = self.w or 32
-    local h = self.h or 32
-    love.graphics.rectangle("fill",self.x,self.y,w,h)
-end
\ No newline at end of file
diff --git a/assets/data/actorData.lua b/assets/data/actorData.lua
index 7cdb5c5..0952cf5 100644
--- a/assets/data/actorData.lua
+++ b/assets/data/actorData.lua
@@ -70,6 +70,86 @@
 -- debuff                           tableString[k:#1(string)|v:#2(int)]   有害状态
 
 return {
+	["actor_base"] = {
+		id = "",
+		region = "",
+		room = "",
+		name = "",
+		fname = "",
+		lname = "",
+		epithet = "",
+		clan = "",
+		country = "",
+		description = "",
+		sex = "",
+		sect = "",
+		age = 16,
+		turn = 0,
+		exp = 0,
+		faith = "",
+		moral = 0,
+		reputation = 0,
+		Str = 8,
+		Con = 8,
+		Dex = 8,
+		Int = 8,
+		Wis = 8,
+		Cha = 8,
+		Luc = 8,
+		maxHP = 80,
+		maxMP = 0,
+		maxAP = 80,
+		hp = 80,
+		mp = 0,
+		ap = 80,
+		skills = {
+			长拳 = 123,
+		},
+		mainHand = "长拳",
+		offHand = "",
+		parry = "",
+		dodge = "",
+		force = "",
+		head = "",
+		face = "",
+		shoulder = "",
+		body = "",
+		waist = "",
+		hand = "",
+		arms = "",
+		leg = "",
+		feet = "",
+		misc = {
+			[1] = "碎银",
+		},
+		state = "",
+		action = "",
+		target = "",
+		foodBag = {
+			干粮 = 20,
+		},
+		waterBag = {
+			清水 = 10,
+		},
+		food = "100",
+		water = "100",
+		pain = "0",
+		money = "0",
+		actorImg = "actor (1)",
+		faceImg = "1",
+		birth = "",
+		youth = "",
+		adult = "",
+		midage = "",
+		oldage = "",
+		x = 0,
+		y = 0,
+		tx = 0,
+		ty = 0,
+		toward = "S",
+		buff = nil,
+		debuff = nil,
+	},
 	["言达平"] = {
 		id = "言达平",
 		region = "襄阳武馆",
diff --git a/assets/data/actorDataNew.lua b/assets/data/actorDataNew.lua
index a1a90e9..132d871 100644
--- a/assets/data/actorDataNew.lua
+++ b/assets/data/actorDataNew.lua
@@ -66,7 +66,77 @@
 -- encumbrance                      int                              负重
 -- message                          tableString[k:#seq|v:#1(string)]   讯息
 
+-- id xxx xxxx ,region id + index
 return {
+	[1000000] = {
+		id = 1000000,
+		name = "",
+		fname = "",
+		lname = "",
+		nickname = "",
+		title = "",
+		unique = true,
+		country = "",
+		description = "",
+		gender = "",
+		sect = "",
+		age = 16,
+		turn = 0,
+		exp = 0,
+		faith = "",
+		moral = 0,
+		attitude = "",
+		reputation = 0,
+		force = 10,
+		strike = 10,
+		dodge = 10,
+		parry = 10,
+		skill = {},
+		mapSkill = {},
+		Str = 8,
+		Con = 8,
+		Dex = 8,
+		Int = 8,
+		Wis = 8,
+		Cha = 8,
+		Luc = 8,
+		maxHP = 40,
+		maxMP = 0,
+		maxAP = 40,
+		maxEP = 40,
+		hp = 40,
+		mp = 0,
+		ap = 40,
+		ep = 40,
+		weapon = "",
+		armor = nil,
+		misc = nil,
+		state = "",
+		action = "",
+		region = "",
+		room = "",
+		obj = "",
+		target = "",
+		food = "100",
+		water = "100",
+		money = 0,
+		x = 0,
+		y = 0,
+		tx = 0,
+		ty = 0,
+		actorImg = "actor (1)",
+		anim = nil,
+		image = nil,
+		faceImg = "1",
+		toward = "S",
+		condition = nil,
+		isBusy = false,
+		isFighting = false,
+		jobName = nil,
+		mark = nil,
+		encumbrance = 1000,
+		message = nil,
+	},
 	["YanDaPing"] = {
 		id = "YanDaPing",
 		name = "言达平",
diff --git a/assets/data/objs.lua b/assets/data/objs.lua
index ad69740..c46fb5b 100644
--- a/assets/data/objs.lua
+++ b/assets/data/objs.lua
@@ -2,8 +2,8 @@ return {
 	["chai_dao"] = {ID="柴刀",type="工具",name="柴刀",weight=500,unit="柄",description="这是一柄沉甸甸的砍柴刀，普通百姓的日常用品。",value=50,material="铁",water=0,food=0,pice=0,actionA="无",actionB="砍",actionX="拿",actionY="无",messageA="无",messageB="$N「唰」的一声抽出一柄$n握在手中。",messageC="$N将手中的$n插回腰间。",messageD="无",},
 	["chu_tou"]={ID="锄头",type="工具",name="锄头",weight=500,unit="把",description="这是一把锄头，普通百姓的日常务农用品。",value=50,material="铁",water=0,food=0,pice=0,actionA="无",actionB="锄",actionX="拿",actionY="无",messageA="无",messageB="$N「唰」的一声抽出一柄$n握在手中。",messageC="$N将手中的$n抗在肩上。",messageD="无",},
 	["da_wan_cha"]={ID="大碗茶",type="water",name="大碗茶",weight=50,unit="杯",description="一杯大碗茶，悠悠地冒着热气～～～",value=0,material="水",water=30,food=0,pice=3,actionA="喝",actionB="无",actionX="无",actionY="无",messageA="$N端起杯茶，有滋有味地品了几口。一股香气直入心脾，$N觉得精神好多了。",messageB="无",messageC="无",messageD="无",},
-	["麻婆豆腐"]={ID="麻婆豆腐",type="food",name="麻婆豆腐",weight=200,unit="碗",description="在雪白细嫩的豆腐上、点缀着棕红色的牛肉末和油绿的青蒜苗，外围一圈透亮的红油，如玉镶琥珀，具有麻、辣、烫、嫩、酥、香、鲜的独特风味。",value=60,material="食",water=0,food=50,pice=3,actionA="吃",actionB="无",actionX="无",actionY="无",messageA="无",messageB="无",messageC="无",messageD="无",},
-	["锦缎"]={ID="锦缎",type="衣服",name="锦缎",weight=3000,unit="件",description="华贵的锦缎",value=10000,material="丝绸",water=0,food=0,pice=0,actionA="无",actionB="无",actionX="穿",actionY="无",messageA="无",messageB="无",messageC="无",messageD="无",},
+	["ma_po_dou_fu"]={ID="麻婆豆腐",type="food",name="麻婆豆腐",weight=200,unit="碗",description="在雪白细嫩的豆腐上、点缀着棕红色的牛肉末和油绿的青蒜苗，外围一圈透亮的红油，如玉镶琥珀，具有麻、辣、烫、嫩、酥、香、鲜的独特风味。",value=60,material="食",water=0,food=50,pice=3,actionA="吃",actionB="无",actionX="无",actionY="无",messageA="无",messageB="无",messageC="无",messageD="无",},
+	["jin_duan"]={ID="锦缎",type="衣服",name="锦缎",weight=3000,unit="件",description="华贵的锦缎",value=10000,material="丝绸",water=0,food=0,pice=0,actionA="无",actionB="无",actionX="穿",actionY="无",messageA="无",messageB="无",messageC="无",messageD="无",},
 	["锯子"]={ID="锯子",type="工具",name="锯子",weight=500,unit="把",description="这是一用来锯木头的锯子，普通百姓的日常用品。",value=50,material="铁",water=0,food=0,pice=0,actionA="无",actionB="锯",actionX="拿",actionY="无",messageA="无",messageB="$N拿出一把$n握在手中。",messageC="$N将手中的扛在肩上。",messageD="无",},
 	["馒头"]={ID="馒头",type="food",name="馒头",weight=50,unit="个",description="一个刚从蒸笼里拿出来的白馒头，还冒着热气～～～",value=120,material="食",water=0,food=40,pice=5,actionA="吃",actionB="无",actionX="拿",actionY="无",messageA="无",messageB="无",messageC="无",messageD="无",},
 	["瓢"]={ID="瓢",type="工具",name="瓢",weight=500,unit="把",description="这是一个用老葫芦劈开做成的瓢，普通百姓的日常务农用品。",value=50,material="铁",water=0,food=0,pice=0,actionA="无",actionB="浇水",actionX="拿",actionY="无",messageA="无",messageB="$N拿出一把$n握在手中。",messageC="$N将手中的$n插在腰上。",messageD="无",},
diff --git a/assets/data/simsun.ttf b/assets/data/simsun.ttf
deleted file mode 100644
index e0115ab..0000000
Binary files a/assets/data/simsun.ttf and /dev/null differ
diff --git a/assets/graphics/Faces/face_001.png b/assets/graphics/Faces/1.png
similarity index 100%
rename from assets/graphics/Faces/face_001.png
rename to assets/graphics/Faces/1.png
diff --git a/globle.lua b/globle.lua
index 0e885a7..b9aa2ba 100644
--- a/globle.lua
+++ b/globle.lua
@@ -95,6 +95,27 @@ quality_labels[3] = '【超三品】'
 quality_labels[2] = '【绝二品】'
 quality_labels[1] = '【天一品】'
 
+--- 武器
+weapons = {"手套","剑","刀","棍","枪","琴","箫","镖","奇门"}
+--- 材质
+materials = {"麻布","皮革","丝绸","软木","硬木","铁木","玉石","金铁","炼化"}
+--- 功法类型
+gongfas = {"拳掌","指爪","剑法","刀法","长兵","暗器","奇门","乐器","内功","绝技"}
+--- 技能类型
+skills = {"音律","弈棋","诗书","绘画","厨艺","品鉴","术数","杂学","锻造","制木","医术","毒术","织锦","巧匠","佛学","道法","儒学"}
+--- 内功类型
+forces = {"混元","玄阴","纯阳","调和"}
+
+--- 国家
+countries = {"大宋","大元","大夏","大金","大理"}
+
+--- 家族
+families = {"参合庄","曼陀山庄","白陀山庄","聚贤庄","一品堂","药王庄","万兽山庄","绿柳山庄"}
+
+--- 门派
+sects = {"少林寺","大理寺","金轮寺","武当派","全真教","太乙教","百草帮","丐帮","五毒教","峨眉派","玄女派"}
+
+
 --- 绘制
 --- @type func love.graphics.rectangleArcPanel
 function love.graphics.rectangleArcPanel(x,y,w,h,r,line_width,line_color,panel_color,isLine)
diff --git a/lib/gooi/component.lua b/lib/gooi/component.lua
index 3cfda2a..3485d3d 100755
--- a/lib/gooi/component.lua
+++ b/lib/gooi/component.lua
@@ -250,6 +250,16 @@ function component:draw()-- Every component has the same base:
 		    self.style.radius,
 		    self.style.radius,
 		    circleRes)
+
+			--love.graphics.rectangleCN(
+			--		math.floor(self.x),
+			--		math.floor(self.y),
+			--		math.floor(self.w),
+			--		math.floor(self.h),
+			--		10
+			--		--self.style.radius,
+			--		--circleRes
+			--)
     end, "replace", 1)
 		love.graphics.setStencilTest("greater", 0)
 		local scaleY = 1
diff --git a/lib/util.lua b/lib/util.lua
index 083fba4..42b4d63 100644
--- a/lib/util.lua
+++ b/lib/util.lua
@@ -1236,7 +1236,7 @@ function recursiveEnumerate( folder,file_list )
 	local items = love.filesystem.getDirectoryItems(folder)
 	for _,item in ipairs(items) do
 		local file = folder .. '/' .. item
-		if love.filesystem.isFile(file) then
+		if love.filesystem.getInfo(file).type == "file" then
 			table.insert(file_list,file)
 		elseif love.filesystem.isDirectory(file) then
 			recursiveEnumerate(file,file_liset)
diff --git a/main.lua b/main.lua
index a56df60..68cce38 100644
--- a/main.lua
+++ b/main.lua
@@ -2,18 +2,14 @@ require("lib.messages")
 require("lib.Color")
 assets = require("lib.cargo").init("assets")
 Gooi = require("lib.gooi")
---Object = require("lib.classic")
 Camera = require("lib.Camera")
 Input = require("lib.input")
 Physics = require("lib.windfield")
-Richtext = require("lib.richtext")
 Class = require("lib.middleclass")
-
+Names = assets.data.names
 require("lib.guiDraw")
 require("lib.util")
-
-require('globle')
-
+require("globle")
 require("lib.behavior3.b3")
 requireDirectory("lib/behavior3/core")
 requireDirectory("lib/behavior3/actions")
@@ -28,7 +24,6 @@ require("Region")
 require("Npcs")
 
 Timer = require( 'lib.Timer' )
-local ScreenManager = require( "lib/ScreenManager" )
 screens = {
     main = require( "MainScreen" ),
     new = require("NewScreen"),
@@ -71,7 +66,6 @@ function love.load( )
     input:bind("k","d-down")
     current_room = nil
     gotoRoom("MainStage","MainStage")
-    --ScreenManager.init(screens, 'main')
 end
 
 function love.update(dt)
@@ -85,9 +79,7 @@ function love.draw()
     if current_room then current_room:draw() end
     ---@param hook
     --debug.sethook(hook,"c")
-    --ScreenManager.draw()
     --debug.sethook()
-
     graphicsStats()
     --drawHook()
 end
diff --git a/objects/CreateStage.lua b/objects/CreateStage.lua
index d9b91e5..ab26f4c 100644
--- a/objects/CreateStage.lua
+++ b/objects/CreateStage.lua
@@ -3,7 +3,6 @@
 --- Created by apple.
 --- DateTime: 2018/10/15 上午12:44
 ---
-
 --- @class CreatStage : Stage
 CreateStage = Class("CreateStage",Stage)
 
@@ -20,12 +19,20 @@ local style = {
     font = font20,
 }
 
+--- @return Actor
+--- 新建侠客页面，最终角色将在游戏中运行。
+--- 1、创建模板，将不同类别的侠客，分别开，新的世界生成时，所有人物按模板新增
+--- 2、或者所有基础npc固定。新增npc，以基础npc的父母的形式新增。
+--- 3、基础演化人物之间的关系
+
 function CreateStage:init()
     self.area = Area(self)
     self.area:addPhysicsWorld()
     self.main_canvas = love.graphics.newCanvas(gw,gh)
     self.background = assets.graphics.Backgrounds.bg
     local title_font = assets.font.myfont(80)
+    --- actor base
+    self.actor = Actor:new(self.area,0,0)
     self.ui = gooi
     self.ui_group = "CreateStage"
     self.ui.newLabel({group = self.ui_group,text = "创建侠客",x = gw/3,y=gh/10})
@@ -33,28 +40,71 @@ function CreateStage:init()
     self.ui.setStyle(style)
     self.ui.desktopMode()
     self.ui.shadow()
----- no border bug
---    local font18 = assets.font.myfont(18)
-    local face_index = 1
-    local face_id = string.format("face_%03d",face_index)
-    p_print(face_id)
-    self.ui_face = self.ui.newLabel({group = self.ui_group,x = 10,y = 140,w = 48,h = 48,text = "",icon = assets.graphics.Faces[face_id]})
-    self.panel = self.ui.newPanel({x = 10, y = 200, w = 200, h = 400, layout = "grid 10x4"})
+
+    ---- face image and change
+    local face_id = 1
+    self.ui_face = self.ui.newLabel({group = self.ui_group,x = 64,y = 120,w = 48,h = 48,text = "",icon = assets.graphics.Faces[5]})
+    self.panel = self.ui.newPanel({x = 20, y = 200, w = 200, h = 400, layout = "grid 10x4"})
+    self.ui_face_label = self.ui.newLabel({group = self.ui_group,text = face_id})
     --self.panel:setStyle({bgColor = {0.208, 0.220, 0.222},fgColor = {0,0,0},font = font24 })
     self.panel:add(self.ui.newLabel({group = self.ui_group,text = "头像"}))
-    self.panel:add(self.ui.newLabel({group = self.ui_group,text = face_index}))
+    self.panel:add(self.ui_face_label)
     self.panel:add(self.ui.newButton({group = self.ui_group,text = "<-"})
-    :onRelease(
+            :onRelease(
             function()
-                face_index = face_index + 1
-                face_id = string.format("face_%03d",face_index)
+                face_id = face_id + 1
+                --face_id = string.format("face_%03d",face_index)
+                --self.ui_face:setText(face_id)
                 self.ui_face:setIcon(assets.graphics.Faces[face_id])
+                self.ui_face_label:setText(face_id)
     end))
-    self.panel:add(self.ui.newButton({group = self.ui_group,text = "->"}):setTooltip("调整名字"))
-    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "姓名"}))
-    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "悟道"}))
-    self.panel:add(self.ui.newButton({group = self.ui_group,text = "<-"}):setTooltip("调整姓氏"))
-    self.panel:add(self.ui.newButton({group = self.ui_group,text = "->"}):setTooltip("调整名字"))
+    self.panel:add(self.ui.newButton({group = self.ui_group,text = "->"})
+            :onRelease(
+            function()
+                if face_id > 1 then
+                    face_id = face_id - 1
+                end
+                --face_id = string.format("face_%03d",face_index)
+                --self.ui_face:setText(face_id)
+                self.ui_face:setIcon(assets.graphics.Faces[face_id])
+                self.ui_face_label:setText(face_id)
+            end))
+    local first_name = self.ui.newLabel({group = self.ui_group,text = "孙"})
+    local first_name_id = 1
+    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "姓氏"}))
+    self.panel:add(first_name)
+    self.panel:add(self.ui.newButton({group = self.ui_group,text = "<-"})
+            :onRelease(
+            function()
+                if first_name_id > 1 then
+                    first_name_id = first_name_id - 1
+                end
+                first_name:setText(Names[1][first_name_id])
+            end))
+    self.panel:add(self.ui.newButton({group = self.ui_group,text = "->"})
+            :onRelease(
+            function()
+                if first_name_id < #Names[1] then
+                    first_name_id = first_name_id + 1
+                end
+                first_name:setText(Names[1][first_name_id])
+            end))
+
+    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "名字"}))
+    local last_name = self.ui.newLabel({group = self.ui_group,text = "悟道"})
+    local last_name_id = 1
+    self.panel:add(last_name)
+    self.panel:add(self.ui.newButton({group = self.ui_group,text = "<-"})
+            :onRelease(
+            function()
+                local last_name_array = Names[2]
+                if last_name_id < #last_name_array then
+                    last_name_id = last_name_id + 1
+                end
+                last_name:setText(last_name_array[last_name_id])
+            end))
+    self.panel:add(self.ui.newButton({group = self.ui_group,text = "->"}))
+
     self.panel:add(self.ui.newLabel({group = self.ui_group,text = "性别"}))
     self.ui_gender = self.ui.newLabel({group = self.ui_group,text = "男"})
     self.panel:add(self.ui_gender)
@@ -84,7 +134,7 @@ function CreateStage:init()
             self.ui_age:setText(tostring(age))
         end
     end))
-    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "年龄"}))
+    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "出生"}))
     self.panel:add(self.ui.newLabel({group = self.ui_group,text = "18"}))
     self.panel:add(self.ui.newButton({group = self.ui_group,text = "<-"}))
     self.panel:add(self.ui.newButton({group = self.ui_group,text = "->"}))
@@ -113,10 +163,11 @@ end
 function CreateStage:draw()
     love.graphics.setCanvas(self.main_canvas)
     love.graphics.clear()
-    camera:attach(0,0,gw,gh)
+    --camera:attach(0,0,gw,gh)
     love.graphics.draw(self.background)
     if self.area then self.area:draw() end
-    camera:detach()
+    love.graphics.rectangleArcPanel(5,200,220,400)
+    --camera:detach()
     love.graphics.setCanvas()
 
     love.graphics.setColor(1,1,1,1)
diff --git a/objects/MainStage.lua b/objects/MainStage.lua
index a3c5db8..4a3d889 100644
--- a/objects/MainStage.lua
+++ b/objects/MainStage.lua
@@ -9,7 +9,7 @@ MainStage = Class("MainStage",Stage)
 
 --- init
 local style = {
-    font = font24,
+    font = assets.font.myfont(32),
     showBorder = true,
     bgColor = {0.208, 0.220, 0.222,0.222},
     group = "MainStage"
@@ -42,7 +42,6 @@ function MainStage:init()
                 self.ui.confirm({group = self.ui_group,text = "梦醒",okText = "是",cancelText = "否",ok = function () love.event.quit() end})
             end
     ))
-
 end
 
 function MainStage:activate()