Merge remote-tracking branch 'origin/dong' into yi

# Conflicts:
#	sqr/Core/UI_Class/UI_Widget.nut
#	sqr/SquirrelFileConfig.cfg
#	sqr/User/Stage/LodingStage.nut
#	sqr/User/Stage/TestStage.nut
#	sqr/User/UI/Window/2_Create_Character.nut
#	sqr/User/UI/Window/4_PersonalInfo.nut
#	sqr/folder-alias.json

sqr/BBBSquirrelFileConfig.cfg

@@ -1,79 +1,79 @@
-sqr/Core/ENUM/ENUM_KEY.nut
-sqr/Core/ENUM/enum_system.nut
-sqr/Core/BaseTool/BaseTool.nut
-sqr/Core/BaseTool/Math.nut
-sqr/Core/BaseTool/String.nut
-sqr/Core/BaseTool/BlobExClass.nut
-sqr/Core/BaseTool/JsonClass/JsonClass.nut
-sqr/Core/BaseTool/JsonClass/Json.nut
-sqr/Core/BaseClass/ScriptManager/ScriptManager.nut
-sqr/Core/BaseClass/ScriptManager/InitAni.nut
-sqr/Core/BaseClass/Game_Window_Class.nut
-sqr/Core/BaseClass/BaseObject.nut
-sqr/Core/BaseClass/AudioClass.nut
-sqr/Core/BaseClass/StageClass.nut
-sqr/Core/BaseClass/ActorObject.nut
-sqr/Core/BaseClass/LayerObject.nut
-sqr/Core/BaseClass/UserStorage.nut
-sqr/Core/BaseClass/SpriteObject/SpriteFrameClass.nut
-sqr/Core/BaseClass/SpriteObject/SpriteClass.nut
-sqr/Core/BaseClass/TextObject/Font.nut
-sqr/Core/BaseClass/TextObject/TextActor.nut
-sqr/Core/BaseClass/AnimationClass/AnimationClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\eNUM\eNUM_KeY.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\eNUM\enum_system.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BaseTool.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\Math.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\String.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BlobexClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\JsonClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\Json.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\ScriptManager.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\InitAni.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\Game_Window_Class.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\BaseObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AudioClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\StageClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ActorObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\LayerObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\UserStorage.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteFrameClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\Font.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\TextActor.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AnimationClass\AnimationClass.nut
 
-sqr/Core/ExtraCalss/Socket/Socket.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\extraCalss\Socket\Socket.nut
 
-sqr/Core/Game_Proc/Game_Proc.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\Game_Proc\Game_Proc.nut
 
-sqr/Core/UI_Class/UI_Cursor.nut
-sqr/Core/UI_Class/UI_Core.nut
-sqr/Core/UI_Class/UI_Widget.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Cursor.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Core.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Widget.nut
 
 
-sqr/User/_ENUM/global_object.nut
-sqr/User/_ENUM/enum_music.nut
-sqr/User/_ENUM/enum_packet.nut
-sqr/User/_ENUM/enum_game.nut
+e:\Yosin&Kiwano_DOF\sqr\User\_eNUM\global_object.nut
+e:\Yosin&Kiwano_DOF\sqr\User\_eNUM\enum_music.nut
+e:\Yosin&Kiwano_DOF\sqr\User\_eNUM\enum_packet.nut
+e:\Yosin&Kiwano_DOF\sqr\User\_eNUM\enum_game.nut
 
-sqr/User/Socket/Socket.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Socket\Socket.nut
 
-sqr/User/Asset/AssetManager.nut
-sqr/User/Asset/FontAsset.nut
-sqr/User/Asset/Character/Animation.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\AssetManager.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\FontAsset.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\Character\Animation.nut
 
-sqr/User/Asset/Item/Item.nut
-sqr/User/Asset/Item/Equipment.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\Item\Item.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\Item\equipment.nut
 
-sqr/User/Object/StateMachine/StateMachineClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\StateMachine\StateMachineClass.nut
 
-sqr/User/Object/Object/BaseObject.nut
-sqr/User/Object/Object/AnimationObject.nut
-sqr/User/Object/Map/TileObject.nut
-sqr/User/Object/Map/MapObject.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\Object\BaseObject.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\Object\AnimationObject.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\Map\TileObject.nut
+e:\Yosin&Kiwano_DOF\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
-sqr/User/Object/ActiveObject/MonsterObjectClass.nut
-sqr/User/Object/ActiveObject/CharacterObjectClass.nut
-sqr/User/Object/ActiveObject/CharacterObjectClass_AI.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\GameObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\StaticObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\ActiveObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\PassiveObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\MonsterObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\CharacterObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\CharacterObjectClass_AI.nut
 
-sqr/User/Socket/Socket.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Socket\Socket.nut
 
-sqr/User/Stage/LodingStage.nut
-sqr/User/Stage/TestStage.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Stage\LodingStage.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Stage\TestStage.nut
 
-sqr/User/UI/Widget/IMouse.nut
-sqr/User/UI/Widget/InputBox.nut
-sqr/User/UI/Widget/Drag_Button.nut
-sqr/User/UI/Widget/Scroll_Bar.nut
-sqr/User/UI/Widget/Text_Button.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\IMouse.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\InputBox.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Drag_Button.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Scroll_Bar.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Text_Button.nut
 
