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

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

@ -161,24 +161,32 @@ class Yosin_EmeStretch extends Yosin_CommonUi {
//横向
if (Direction) {
//获取中间部分的宽度
local ScaleW = (W - SpriteList[0].GetSize().w - SpriteList[2].GetSize().w);
//计算缩放比例
local ScaleRate = ScaleW / SpriteList[1].GetSize().w;
local ScaleRateH = H / SpriteList[1].GetSize().h;
//设置位置和缩放
SpriteList[1].SetPosition(SpriteList[0].GetSize().w, 0);
SpriteList[1].SetPosition(SpriteList[0].GetSize().w, -30);
SpriteList[1].SetScale(ScaleRate, 1.0);
SpriteList[1].SetScale(ScaleRate, ScaleRateH);
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 {
local ScaleH = (H - SpriteList[0].GetSize().h - SpriteList[2].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].SetScale(1.0, ScaleRate);
SpriteList[1].SetScale(ScaleRateW, ScaleRate);
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) {
@ -370,7 +378,7 @@ class Yosin_TopTitle extends Yosin_CommonUi {
base.constructor(0, 0, W, H);
//内容背景
if (drawBackground) {
if (drawBackground){
local background = Yosin_NineBoxStretch(-1, 15, W + 1, H - 15, "sprite/interface/lenheartwindowcommon.img", 97);
AddUIChild(background);
}
@ -382,7 +390,7 @@ class Yosin_TopTitle extends Yosin_CommonUi {
// 标题亮色背景
local BackgroundBright = CL_SpriteObject("sprite/interface/lenheartwindowcommon.img", 483);
local scaleW = (W / BackgroundBright.GetSize().w).tofloat();
BackgroundBright.SetScale(scaleW, 1);
BackgroundBright.SetScale( scaleW , 1);
Addchild(BackgroundBright);
@ -433,15 +441,15 @@ class titleButton extends Yosin_BaseButton {
cacheY = Y;
DownSimulateOffset = false;
local backText = FontAssetManager.GenerateNormal(title, true, {
local backText = FontAssetManager.GenerateNormal( title , true, {
color = sq_RGBA(130, 114, 84, 255)
});
backText.SetUpdateFunc(function(Text, Dt) {
if (select == cacheSelect) return;
if (select == cacheSelect) return;
if (select) {
Text.SetFillColor(sq_RGBA(187, 176, 149, 255));
Text.SetFillColor(sq_RGBA(187,176,149, 255));
} else {
Text.SetFillColor(sq_RGBA(130, 114, 84, 255));
Text.SetFillColor(sq_RGBA(130,114,84, 255));
}
cacheSelect = select;
})
@ -508,18 +516,18 @@ class Yosin_StretchTitleButton extends Yosin_SplicingButton {
titleText = null;
constructor(X, Y, W, H, Path, Idx, title, ) {
constructor(X, Y, W, H, Path, Idx, title,) {
base.constructor(X, Y, W, H, Path, Idx, true, false)
titleText = FontAssetManager.GenerateNormal(title, true, {
titleText = FontAssetManager.GenerateNormal( title , true, {
color = sq_RGBA(130, 114, 84, 255)
});
titleText.SetUpdateFunc(function(Text, Dt) {
if (select == cacheSelect) return;
if (select == cacheSelect) return;
if (select) {
Text.SetFillColor(sq_RGBA(187, 176, 149, 255));
Text.SetFillColor(sq_RGBA(187,176,149, 255));
} else {
Text.SetFillColor(sq_RGBA(130, 114, 84, 255));
Text.SetFillColor(sq_RGBA(130,114,84, 255));
}
cacheSelect = select;
})
@ -532,7 +540,7 @@ class Yosin_StretchTitleButton extends Yosin_SplicingButton {
function Proc(Dt) {
if (select) return;
if (State != 3 && isLBDown) {
if (State != 3 && isLBDown) {
State = 2;
select = true;
if (LBDownOnClick != null) {
@ -563,25 +571,25 @@ class Yosin_RowMoreTitleBtn extends Yosin_CommonUi {
constructor(X, Y, titles, baseWidth = 44, path = "sprite/interface/lenheartwindowcommon.img", idx = 160) {
this.tests = titles;
local btnX = 0;
for (local i = 0; i< titles.len(); i++) {
for(local i = 0; i < titles.len(); i++) {
local textW = FontAssetManager.GenerateNormal(titles[i], true).GetSize().w + 20;
local btnW = baseWidth + 20;
btnW = textW > btnW ? textW : btnW;
btnW = textW > btnW ? textW : btnW ;
local titleBtn = Yosin_StretchTitleButton(btnX, 1, btnW, 19, path, idx, titles[i]);
titleBtn.index = i;
titleBtn.LBDownOnClick = function(btn) {
titleBtn.LBDownOnClick = function (btn) {
btn.Parent.LBDownOnClick(this, btn.index);
for (local i = 0; i< btn.Parent.btns.len(); i++) {
for (local i = 0; i < btn.Parent.btns.len(); i++) {
btn.Parent.btns[i].select = false;
btn.Parent.btns[i].titleText.SetFillColor(sq_RGBA(130, 114, 84, 255));
btn.Parent.btns[i].titleText.SetFillColor(sq_RGBA(130,114,84, 255));
}
btn.select = true;
btn.Parent.btns[btn.index].titleText.SetFillColor(sq_RGBA(187, 176, 149, 255));
btn.Parent.btns[btn.index].titleText.SetFillColor(sq_RGBA(187,176,149, 255));
};
@ -591,10 +599,10 @@ class Yosin_RowMoreTitleBtn extends Yosin_CommonUi {
base.constructor(X, Y, btnX, 21);
for (local i = 0; i< btns.len(); i++) {
for (local i = 0; i < btns.len(); i++) {
AddUIChild(btns[i]);
}
}
}
}

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) {
base.constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH);
local title = Yosin_TopTitle(gWidth, gHeight, "装备栏(I)");
AddUIChild(title);
// local title = Yosin_TopTitle(gWidth, gHeight, "装备栏(I)");
// AddUIChild(title);
local item2 = Yosin_EmeStretch(100, 100, 80, 25, "sprite/interface/lenheartwindowcommon.img", 160);
Addchild(item2);