diff --git a/Yosin_Engine.exe b/Yosin_Engine.exe index f89ff1f..5b382d1 100644 Binary files a/Yosin_Engine.exe and b/Yosin_Engine.exe differ diff --git a/sqr/Core/BaseClass/CanvasObject.nut b/sqr/Core/BaseClass/CanvasObject.nut index 5340ebf..69388b8 100644 --- a/sqr/Core/BaseClass/CanvasObject.nut +++ b/sqr/Core/BaseClass/CanvasObject.nut @@ -63,11 +63,17 @@ class CL_CanvasObject extends CL_BaseObject { } //绘制演员 - function DrawActor(Actor, XPos, YPos) { + function DrawActor(Actor, XPos = 0, YPos = 0) { if (!Context) error("请先刷新上下文"); Canvas_DrawActor(this.C_Object, Context, Actor.C_Object, XPos, YPos); } + //绘制精灵 + function DrawSprite(Actor, XPos = 0, YPos = 0) { + if (!Context) error("请先刷新上下文"); + Canvas_DrawSprite(this.C_Object, Context, Actor.C_Object, XPos, YPos); + } + //绘制精灵帧 function DrawSpriteFrame(SpriteFrame, XPos, YPos, Width = null, Height = null) { if (!Context) error("请先刷新上下文"); diff --git a/sqr/Core/UI_Class/UI_Widget.nut b/sqr/Core/UI_Class/UI_Widget.nut index 9f71c3f..2479a10 100644 --- a/sqr/Core/UI_Class/UI_Widget.nut +++ b/sqr/Core/UI_Class/UI_Widget.nut @@ -621,17 +621,4 @@ class Yosin_Schedule extends Yosin_CommonUi { BarSprite.SetCropRect(BarSprite.X, BarSprite.Y, barW, barSize.h); BarSprite.SetSize(barW, barSize.h); } -} - - -if (!getroottable().rawin("chongzaiflag")) { - getroottable()["chongzaiflag"] <- true; -} else { - //遍历窗口队列 如果可见则调用Show - for (local i = 0; i< _SYS_WINDOW_LIST_.len(); i++) { - local Window = _SYS_WINDOW_LIST_[i]; - Window.Visible = false; - Window.RemoveSelf(); - } - TestStage(); } \ No newline at end of file diff --git a/sqr/User/Asset/Item/Equipment.nut b/sqr/User/Asset/Item/Equipment.nut index fecece5..63f90c8 100644 --- a/sqr/User/Asset/Item/Equipment.nut +++ b/sqr/User/Asset/Item/Equipment.nut @@ -60,6 +60,15 @@ class GameItem.EquipmentInfo extends Yosin_Window { local IconFrame = CL_SpriteFrameObject("sprite/item/iconmark.img", 62 + RarityFrameColorIdx[Equipment.Rarity]); Canvas.DrawSpriteFrame(IconFrame, 7, 7); + + //是否封装 + local IsPackage = Equipment.Property ? Equipment.Property.IsPackage : 1; + if (IsPackage && (Equipment.Rarity == 2 || Equipment.Rarity == 3)) { + local IconFrame = CL_SpriteObject("sprite/item/iconmark.img", 46); + IconFrame.SetMode(0); + IconFrame.SetPosition(8, 6); + Canvas.DrawSprite(IconFrame); + } } //绘制装备名称 @@ -108,12 +117,12 @@ class GameItem.EquipmentInfo extends Yosin_Window { }); Canvas.DrawActor(MinUseLevelText, 210 - MinUseLevelText.GetSize().w - 6, 57); - //绘制是否封装 如果有主体属性读取 否则一律为封装 - local IsPackage = Equipment.Property ? Equipment.Property.IsPackage : 0; - local IsPackageText = FontAssetManager.GenerateNormal(TradeTypeText[IsPackage], false, { - color = TradeTypeColor[IsPackage] + //绘制交易类型 如果有主体属性读取 否则一律为封装 + local TradeType = Equipment.Property ? Equipment.Property.TradeType : 0; + local TradeTypeText = FontAssetManager.GenerateNormal(TradeTypeText[TradeType], false, { + color = TradeTypeColor[TradeType] }); - Canvas.DrawActor(IsPackageText, 210 - IsPackageText.GetSize().w - 6, 73); + Canvas.DrawActor(TradeTypeText, 210 - TradeTypeText.GetSize().w - 6, 73); //绘制装备类型 local GroupNameText = FontAssetManager.GenerateNormal(GameItem.EquipmentInfoTag.item_group_name_table[Equipment.GroupName], false, { diff --git a/sqr/User/Stage/TestStage.nut b/sqr/User/Stage/TestStage.nut index 1503c09..2fbbc89 100644 --- a/sqr/User/Stage/TestStage.nut +++ b/sqr/User/Stage/TestStage.nut @@ -14,22 +14,22 @@ function TestStage() { - // local Equ = GameItem.Equipment(27675); - // local Window = Equ.GetEquipmentInfoWindow(); - // Window.SetPosition(100, 80); - // Window.ResetFocus(); + local Equ = GameItem.Equipment(27675); + local Window = Equ.GetEquipmentInfoWindow(); + Window.SetPosition(100, 80); + Window.ResetFocus(); - // local Equ = GameItem.Equipment(101020048); - // local Window = Equ.GetEquipmentInfoWindow(); - // Window.SetPosition(350, 80); - // Window.ResetFocus(); + local Equ = GameItem.Equipment(101020048); + local Window = Equ.GetEquipmentInfoWindow(); + Window.SetPosition(350, 80); + Window.ResetFocus(); - // local Equ = GameItem.Equipment(24144); - // local Window = Equ.GetEquipmentInfoWindow(); - // Window.SetPosition(580, 80); - // Window.ResetFocus(); + local Equ = GameItem.Equipment(24144); + local Window = Equ.GetEquipmentInfoWindow(); + Window.SetPosition(580, 80); + Window.ResetFocus(); - local Window = Sq_CreateWindow(_Inventory, "背包窗口", 150, 12, 257, 555, 20); + // local Window = Sq_CreateWindow(_Inventory, "背包窗口", 150, 12, 257, 555, 20); // local Window = Sq_CreateWindow(_Inventory, "背包窗口", 150, 12, 257, 555, 20); // //大背景