-sqr/User/UI/Window/0_Login.nut
-sqr/User/UI/Window/1_Select_Character.nut
-sqr/User/UI/Window/2_create_Character.nut
-sqr/User/UI/Window/233_HUD_Message.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\0_Login.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\1_Select_Character.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\2_create_Character.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\233_HUD_Message.nut
 
 
-sqr/User/main.nut
+e:\Yosin&Kiwano_DOF\sqr\User\main.nut 

sqr/Core/BaseClass/BaseObject.nut

@@ -142,6 +142,15 @@ class CL_BaseObject {
     function GetSize() {
         return BaseObject_GetSize(this.C_Object);
     }
+    //获取右侧的坐标
+    function right() {
+        return X + GetSize().w;
+    }
+
+    //获取底部的坐标
+    function bottom() {
+        return Y + GetSize().h;
+    }
     //获取缩放后的大小
     function GetScaledSize() {
         return BaseObject_GetScaledSize(this.C_Object);

sqr/Core/UI_Class/UI_Core.nut

@@ -144,6 +144,22 @@ class Yosin_BaseWindow extends Layer {
         base.SetVisible(Flag);
     }
 
+    /*
+     * @函数作用: 获取窗口右侧的坐标
+     */
+    function right() {
+        return X + Width;
+    }
+
+    /*
+     * @函数作用: 获取窗口底部的坐标
+     */
+    function bottom() {
+        return Y + Height;
+    }
+
+
+
     /*
      * @函数作用: 添加子对象
      * @参数 name

sqr/Core/UI_Class/UI_Widget.nut

@@ -279,8 +279,6 @@ class Yosin_NineBoxStretch extends Yosin_CommonUi {
 }
 
 
-
-
 //拼接按钮
 class Yosin_SplicingButton extends Yosin_CommonUi {
     //按钮状态
@@ -358,63 +356,6 @@ class Yosin_SplicingButton extends Yosin_CommonUi {
 }
 
 
-
-
-// 窗口顶部标题
-class Yosin_TopTitle extends Yosin_CommonUi {
-
-    constructor(W, H, title, drawBackground = true) {
-        base.constructor(0, 0, W, H);
-
-        //内容背景
-        if (drawBackground) {
-            local background = Yosin_NineBoxStretch(-1, 15, W + 1, H - 15, "sprite/interface/lenheartwindowcommon.img", 97);
-            AddUIChild(background);
-        }
-
-        // 标题背景
-        local Background = Yosin_EmeStretch(0, 0, W, 22, "sprite/interface/lenheartwindowcommon.img", 609);
-        Addchild(Background);
-
-        // 标题亮色背景
-        local BackgroundBright = CL_SpriteObject("sprite/interface/lenheartwindowcommon.img", 483);
-        local scaleW = (W / BackgroundBright.GetSize().w).tofloat();
-        BackgroundBright.SetScale(scaleW, 1);
-        BackgroundBright.SetPosition(0, 1);
-        Addchild(BackgroundBright);
-
-
-        // 标题
-        local titleTextActor = FontAssetManager.GenerateNormal(title, true, {
-            color = sq_RGBA(206, 189, 140, 255)
-        });
-        local titleX = W / 2 - titleTextActor.GetSize().w / 2;
-        // 绘制标题
-        titleTextActor.SetPosition(titleX, 2);
-        Addchild(titleTextActor);
-
-        local closeBtn = Yosin_BaseButton(W - 20, 4, 12, 12, "sprite/interface/lenheartwindowcommon.img", 544);
-        closeBtn.DownSimulateOffset = false;
-        closeBtn.OnClick = function(btn) {
-
-        }
-        AddUIChild(closeBtn);
-
-        local topBtn = Yosin_BaseButton(W - 40, 2, 13, 13, "sprite/interface/lenheartwindowcommon.img", 455);
-        topBtn.DownSimulateOffset = false;
-        topBtn.OnClick = function(btn) {
-
-        }
-        AddUIChild(topBtn);
-
-    }
-
-
-
-}
-
-
-
 // 标题按钮
 class titleButton extends Yosin_BaseButton {
 
@@ -431,15 +372,15 @@ class titleButton extends Yosin_BaseButton {
         cacheY = Y;
         DownSimulateOffset = false;
 
-        local backText = FontAssetManager.GenerateNormal(title, true, {
+        local backText = FontAssetManager.GenerateNormal( title , true, {
             color = sq_RGBA(130, 114, 84, 255)
         });
         backText.SetUpdateFunc(function(Text, Dt) {
-            if (select == cacheSelect) return;
+            if (select ==  cacheSelect) return;
             if (select) {
-                Text.SetFillColor(sq_RGBA(187, 176, 149, 255));
+                Text.SetFillColor(sq_RGBA(187,176,149, 255));
             } else {
-                Text.SetFillColor(sq_RGBA(130, 114, 84, 255));
+                Text.SetFillColor(sq_RGBA(130,114,84, 255));
             }
             cacheSelect = select;
         })
@@ -453,10 +394,10 @@ class titleButton extends Yosin_BaseButton {
         //状态更改 刷新精灵帧
         if (State != SpriteState) {
             if (State == 2) {
-                Y -= 1;
+                Y = cacheY - 1;
                 SyncPos(X, Y);
             } else if (SpriteState == 2) {
-                Y += 1;
+                Y = cacheY;
                 SyncPos(X, Y);
             }
             SpriteState = State;
@@ -534,30 +475,30 @@ class Yosin_StretchTitleButton extends Yosin_CommonUi {
         AddUIChild(SpriteList[2]);
 
         // 文字
-        titleText = FontAssetManager.GenerateNormal(title, true, {
+        titleText = FontAssetManager.GenerateNormal( title , true, {
             color = sq_RGBA(130, 114, 84, 255)
         });
         titleText.SetUpdateFunc(function(Text, Dt) {
-            if (select == cacheSelect) return;
+            if (select ==  cacheSelect) return;
             if (select) {
-                Text.SetFillColor(sq_RGBA(187, 176, 149, 255));
+                Text.SetFillColor(sq_RGBA(187,176,149, 255));
             } else {
-                Text.SetFillColor(sq_RGBA(130, 114, 84, 255));
+                Text.SetFillColor(sq_RGBA(130,114,84, 255));
             }
             cacheSelect = select;
         })
 
-        titleText.SetPosition(W / 2 - titleText.GetSize().w / 2, 2);
+        titleText.SetPosition(W / 2 - titleText.GetSize().w/ 2, 2);
         Addchild(titleText);
 
     }
 
     // 设置为选中状态
     function SetSelect(select) {
-        if (select) {
+        if (select){
             State = 2;
             ChangeFrame();
-        } else {
+        }else{
             State = 0;
             ChangeFrame();
         }
@@ -569,12 +510,12 @@ class Yosin_StretchTitleButton extends Yosin_CommonUi {
         if (State != uiState) {
             if (State == 2) {
                 SyncPos(X, cecheY - 1);
-            } else {
+            }else{
                 SyncPos(X, cecheY);
             }
             uiState = State;
 
-            for (local i = 0; i< SpriteList.len(); i++) {
+            for (local i = 0; i < SpriteList.len(); i++) {
                 SpriteList[i].SetVisible(i == uiState);
             }
         }
@@ -585,7 +526,7 @@ class Yosin_StretchTitleButton extends Yosin_CommonUi {
 
         //按下
         if (isLBDown) {
-            if (LBDownOnClick != null) {
+            if (LBDownOnClick!= null) {
                 LBDownOnClick(this);
             }
             State = 2;
@@ -611,29 +552,29 @@ class Yosin_RowMoreTitleBtn extends Yosin_CommonUi {
     btns = null;
     tests = null;
 
-    constructor(X, Y, titles, selectIndex = 0, baseWidth = 34, path = "sprite/interface/lenheartwindowcommon.img", idx = 160) {
+    constructor(X, Y, titles, path, idx, selectIndex = 0, baseWidth = 34) {
         this.tests = titles;
         btns = [];
         local btnX = 0;
-        for (local i = 0; i< titles.len(); i++) {
+        for(local i = 0; i < titles.len(); i++) {
 
             local textW = FontAssetManager.GenerateNormal(titles[i], true).GetSize().w + 10;
             local btnW = baseWidth + 10;
-            btnW = textW > btnW ? textW : btnW;
+            btnW = textW > btnW ? textW : btnW ;
 
             local titleBtn = Yosin_StretchTitleButton(btnX, 1, btnW, 19, path, idx, titles[i]);
             titleBtn.index = i;
 
-            titleBtn.LBDownOnClick = function(btn) {
+            titleBtn.LBDownOnClick = function (btn) {
                 btn.Parent.LBDownOnClick(this, btn.index);
 
-                for (local i = 0; i< btn.Parent.btns.len(); i++) {
+                for (local i = 0; i < btn.Parent.btns.len(); i++) {
                     btn.Parent.btns[i].SetSelect(false);
-                    btn.Parent.btns[i].titleText.SetFillColor(sq_RGBA(130, 114, 84, 255));
+                    btn.Parent.btns[i].titleText.SetFillColor(sq_RGBA(130,114,84, 255));
                 }
 
                 btn.SetSelect(true);
-                btn.Parent.btns[btn.index].titleText.SetFillColor(sq_RGBA(187, 176, 149, 255));
+                btn.Parent.btns[btn.index].titleText.SetFillColor(sq_RGBA(187,176,149, 255));
 
             };
 
@@ -643,7 +584,7 @@ class Yosin_RowMoreTitleBtn extends Yosin_CommonUi {
 
         base.constructor(X, Y, btnX, 21);
 
-        for (local i = 0; i< btns.len(); i++) {
+        for (local i = 0; i < btns.len(); i++) {
             AddUIChild(btns[i]);
         }
 
@@ -651,4 +592,24 @@ class Yosin_RowMoreTitleBtn extends Yosin_CommonUi {
 
     }
 
-}
+}
+
+
+// 进度显示
+class Yosin_Schedule extends Yosin_CommonUi {
+
+    constructor(X, Y, W, H, path, idx) {
+        base.constructor(X, Y, W, H);
+
+        local schedule = CL_SpriteObject("sprite/interface/lenheartwindowcommon.img", 164);
+        schedule.SetPosition(0, 0);
+
+        AddUIChild(schedule);
+
+        local scheduleBar = CL_SpriteObject("sprite/interface/lenheartwindowcommon.img", 165);
+        scheduleBar.SetPosition(1, 1);
+        AddUIChild(scheduleBar);
+
+    }
+
+}

sqr/SquirrelFileConfig.cfg

@@ -1,94 +1,124 @@
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\ENUM\ENUM_KEY.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\ENUM\enum_system.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BaseTool.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\Math.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\String.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BlobExClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\JsonClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\Json.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\ScriptManager.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\InitAni.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\Game_Window_Class.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\BaseObject.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AudioClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\StageClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ActorObject.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\LayerObject.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\UserStorage.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\CanvasObject.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteFrameClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\Font.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\TextActor.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AnimationClass\AnimationClass.nut
+<<<<<<< HEAD
+e:\Yosin&Kiwano_DOF\sqr\Core\eNUM\eNUM_KeY.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\eNUM\enum_system.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BaseTool.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\Math.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\String.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BlobexClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\JsonClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\Json.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\ScriptManager.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\InitAni.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\Game_Window_Class.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\BaseObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AudioClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\StageClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ActorObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\LayerObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\UserStorage.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteFrameClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\Font.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\TextActor.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AnimationClass\AnimationClass.nut
+=======
+e:\Yosin&Kiwano_DOF\sqr\Core\ENUM\ENUM_KEY.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\ENUM\enum_system.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BaseTool.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\Math.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\String.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BlobExClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\JsonClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\Json.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\ScriptManager.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\InitAni.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\Game_Window_Class.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\BaseObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AudioClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\StageClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ActorObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\LayerObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\UserStorage.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\CanvasObject.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteFrameClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\Font.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\TextActor.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AnimationClass\AnimationClass.nut
+>>>>>>> origin/dong
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\ExtraCalss\Socket\Socket.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\extraCalss\Socket\Socket.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\Game_Proc\Game_Proc.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\Game_Proc\Game_Proc.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\InputClass\InputClass.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\InputClass\InputClass.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Cursor.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Core.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Widget.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Cursor.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Core.nut
+e:\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Widget.nut
 
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\_ENUM\global_object.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\_ENUM\enum_music.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\_ENUM\enum_packet.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\_ENUM\enum_game.nut
+e:\Yosin&Kiwano_DOF\sqr\User\_eNUM\global_object.nut
+e:\Yosin&Kiwano_DOF\sqr\User\_eNUM\enum_music.nut
+e:\Yosin&Kiwano_DOF\sqr\User\_eNUM\enum_packet.nut
+e:\Yosin&Kiwano_DOF\sqr\User\_eNUM\enum_game.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Socket\Socket.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Socket\Socket.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\AssetManager.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\FontAsset.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\Character\Animation.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\AssetManager.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\FontAsset.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\Character\Animation.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\Item\Item.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\Item\Equipment.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\Item\Item.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Asset\Item\equipment.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Controller\Controller.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Controller\ObjectController.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Controller\Controller.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Controller\ObjectController.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\StateMachine\StateMachineClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\StateMachine\StateMachineClass.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Object\BaseObject.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Object\AnimationObject.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\Object\BaseObject.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\Object\AnimationObject.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Map\TileObject.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Map\MapCamera.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Map\TownObject.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Map\MapObject.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\Map\TileObject.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\Map\MapCamera.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\Map\TownObject.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\Map\MapObject.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\GameObjectClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\StaticObjectClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\ActiveObjectClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\PassiveObjectClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\MonsterObjectClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\NpcObjectClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\CharacterObjectClass.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\CharacterObjectClass_AI.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\GameObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\StaticObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\ActiveObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\PassiveObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\MonsterObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\NpcObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\CharacterObjectClass.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\CharacterObjectClass_AI.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Socket\Socket.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Socket\Packet.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Socket\FunctionalPack.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Socket\Socket.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Socket\Packet.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Socket\FunctionalPack.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Stage\LodingStage.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Stage\TestStage.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Stage\LodingStage.nut
+e:\Yosin&Kiwano_DOF\sqr\User\Stage\TestStage.nut
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\IMouse.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\InputBox.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Drag_Button.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Scroll_Bar.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Text_Button.nut
-
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\0_Login.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\1_Select_Character.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\2_create_Character.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\3_Top_tool.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\4_PersonalInfo.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\5_Inventory.nut
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\233_HUD_Message.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\IMouse.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\InputBox.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Drag_Button.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Scroll_Bar.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Text_Button.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Top_Title.nut
 
 
-l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\main.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\0_Login.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\1_Select_Character.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\2_create_Character.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\3_Top_tool.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\4_PersonalInfo.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\5_Inventory\5_Inventory.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\5_Inventory\Inventory_EquipmentPage.nut
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\5_Inventory\ItemCollect.nut
+
+e:\Yosin&Kiwano_DOF\sqr\User\UI\Window\233_HUD_Message.nut
+
+
+e:\Yosin&Kiwano_DOF\sqr\User\main.nut 

sqr/User/Stage/TestStage.nut

@@ -11,77 +11,21 @@ function TestStage() {
 
 
     // local Window = Sq_CreateWindow(_Login_Window, "登录界面窗口", 0, 0, 1066, 600, 0);
+    // local Window = Sq_CreateWindow(_Select_Character_Window, "选择角色窗口", 0, 0, 1066, 600, 0);
+    // local Window = Sq_CreateWindow(_CreateCharacter, "创建角色界面窗口", 0, 0, 1066, 600, 0);
 
 
-    local Equ = GameItem.Equipment(27675);
-    local Window = Equ.GetEquipmentInfoWindow();
-    Window.SetPosition(300, 80);
-    Window.ResetFocus();
-
-
-    // local Window = Sq_CreateWindow(_Inventory, "背包窗口", 150, 12, 257, 555, 20);
-    // //大背景
-    // local BackGround = CL_SpriteObject("sprite/map/npc/2019_halloween_blossom_normal.img", 0);
-    // BackGround.SetPosition(300, 150);
-    // BackGround.SetOutline(true);
-    // T.Addchild(BackGround);
-
-
-    // local Fontobj = Font();
-    // local NPCobj = GameObject.NPC(2);
-    // NPCobj.SetPosition(400, 400, 0);
-    // T.Addchild(NPCobj);
-
     // local TownObj = Town(1);
     // local Charc = GameObject.CreateCharacter(0, [101590007, 27675, 601500060, 601550060, 601560058, 601570053, 601520052, 601500060, 601510059, 601530051, 601540060, 601580023]);
+    // Charc.SetPosition(356, 250, 0);
+    // Charc.SetAnimation("RestAni");
     // TownObj.AddObject(Charc, true);
-    // ClientCharacter = Charc;
 
 
-    // local Window = Sq_CreateWindow(_Select_Character_Window, "选择角色界面窗口", 0, 0, 1066, 600, 0);
-    // local T = {
-    //     loginImg = 1,
-    //     charac = [{
-    //         lv = 90,
-    //         name = "倾泪寒",
-    //         job = 0,
-    //         equip = [101020001, 601500060, 601550060, 601560058, 601570053, 601520052, 601500060, 601510059, 601530051, 601540060, 601580023, 609590003]
-    //     }, {
-    //         lv = 90,
-    //         name = "倾泪寒222",
-    //         job = 0,
-    //         equip = [101020023, 601500059, 601550059, 601560057, 601570052, 601520051, 601500059, 601510058, 601530050, 601540059, 601580022, 609590003]
-    //     }, {
-    //         lv = 90,
-    //         name = "Kina",
-    //         job = 0,
-    //         equip = [101020026, 601500058, 601550058, 601560056, 601570051, 601520050, 601500058, 601510057, 601530049, 601540058, 601580021, 609590003]
-    //     }, {
-    //         lv = 90,
-    //         name = "测试角色",
-    //         job = 0,
-    //         equip = [101020037, 601500061, 601550061, 601560059, 601570054, 601520053, 601500061, 601510060, 601530052, 601540061, 601580024, 609590003]
-    //     }]
-    // };
-    // Window.Init(T);
+    // local infoWindow = Sq_CreateWindow(_PersonalInfo, "个人信息窗口", 250, 60, 286, 530, 20);
 
+    local Window = Sq_CreateWindow(_Inventory, "背包窗口", 150, 12, 259, 555, 20);
+    // Window.SetScale(0.92, 0.92);
 
-    // local Actorobj = Actor();
-    // Actorobj.ShowBorder(true);
-    // Actorobj.SetSize(1500, 100);
-    // local Name = FontAssetManager.GenerateNormal("是的呢参加考试你打", true, {
-    //     color = sq_RGBA(209, 185, 148, 255),
-    //     alignment = TextAlign.Center,
-    //     wrap_width = 50
-    // });
-    // Name.ShowBorder(true);
-    // Name.SetSize(1500, 100);
-    // Name.SetPosition(200, 200);
-    // Actorobj.Addchild(Name);
-    // T.Addchild(Actorobj);
-
-    // print(ObjectCount);
-
-    // Sq_CreateWindow(_CreateCharacter, "创建角色界面窗口", 0, 0, 1066, 600, 0);
 
 }

sqr/User/UI/Widget/Top_Title.nut

@@ -0,0 +1,59 @@
+/*
+文件名:Top_Title.nut
+路径:User/UI/Widget/Top_Title.nut
+创建日期:2025-01-06	14:00
+文件用途: 窗口顶部标题
+*/
+
+// 窗口顶部标题
+class Yosin_TopTitle extends Yosin_CommonUi {
+
+    constructor(W, H, title, drawBackground = true) {
+        base.constructor(0, 0, W, H);
+
+        //内容背景
+        if (drawBackground){
+            local background = Yosin_NineBoxStretch(-1, 15, W + 1, H - 15, "sprite/interface/lenheartwindowcommon.img", 97);
+            AddUIChild(background);
+        }
+
+        // 标题背景
+        local Background = Yosin_EmeStretch(0, 0, W, 22, "sprite/interface/lenheartwindowcommon.img", 609);
+        Addchild(Background);
+
+        // 标题亮色背景
+        local BackgroundBright = CL_SpriteObject("sprite/interface/lenheartwindowcommon.img", 483);
+        local scaleW = (W / BackgroundBright.GetSize().w).tofloat();
+        BackgroundBright.SetScale( scaleW , 1);
+        BackgroundBright.SetPosition(0, 1);
+        Addchild(BackgroundBright);
+
+
+        // 标题
+        local titleTextActor = FontAssetManager.GenerateNormal(title, true, {
+            color = sq_RGBA(206, 189, 140, 255)
+        });
+        local titleX = W / 2 - titleTextActor.GetSize().w / 2;
+        // 绘制标题
+        titleTextActor.SetPosition(titleX, 2);
+        Addchild(titleTextActor);
+
+        local closeBtn = Yosin_BaseButton(W - 20, 4, 12, 12, "sprite/interface/lenheartwindowcommon.img", 544);
+        closeBtn.DownSimulateOffset = false;
+        closeBtn.OnClick = function(btn) {
+
+        }
+        AddUIChild(closeBtn);
+
+        local topBtn = Yosin_BaseButton(W - 40, 2, 13, 13, "sprite/interface/lenheartwindowcommon.img", 455);
+        topBtn.DownSimulateOffset = false;
+        topBtn.OnClick = function(btn) {
+
+        }
+        AddUIChild(topBtn);
+
+    }
+
+
+
+}

sqr/User/UI/Window/233_HUD_Message.nut

@@ -73,7 +73,7 @@ class _Yosin_MessageBox extends Yosin_Window {
 
     function RegisterWidget() {
         //背景
-        local background = Yosin_NineBoxStretch(-1, 15, cacheW + 2, cacheH, "sprite/interface/lenheartwindowcommon.img", 97);
+        local background = Yosin_NineBoxStretch(-1, 15, cacheW + 1, cacheH, "sprite/interface/lenheartwindowcommon.img", 97);
         AddUIChild(background);
         local twoBackground = Yosin_NineBoxStretch(4, 20, cacheW - 8, cacheH - 36, "sprite/interface/lenheartwindowcommon.img", 97);
         AddUIChild(twoBackground);
@@ -82,6 +82,11 @@ class _Yosin_MessageBox extends Yosin_Window {
         local titleBackground = Yosin_EmeStretch(0, 0, cacheW, 20, "sprite/interface/lenheartwindowcommon.img", 609);
         AddUIChild(titleBackground);
 
+        local BackgroundBright = CL_SpriteObject("sprite/interface/lenheartwindowcommon.img", 483);
+        local scaleW = (cacheW / BackgroundBright.GetSize().w).tofloat();
+        BackgroundBright.SetScale( scaleW , 1);
+        Addchild(BackgroundBright);
+
         //确认按钮
         local confirmButton = Yosin_BaseButton(cacheW / 2 - 28, cacheH - 15, 56, 24 "sprite/interface/lenheartwindowcommon.img", 12);
         confirmButton.OnClick = function(Button) {

sqr/User/UI/Window/4_PersonalInfo.nut

@@ -5,13 +5,11 @@
 文件用途: 个人信息
 */
 
-// 个人信息 250, 60, 286, 530
+// local infoWindow = Sq_CreateWindow(_PersonalInfo, "个人信息窗口", 250, 60, 286, 530, 20);
+// todo 图和尺寸比例都需要修改
+// todo Yosin_Window 和 Yosin_CommonUi 会有性能开销需要检查
 class _PersonalInfo extends Yosin_Window {
 
-    roleTitleBtn = null;
-    dressUpTitleBtn = null;
-    stoneTitleBtn = null;
-
 
     constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH) {
         base.constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH);
@@ -24,42 +22,19 @@ class _PersonalInfo extends Yosin_Window {
     }
 
     function RegisterWidget() {
-        // 角色按钮
-        roleTitleBtn = titleButton(10, 25, 40, 19, "sprite/interface/lenheartwindowcommon.img", 82, "角色");
-        AddUIChild(roleTitleBtn);
-        // 装扮/宠物按钮
-        dressUpTitleBtn = titleButton(roleTitleBtn.right() + 1, 25, 71, 19, "sprite/interface/lenheartwindowcommon.img", 86, "装扮/宠物");
-        AddUIChild(dressUpTitleBtn);
-        // 护石按钮
-        stoneTitleBtn = titleButton(dressUpTitleBtn.right() + 1, 25, 40, 19, "sprite/interface/lenheartwindowcommon.img", 82, "护石");
-        AddUIChild(stoneTitleBtn);
-
-        roleTitleBtn.LBDownOnClick = function (btn) {
-            titleClick(btn);
-        }.bindenv(this);
-        dressUpTitleBtn.LBDownOnClick = function (btn) {
-            titleClick(btn);
-        }.bindenv(this);
-        stoneTitleBtn.LBDownOnClick = function (btn) {
-            titleClick(btn);
-        }.bindenv(this);
 
+        // 标题按钮
+        local titlesBtn = Yosin_RowMoreTitleBtn(10, 25, ["角色", "装扮/宠物", "护石"],"sprite/interface/lenheartwindowcommon.img", 160);
+        AddUIChild(titlesBtn);
 
+        titlesBtn.LBDownOnClick = function(btns, index) {
+        };
 
         // 角色信息
-        local roleInfo = roleInfo("个人角色信息", roleTitleBtn.X, roleTitleBtn.bottom() + 2 );
+        local roleInfo = roleInfo("个人角色信息", 10, titlesBtn.bottom() + 2 );
         AddUIChild(roleInfo);
-
-
-
     }
 
-    function titleClick(btn) {
-        btn.Parent.roleTitleBtn.select = false;
-        btn.Parent.dressUpTitleBtn.select = false;
-        btn.Parent.stoneTitleBtn.select = false;
-        btn.select = true;
-    }
 
 
     //逻辑入口
@@ -113,7 +88,7 @@ class roleInfo extends Yosin_Window {
         equipmentBackground.SetPosition(7.5, 8);
         Addchild(equipmentBackground);
 
-        // 中间装备背景
+        // 结婚戒指槽位
         local centerBackground = CL_SpriteObject("sprite/interface2/profile/profile.img", 77);
         centerBackground.SetPosition( 124 , 10);
         Addchild(centerBackground);
@@ -145,7 +120,7 @@ class roleInfo extends Yosin_Window {
     }
 
 
-
+    // 属性
     function RegisterPropertyItems() {
         // 属性
 

sqr/User/UI/Window/5_Inventory/5_Inventory.nut

@@ -0,0 +1,46 @@
+/*
+文件名:5_Inventory.nut
+路径:User/UI/Window/5_Inventory/5_Inventory.nut
+创建日期:2025-01-06	14:06
+文件用途: 背包窗口
+*/
+
+//local Window = Sq_CreateWindow(_Inventory, "背包窗口", 150, 12, 259, 555, 20);
+class _Inventory extends Yosin_Window {
+
+    constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH) {
+        base.constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH);
+
+        local title = Yosin_TopTitle(gWidth, gHeight, "装备栏(I)");
+        Addchild(title);
+
+        //注册控件
+        RegisterWidget();
+    }
+
+    function RegisterWidget() {
+
+        //标题按钮
+        local titlesBtn = Yosin_RowMoreTitleBtn(10, 25, ["物品栏", "装扮", "宠物", "护石"],"sprite/interface/lenheartwindowcommon.img", 160);
+        AddUIChild(titlesBtn);
+
+        titlesBtn.LBDownOnClick = function(btns, index) {
+            print(index);
+        };
+
+        //物品栏 装备页
+        local equipmentPage = Inventory_EquipmentPage( 0, titlesBtn.bottom() + 4, 300, Height - titlesBtn.bottom() - 4);
+        // local inventoryItem = InventoryItem( 0, titlesBtn.bottom() + 4, 300, 100);
+        AddUIChild(equipmentPage);
+
+
+    }
+
+    //逻辑入口
+    function Proc(Dt) {
+        SyncPos(X, Y);
+        base.Proc(Dt);
+    }
+
+}
+

sqr/User/UI/Window/5_Inventory/Inventory_EquipmentPage.nut

@@ -0,0 +1,131 @@
+
+/*
+文件名:Inventory_EquipmentPage.nut
+路径:User/UI/Window/5_Inventory/Inventory_EquipmentPage.nut
+创建日期:2025-01-06	13:50
+文件用途: 背包装备页面
+*/
+
+// 背包装备页面
+class Inventory_EquipmentPage extends Yosin_CommonUi{
+
+    constructor(x, y, w, h) {
+        base.constructor(x, y, w, h);
+
+
+        // 人物装备
+        local charactersEquipment = Inventory_CharactersEquipment(0, 0);
+        AddUIChild(charactersEquipment);
+
+        // 物品栏
+        local item = InventoryItem(0, charactersEquipment.bottom(), Width, Height - charactersEquipment.bottom());
+        AddUIChild(item);
+
+    }
+
+}
+
+
+
+// 上半部分 人物装备穿戴
+class Inventory_CharactersEquipment extends Yosin_CommonUi{
+
+    // 展示其他装备
+    showOtherEquipment = null;
+    // 允许更换装备
+    allowChangeEquipment = null;
+
+    constructor(x, y) {
+        local w = 248;
+        local h = 179;
+        base.constructor(x, y, w, h);
+
+        showOtherEquipment = true;
+        allowChangeEquipment = true;
+
+        RegisterBackground();
+    }
+
+    // 背景
+    function RegisterBackground() {
+        // 背景图
+        local bgimg = CL_SpriteObject("sprite/interface/newstyle/windows/inventory/inventorybackground.img", 0);
+        bgimg.SetPosition(0, 0);
+        Addchild(bgimg);
+
+
+        // 装备栏背景
+        local equipmentBackground = CL_SpriteObject("sprite/interface/newstyle/windows/inventory/inventory.img", 21);
+        equipmentBackground.SetPosition( 5, 5);
+        Addchild(equipmentBackground);
+
+
+        // 顶部光线
+        local topLight = CL_SpriteObject("sprite/interface/newstyle/windows/inventory/inventory.img", 178);
+        topLight.SetPosition( Width / 2 - topLight.GetSize().w/2, 0);
+        Addchild(topLight);
+
+        // todo 角色展示
+
+        // 结婚戒指槽位
+        local ringSlotBg = CL_SpriteObject("sprite/interface/newstyle/windows/inventory/inventory_cn.img", 0);
+        ringSlotBg.SetPosition( Width / 2 - ringSlotBg.GetSize().w/2, 5);
+        Addchild(ringSlotBg);
+
+        // 首饰
+        if (showOtherEquipment){
+            // 辅助装备
+            local assist = CL_SpriteObject("sprite/interface/newstyle/windows/inventory/inventory.img", 19);
+            assist.SetPosition(179, 69);
+            Addchild(assist);
+
+            // 耳环
+            local earrings = CL_SpriteObject("sprite/interface/newstyle/windows/inventory/inventory.img", 122);
+            earrings.SetPosition(179, 102);
+            Addchild(earrings);
+
+            // 魔法石
+            local MagicStone = CL_SpriteObject("sprite/interface/newstyle/windows/inventory/inventory.img", 20);
+            MagicStone.SetPosition(211, 101);
+            Addchild(MagicStone);
+
+        }
+    }
+
+
+}
+
+
+
+
+
+// 物品栏
+class InventoryItem extends Yosin_CommonUi {
+
+    constructor(gX, gY, gWidth, gHeight) {
+        base.constructor(gX, gY, gWidth, gHeight);
+
+        //物品分类按钮
+        local itemBtns = Yosin_RowMoreTitleBtn(10, 4, ["装备", "消耗品", "材料", "任务"], "sprite/interface/lenheartwindowcommon.img", 160);
+        AddUIChild(itemBtns);
+
+        itemBtns.LBDownOnClick = function(btns, index) {
+            print(index);
+        };
+
+
+        // 物品栏
+        local itemCollection = itemCollection(5, itemBtns.bottom(), 247, 244, 7, 8);
+        AddUIChild(itemCollection);
+
+        // 重量
+        local weight = FontAssetManager.GenerateNormal("重量", true, {
+            color = sq_RGBA(160, 132, 75, 255)
+        });
+        weight.SetPosition(itemCollection.X + 8, itemCollection.bottom() - 25);
+        Addchild(weight);
+    }
+
+}
+
+

sqr/User/UI/Window/5_Inventory/ItemCollect.nut

@@ -0,0 +1,96 @@
+/*
+文件名:ItemCollect.nut
+路径:User/UI/Window/5_Inventory/ItemCollect.nut
+创建日期:2025-01-06	13:50
+文件用途: 物品栏
+*/
+
+
+
+// 物品栏
+class itemCollection extends Yosin_CommonUi{
+
+    // 行
+    column = null;
+    // 列
+    row = null;
+    items = null;
+
+    // 悬浮时显示的框
+    rect = null;
+
+    columnNum = null;
+    rowNum = null;
+
+    constructor(x, y, w, h, columnNum,rowNum ) {
+        base.constructor(x, y, w, h);
+        this.columnNum = columnNum;
+        this.rowNum = rowNum;
+
+        items = [];
+
+        local background = Yosin_NineBoxStretch(-3, -3, w + 6, h + 6, "sprite/interface/lenheartwindowcommon.img", 97);
+        AddUIChild(background);
+
+
+
+        local itemX = 4;
+        local itemY = 3;
+        for (local i =  0; i < columnNum; i++) {
+            local cells = [];
+            for (local i =  0; i < rowNum; i++) {
+                local bg = CL_SpriteObject("sprite/interface/newstyle/windows/inventory/inventory.img", 49);
+                bg.SetPosition(itemX, itemY);
+                Addchild(bg);
+
+                itemX += 30;
+                cells.push(bg);
+
+            }
+            items.push(cells);
+            itemX = 3;
+            itemY += 30;
+        }
+
+
+        rect = CL_SpriteObject("sprite/interface/newstyle/windows/inventory/inventory.img", 131);
+        rect.SetVisible(false);
+        Addchild(rect);
+
+    }
+
+
+    //override
+    //鼠标事件回调
+    function OnMouseProc(MousePos_X, MousePos_Y) {
+        base.OnMouseProc(MousePos_X, MousePos_Y);
+
+        if (isInRect){
+            local WorldPosition = this.GetWorldPosition();
+            local xx = MousePos_X - WorldPosition.x;
+            local yy = MousePos_Y - WorldPosition.y;
+            local column = (yy / 30).tointeger();
+            local row = (xx / 30).tointeger();
+
+
+            local inRadius = column < columnNum && row < rowNum;
+            local change = column != this.column || row != this.row;
+            // 移动到另一个槽
+            if ( change && inRadius) {
+
+                this.column = column;
+                this.row = row;
+
+                rect.SetVisible(true);
+                rect.SetPosition( row * 30, column * 30);
+
+            }
+
+        }else{
+            this.column = null;
+            this.row = null;
+            rect.SetVisible(false);
+        }
+    }
+
+}

sqr/folder-alias.json

@@ -248,6 +248,18 @@
     "User/UI/Window/4_PersonalInfo.nut": {
         "description": "个人信息窗口"
     },
+    "User/UI/Window/5_Inventory/5_Inventory.nut": {
+        "description": "背包窗口"
+    },
+    "User/UI/Window/5_Inventory/Inventory_EquipmentPage.nut": {
+        "description": "背包装备页面"
+    },
+    "User/UI/Window/5_Inventory/ItemCollect.nut": {
+        "description": "物品栏"
+    },
+    "User/UI/Widget/Top_Title.nut": {
+        "description": "窗口顶部标题"
+    }, 
     "User/Socket/Packet.nut": {
         "description": "数据包类"
     },