diff --git a/Yosin_Engine.exe b/Yosin_Engine.exe index f2c1566..08468a6 100644 Binary files a/Yosin_Engine.exe and b/Yosin_Engine.exe differ diff --git a/ffi-8.dll b/ffi-8.dll deleted file mode 100644 index fc63a1e..0000000 Binary files a/ffi-8.dll and /dev/null differ diff --git a/sqr/Core/UI_Class/UI_Core.nut b/sqr/Core/UI_Class/UI_Core.nut index 70c66d4..8b02939 100644 --- a/sqr/Core/UI_Class/UI_Core.nut +++ b/sqr/Core/UI_Class/UI_Core.nut @@ -195,6 +195,8 @@ class Yosin_Window extends Yosin_BaseWindow { //是否为独立窗口 IsIndependent = true; + //是否为顶层窗口 + IsTop = false; //是否为图层窗口 IsLayer = false; @@ -225,14 +227,14 @@ class Yosin_Window extends Yosin_BaseWindow { this.Visible = true; //遍历全局窗口数组将自己移除重新添加在末尾 foreach(Index, WindowObj in _SYS_WINDOW_LIST_) { - WindowObj.SetZOrder(10000000 + Index); + WindowObj.SetZOrder(10000000 + Index + (WindowObj.IsTop ? 10000000 : 0)); if (WindowObj.ObjectId == this.ObjectId) { _SYS_WINDOW_LIST_.remove(Index); break; } } _SYS_WINDOW_LIST_.append(this); - SetZOrder(10000000 + _SYS_WINDOW_LIST_.len()); + SetZOrder(10000000 + _SYS_WINDOW_LIST_.len() + (IsTop ? 10000000 : 0)); } /* diff --git a/sqr/User/Stage/LodingStage.nut b/sqr/User/Stage/LodingStage.nut index d3d2587..1e6555d 100644 --- a/sqr/User/Stage/LodingStage.nut +++ b/sqr/User/Stage/LodingStage.nut @@ -23,6 +23,8 @@ function InitGame() { _IMouse_(); //初始化控制器 _GameController_(); + //初始化顶部工具条UI + Sq_CreateWindow(_Top_tool, "窗口顶部工具条", 208, 0, 650, 20, 0); //预加载 Animation("ui/charactercreate/dust.ani"); diff --git a/sqr/User/Stage/TestStage.nut b/sqr/User/Stage/TestStage.nut index 960865a..b4b752b 100644 --- a/sqr/User/Stage/TestStage.nut +++ b/sqr/User/Stage/TestStage.nut @@ -10,59 +10,71 @@ function TestStage() { T.Enter(); - // local Window = Sq_CreateWindow(_Login_Window, "登录界面窗口", 0, 0, 1066, 600, 0); + // //大背景 + // local BackGround = CL_SpriteObject("sprite/interface2/charactercreatever2/characterbackground.img", 14); + // T.Addchild(BackGround); + + // //登录按钮文本 + // local TextActor = TextActor(0, { + // color = sq_RGBA(186, 147, 97, 255) + // }); + // TextActor.SetText("测试文字"); + // TextActor.SetPosition(200, 200); + // TextActor.SetZOrder(1000000); + // TextActor.SetOutline(); + // T.Addchild(TextActor); // local Fontobj = Font(); - local TownObj = Town(2); + // local TownObj = Town(1); - // local MapObj = Map("map/cataclysm/town/seria_room/elvengard.map"); - // // local MapObj = Map("map/cataclysm/town/hendonmyre/new_backstreet_2.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/hendonmyre/new_backstreet_2.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 = 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); + // 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); - // 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 = "倾泪寒倾泪寒倾泪寒倾泪寒倾泪寒倾泪寒倾泪寒倾泪寒倾泪寒倾泪寒倾泪寒", + 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] + }, { + lv = 90, + name = "测试角色2号", + 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 247335d..b17a5ae 100644 --- a/sqr/User/main.nut +++ b/sqr/User/main.nut @@ -10,6 +10,7 @@ function main(args) { + local Game = GameWindow(); Game.title = "Yosin & Kiwano"; Game.bg_color = [255.0, 255.0, 255.0, 255.0];