diff --git a/sqr/SquirrelFileConfig.cfg b/sqr/SquirrelFileConfig.cfg index cb2a10a..eff823f 100644 --- a/sqr/SquirrelFileConfig.cfg +++ b/sqr/SquirrelFileConfig.cfg @@ -1,124 +1,94 @@ -<<<<<<< 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\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 -e:\Yosin&Kiwano_DOF\sqr\Core\extraCalss\Socket\Socket.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\ExtraCalss\Socket\Socket.nut -e:\Yosin&Kiwano_DOF\sqr\Core\Game_Proc\Game_Proc.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\Game_Proc\Game_Proc.nut -e:\Yosin&Kiwano_DOF\sqr\Core\InputClass\InputClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\InputClass\InputClass.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\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\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\_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\Socket\Socket.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Socket\Socket.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\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\Item\Item.nut -e:\Yosin&Kiwano_DOF\sqr\User\Asset\Item\equipment.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\Controller\Controller.nut -e:\Yosin&Kiwano_DOF\sqr\User\Controller\ObjectController.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\Object\StateMachine\StateMachineClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\StateMachine\StateMachineClass.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\Object\BaseObject.nut +l:\Yosin_Engine\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\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\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\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\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\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\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\Stage\LodingStage.nut -e:\Yosin&Kiwano_DOF\sqr\User\Stage\TestStage.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\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\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\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 +l:\Yosin_Engine\Yosin&Kiwano_DOF\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 95e69c2..e172640 100644 --- a/sqr/User/Stage/TestStage.nut +++ b/sqr/User/Stage/TestStage.nut @@ -11,21 +11,77 @@ 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 infoWindow = Sq_CreateWindow(_PersonalInfo, "个人信息窗口", 250, 60, 286, 530, 20); + // 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 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); } \ No newline at end of file