diff --git a/Yosin_Engine.exe b/Yosin_Engine.exe
index 93ab618..9b56955 100644
Binary files a/Yosin_Engine.exe and b/Yosin_Engine.exe differ
diff --git a/sqr/SquirrelFileConfig.cfg b/sqr/SquirrelFileConfig.cfg
index 029caed..820828e 100644
--- a/sqr/SquirrelFileConfig.cfg
+++ b/sqr/SquirrelFileConfig.cfg
@@ -34,6 +34,11 @@ sqr/User/Socket/Socket.nut
 
 sqr/User/Asset/AssetManager.nut
 sqr/User/Asset/FontAsset.nut
+sqr/User/Asset/Character/Animation.nut
+
+sqr/User/Asset/Item/Item.nut
+sqr/User/Asset/Item/Equipment.nut
+
 sqr/User/Object/StateMachine/StateMachineClass.nut
 
 sqr/User/Object/Object/BaseObject.nut
@@ -41,6 +46,7 @@ sqr/User/Object/Object/AnimationObject.nut
 sqr/User/Object/Map/TileObject.nut
 sqr/User/Object/Map/MapObject.nut
 
+sqr/User/Object/ActiveObject/GameObjectClass.nut
 sqr/User/Object/ActiveObject/StaticObjectClass.nut
 sqr/User/Object/ActiveObject/ActiveObjectClass.nut
 sqr/User/Object/ActiveObject/PassiveObjectClass.nut
@@ -56,5 +62,6 @@ sqr/User/Stage/TestStage.nut
 sqr/User/UI/Widget/InputBox.nut
 
 sqr/User/UI/Window/0_Login.nut
+sqr/User/UI/Window/1_Select_Character.nut
 
 sqr/User/main.nut
\ No newline at end of file
diff --git a/sqr/User/Stage/TestStage.nut b/sqr/User/Stage/TestStage.nut
index 50bfa00..efa53f5 100644
--- a/sqr/User/Stage/TestStage.nut
+++ b/sqr/User/Stage/TestStage.nut
@@ -11,23 +11,47 @@ function TestStage() {
 
 
 
-    // local Window = Sq_CreateWindow(_Login_Window, "启动界面窗口", 0, 0, 288, 512, 0);
-    // Window.ResetFocus();
+    // local Window = Sq_CreateWindow(_Login_Window, "登录界面窗口", 0, 0, 1066, 600, 0);
+
+
+    local Window = Sq_CreateWindow(_Select_Character_Window, "选择角色界面窗口", 0, 0, 1066, 600, 0);
+    local T = {
+        Background = 1
+    }
+    Window.Init(T);
 
     // local Fontobj = Font();
 
-    local MapObj = Map("map/cataclysm/town/elvengard/new_elvengard.map");
-    // local MapObj = Map("map/cataclysm/town/seria_room/elvengard.map");
-    // local MapObj = Map("map/cataclysm/town/sainthorn_heaven/sainthorn_heaven_ship_rear_down.map");
-    T.Addchild(MapObj);
+    // local MapObj = Map("map/cataclysm/town/elvengard/new_elvengard.map");
+    // // local MapObj = Map("map/cataclysm/town/seria_room/elvengard.map");
+    // // local MapObj = Map("map/cataclysm/town/sainthorn_heaven/sainthorn_heaven_ship_rear_down.map");
+    // T.Addchild(MapObj);
 
 
-    local Charc = Character();
-    Charc.coat = 601500060;
-    Charc.Init(0);
-    // Charc.InitBaseAni();
-    Charc.SetPosition(356, 430, 0);
-    Charc.SetAnimation(Charc.RestAni);
-    Charc.SetZOrder(99999999);
-    MapObj.Addchild(Charc);
+    // // local Equ = GameItem.Equipment(601500060);
+    // local Charc = GameObject.CreateCharacter(0, [601500060, 601550060, 601560058, 601570053, 601520052, 601500060, 601510059, 601530051, 601540060, 601580023]);
+    // // Charc.coat = Equ;
+    // // Charc.Init(0);
+    // // Charc.SetUpdateFunc(function(Chr, dt) {
+    // //     if (!("time" in Chr.Var)) Chr.Var.time <- 0;
+    // //     Chr.Var.time += dt;
+    // //     if (Chr.Var.time > 2000 && Chr.Var.time< 3000) {
+    // //         local Equ = GameItem.Equipment(601500060);
+    // //         Chr.ChangeEquipment(Equ);
+    // //         Chr.Var.time = 3000;
+    // //     } else if (Chr.Var.time > 4000 && Chr.Var.time< 5000) {
+    // //         local Equ = GameItem.Equipment(601500059);
+    // //         Chr.ChangeEquipment(Equ);
+    // //         Chr.Var.time = 5000;
+    // //     } else if (Chr.Var.time > 6000 && Chr.Var.time< 7000) {
+    // //         local Equ = GameItem.Equipment(601500058);
+    // //         Chr.ChangeEquipment(Equ);
+    // //         Chr.Var.time = 8000;
+    // //     }
+    // // })
+
+    // Charc.SetPosition(356, 430, 0);
+    // Charc.SetAnimation("RestAni");
+    // Charc.SetZOrder(99999999);
+    // MapObj.Addchild(Charc);
 }
\ No newline at end of file
diff --git a/sqr/User/UI/Window/0_Login.nut b/sqr/User/UI/Window/0_Login.nut
index eaf7ec8..5317c04 100644
--- a/sqr/User/UI/Window/0_Login.nut
+++ b/sqr/User/UI/Window/0_Login.nut
@@ -114,10 +114,9 @@ class _Login_Window extends Yosin_Window {
         local PasswordTextActor = FontAssetManager.GenerateNormal("密码:", sq_RGBA(200, 195, 169, 255), false);
         PasswordTextActor.SetPosition(720, 281);
         Addchild(PasswordTextActor);
-
-
     }
 
+
     //逻辑入口
     function Proc(Dt) {
         MusicLogic();
diff --git a/sqr/User/_ENUM/enum_game.nut b/sqr/User/_ENUM/enum_game.nut
index 9ea29aa..d8bff0c 100644
--- a/sqr/User/_ENUM/enum_game.nut
+++ b/sqr/User/_ENUM/enum_game.nut
@@ -30,12 +30,12 @@ enum CHARACTERJOB {
 //时装枚举类
 enum AvatarType {
     hair = "hair" //头部
-    cap = "cap" //帽子
+    hat = "hat" //帽子
     face = "face" //脸部
-    neck = "neck" //胸部
+    breast = "breast" //胸部
     coat = "coat" //上衣
     skin = "skin" //皮肤
-    belt = "belt" //腰部
+    waist = "waist" //腰部
     pants = "pants" //下装
     shoes = "shoes" //鞋子
     weapon = "weapon" //武器
diff --git a/sqr/folder-alias.json b/sqr/folder-alias.json
index 91e4a0f..1657390 100644
--- a/sqr/folder-alias.json
+++ b/sqr/folder-alias.json
@@ -142,5 +142,20 @@
     },
     "User/Asset/FontAsset.nut": {
         "description": "游戏文本资产"
+    },
+    "User/Asset/Character": {
+        "description": "角色类"
+    },
+    "User/Asset/Character/Animation.nut": {
+        "description": "角色动画"
+    },
+    "User/Asset/Item": {
+        "description": "项目类"
+    },
+    "User/Asset/Item/Equipment.nut": {
+        "description": "装备类"
+    },
+    "User/Object/ActiveObject/GameObjectClass.nut": {
+        "description": "游戏对象(对象基类)"
     }
 }
\ No newline at end of file