woniu
/
DOF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dong' of http://192.168.200.25:3000/woniu/DOF into dong 

# Conflicts:
#	sqr/Core/UI_Class/UI_Widget.nut
#	sqr/User/UI/Window/5_Inventory.nut
#	sqr/folder-alias.json
This commit is contained in:
Lenheart 2025-01-04 23:42:21 +08:00
parent 9e7cce285a b52f6126d2
commit 35421c3ba6
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sqr/Core/UI_Class/UI_Widget.nut
View File

@ -161,24 +161,32 @@ class Yosin_EmeStretch extends Yosin_CommonUi {
//横向 //横向
if (Direction) { if (Direction) {
//获取中间部分的宽度
local ScaleW = (W - SpriteList[0].GetSize().w - SpriteList[2].GetSize().w); local ScaleW = (W - SpriteList[0].GetSize().w - SpriteList[2].GetSize().w);
//计算缩放比例
local ScaleRate = ScaleW / SpriteList[1].GetSize().w; local ScaleRate = ScaleW / SpriteList[1].GetSize().w;
local ScaleRateH = H / SpriteList[1].GetSize().h;
//设置位置和缩放 SpriteList[1].SetPosition(SpriteList[0].GetSize().w, -30);
SpriteList[1].SetPosition(SpriteList[0].GetSize().w, 0);
SpriteList[1].SetScale(ScaleRate, 1.0); SpriteList[1].SetScale(ScaleRate, ScaleRateH);
SpriteList[2].SetPosition(SpriteList[0].GetSize().w + ScaleW, 0); SpriteList[2].SetPosition(SpriteList[0].GetSize().w + ScaleW, 0);
if (H != SpriteList[1].GetSize().h) {
SpriteList[0].SetScale(1, ScaleRateH);
SpriteList[2].SetScale(1, ScaleRateH);
}
} }
//纵向 //纵向
else { else {
local ScaleH = (H - SpriteList[0].GetSize().h - SpriteList[2].GetSize().h); local ScaleH = (H - SpriteList[0].GetSize().h - SpriteList[2].GetSize().h);
local ScaleRate = ScaleH / SpriteList[1].GetSize().h; local ScaleRate = ScaleH / SpriteList[1].GetSize().h;
local ScaleRateW = H / SpriteList[1].GetSize().w;
SpriteList[1].SetPosition(0, SpriteList[0].GetSize().h); SpriteList[1].SetPosition(0, SpriteList[0].GetSize().h);
SpriteList[1].SetScale(1.0, ScaleRate); SpriteList[1].SetScale(ScaleRateW, ScaleRate);
SpriteList[2].SetPosition(0, SpriteList[0].GetSize().h + ScaleH); SpriteList[2].SetPosition(0, SpriteList[0].GetSize().h + ScaleH);
if (W != SpriteList[1].GetSize().w) {
SpriteList[0].SetScale(ScaleRateW, ScaleRateH);
SpriteList[2].SetScale(ScaleRateW, ScaleRateH);
}
} }
foreach(Child in SpriteList) { foreach(Child in SpriteList) {

4
sqr/User/UI/Window/5_Inventory.nut
View File

@ -15,8 +15,8 @@ class _Inventory extends Yosin_Window {
constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH) { constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH) {
base.constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH); base.constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH);
local title = Yosin_TopTitle(gWidth, gHeight, "装备栏(I)"); // local title = Yosin_TopTitle(gWidth, gHeight, "装备栏(I)");
AddUIChild(title); // AddUIChild(title);
local item2 = Yosin_EmeStretch(100, 100, 80, 25, "sprite/interface/lenheartwindowcommon.img", 160); local item2 = Yosin_EmeStretch(100, 100, 80, 25, "sprite/interface/lenheartwindowcommon.img", 160);
Addchild(item2); Addchild(item2);