diff --git a/Yosin_Engine.exe b/Yosin_Engine.exe index 18a3ca9..8cadcda 100644 Binary files a/Yosin_Engine.exe and b/Yosin_Engine.exe differ diff --git a/sqr/SquirrelFileConfig.cfg b/sqr/SquirrelFileConfig.cfg index 03d87b1..337fcef 100644 --- a/sqr/SquirrelFileConfig.cfg +++ b/sqr/SquirrelFileConfig.cfg @@ -25,10 +25,12 @@ sqr/Core/ExtraCalss/Socket/Socket.nut 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 +sqr/User/_ENUM/enum_packet.nut sqr/User/_ENUM/enum_game.nut sqr/User/Socket/Socket.nut @@ -60,6 +62,7 @@ sqr/User/Socket/Socket.nut sqr/User/Stage/LodingStage.nut 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 diff --git a/sqr/User/Stage/LodingStage.nut b/sqr/User/Stage/LodingStage.nut index 6998f77..bf18d77 100644 --- a/sqr/User/Stage/LodingStage.nut +++ b/sqr/User/Stage/LodingStage.nut @@ -18,6 +18,8 @@ function InitGame() { _AssetManager_(); //初始化字体 _FontAssetManager_(); + //初始化鼠标 + _IMouse_(); //进入下一个场景 TestStage(); diff --git a/sqr/User/Stage/TestStage.nut b/sqr/User/Stage/TestStage.nut index 1279595..11659de 100644 --- a/sqr/User/Stage/TestStage.nut +++ b/sqr/User/Stage/TestStage.nut @@ -11,7 +11,7 @@ function TestStage() { - // local Window = Sq_CreateWindow(_Login_Window, "登录界面窗口", 0, 0, 1066, 600, 0); + local Window = Sq_CreateWindow(_Login_Window, "登录界面窗口", 0, 0, 1066, 600, 0); @@ -51,37 +51,37 @@ function TestStage() { // MapObj.Addchild(Charc); - local Window = Sq_CreateWindow(_Select_Character_Window, "选择角色界面窗口", 0, 0, 1066, 600, 0); - local T = { - loginImg = 1, - charac = [{ - lv = 90, - name = "测试角色1", - job = 0, - equip = [101020001, 601500060, 601550060, 601560058, 601570053, 601520052, 601500060, 601510059, 601530051, 601540060, 601580023, 609590003] - }, { - lv = 90, - name = "测试角色2", - job = 0, - equip = [101020023, 601500059, 601550059, 601560057, 601570052, 601520051, 601500059, 601510058, 601530050, 601540059, 601580022, 609590003] - }, { - lv = 90, - name = "测试角色3", - job = 0, - equip = [101020026, 601500058, 601550058, 601560056, 601570051, 601520050, 601500058, 601510057, 601530049, 601540058, 601580021, 609590003] - }, { - lv = 90, - name = "测试角色4", - job = 0, - equip = [101020037, 601500061, 601550061, 601560059, 601570054, 601520053, 601500061, 601510060, 601530052, 601540061, 601580024, 609590003] - }, { - lv = 90, - name = "测试角色5", - job = 0, - equip = [601020007, 601500060, 601550060, 601560058, 601570053, 601520052, 601500060, 601510059, 601530051, 601540060, 601580023, 609590003] - }] - }; - Window.Init(T); + // local Window = Sq_CreateWindow(_Select_Character_Window, "选择角色界面窗口", 0, 0, 1066, 600, 0); + // local T = { + // loginImg = 1, + // charac = [{ + // lv = 90, + // name = "测试角色1", + // job = 0, + // equip = [101020001, 601500060, 601550060, 601560058, 601570053, 601520052, 601500060, 601510059, 601530051, 601540060, 601580023, 609590003] + // }, { + // lv = 90, + // name = "测试角色2", + // job = 0, + // equip = [101020023, 601500059, 601550059, 601560057, 601570052, 601520051, 601500059, 601510058, 601530050, 601540059, 601580022, 609590003] + // }, { + // lv = 90, + // name = "测试角色3", + // job = 0, + // equip = [101020026, 601500058, 601550058, 601560056, 601570051, 601520050, 601500058, 601510057, 601530049, 601540058, 601580021, 609590003] + // }, { + // lv = 90, + // name = "测试角色4", + // job = 0, + // equip = [101020037, 601500061, 601550061, 601560059, 601570054, 601520053, 601500061, 601510060, 601530052, 601540061, 601580024, 609590003] + // }, { + // lv = 90, + // name = "测试角色5", + // job = 0, + // equip = [601020007, 601500060, 601550060, 601560058, 601570053, 601520052, 601500060, 601510059, 601530051, 601540060, 601580023, 609590003] + // }] + // }; + // Window.Init(T); // local Actorobj = Actor(); // Actorobj.ShowBorder(true); diff --git a/sqr/User/main.nut b/sqr/User/main.nut index f3ddcf3..b17a5ae 100644 --- a/sqr/User/main.nut +++ b/sqr/User/main.nut @@ -17,6 +17,6 @@ function main(args) { Game.size = [1066, 600]; Game.v_sync = false; Game.frame_interval = 10000; - // Game.debug_mode = true; + Game.debug_mode = true; Game.Run(LoginStage); } \ No newline at end of file diff --git a/sqr/folder-alias.json b/sqr/folder-alias.json index c9a2e0e..cab437c 100644 --- a/sqr/folder-alias.json +++ b/sqr/folder-alias.json @@ -181,6 +181,11 @@ }, "User/UI/Window/2_Create_Character.nut": { "description": "创建角色" + }, + "User/UI/Widget/IMouse.nut": { + "description": "鼠标" + }, + "User/_ENUM/enum_packet.nut": { + "description": "包枚举" } - } \ No newline at end of file