diff --git a/Assets/Data/UI/ui_theme.csv b/Assets/Data/UI/ui_theme.csv
index d1781758..4a82c924 100644
--- a/Assets/Data/UI/ui_theme.csv
+++ b/Assets/Data/UI/ui_theme.csv
@@ -408,4 +408,21 @@ skin,scroll_fade,Assets/UI/GUIPro/ResourcesData/Sprites/Demo/Demo_Background/Glo
skin,btn_s_green,Button/Button01_s_Green.png,Button/Button01_s_White_Light1.png,1.8,4;3;4;10,0.35,,Secondary 녹(편성 저장) + 광택
icon,plus_glyph,UI_Etc/ResourceBar_Single_Btn_Yellow2.png,,,,,,플러스 글리프(빈 자리 뱃지)
icon,check_badge,IconMisc/Icon_Check01.png,,,,,,체크(출전 중 뱃지)
+skin,btn_round03,Button/Button_Round03_Dark.png,,1,,,,로비 측면 버튼(Fable §4-1)
+skin,circle122,Button/Button_Circle122.png,,1,,,,원형 버튼 124(로비 편성·연무장 · 틴트)
+skin,tapered1,Button/Button_Tapered_White1.png,,1,,,,출정 버튼 바탕(틴트 붉은)
+skin,tapered2,Button/Button_Tapered_White2.png,,1,,,,출정 버튼 광택
+skin,lv_bar_bg,Slider/Slider_Basic01_Bg_Single.png,,2,,,,로비 진행 바 바탕
+icon,map_point,IconMisc/Icon_MapPoint.png,,,,,,로비 진행 지도 핀
+icon,tapered3,Button/Button_Tapered_White3.png,,,,,,출정 버튼 하이라이트 점
+icon,lock_s,IconMisc/Icon_Lock01_s.png,,,,,,잠금(작은)
+icon,lobby_mission,Icon_PictoIcons/128/PictoIcon_Mission.Png,,,,,,로비 임무(준비 중)
+icon,lobby_mail,Icon_PictoIcons/128/PictoIcon_Mail_1.Png,,,,,,로비 우편(준비 중)
+icon,lobby_alliance,Icon_PictoIcons/128/PictoIcon_Friends.Png,,,,,,로비 동맹(준비 중)
+icon,lobby_shop,Icon_PictoIcons/128/PictoIcon_Shop_1.Png,,,,,,로비 상점(거래 상점)
+icon,lobby_chest,Icon_PictoIcons/128/PictoIcon_Chest.Png,,,,,,로비 상자(보물 상자)
+icon,lobby_event,Icon_PictoIcons/128/PictoIcon_Calendar.Png,,,,,,로비 이벤트(준비 중)
+color,lobby_vignette,,,,,,#1E253599,로비 위 비네트(α 0.6)
+color,lobby_band,,,,,,#1E24408C,로비 아래 버튼 뒤 띠(α 0.55)
+color,alert_red,,,,,,#FF243E,알림 원(수량)
font,title,Assets/UI/GUIPro/ResourcesData/Fonts/Sen-ExtraBold.ttf,,,,,,제목·숫자(라틴 Sen · 한글 = 폴백 Malgun Gothic · PD 결정 전)
diff --git a/Assets/Resources/UI/UITheme.asset b/Assets/Resources/UI/UITheme.asset
index d4b7c0bc..db0a88d7 100644
--- a/Assets/Resources/UI/UITheme.asset
+++ b/Assets/Resources/UI/UITheme.asset
@@ -491,6 +491,12 @@ MonoBehaviour:
color: {r: 1, g: 1, b: 1, a: 0.078431375}
- id: seat_dim
color: {r: 0, g: 0, b: 0, a: 0.34901962}
+ - id: lobby_vignette
+ color: {r: 0.11764706, g: 0.14509805, b: 0.20784314, a: 0.6}
+ - id: lobby_band
+ color: {r: 0.11764706, g: 0.14117648, b: 0.2509804, a: 0.54901963}
+ - id: alert_red
+ color: {r: 1, g: 0.14117648, b: 0.24313726, a: 1}
skins:
- id: card
pack: {fileID: 21300000, guid: 3070a6f23e6ca4273897acf1b7e8c5ce, type: 3}
@@ -1143,6 +1149,41 @@ MonoBehaviour:
ppu: 1.8
inset: {x: 4, y: 3, z: 4, w: 10}
overlayAlpha: 0.35
+ - id: btn_round03
+ pack: {fileID: 21300000, guid: 13bb59864f8ee4bd0948e2f4bebb30dd, type: 3}
+ samguk: {fileID: 0}
+ overlay: {fileID: 0}
+ ppu: 1
+ inset: {x: 0, y: 0, z: 0, w: 0}
+ overlayAlpha: 1
+ - id: circle122
+ pack: {fileID: 21300000, guid: c8638447d0c4a40fd9a7e32c25783d96, type: 3}
+ samguk: {fileID: 0}
+ overlay: {fileID: 0}
+ ppu: 1
+ inset: {x: 0, y: 0, z: 0, w: 0}
+ overlayAlpha: 1
+ - id: tapered1
+ pack: {fileID: 21300000, guid: 7c529ef2aff4e4be290f9a9fc303572d, type: 3}
+ samguk: {fileID: 0}
+ overlay: {fileID: 0}
+ ppu: 1
+ inset: {x: 0, y: 0, z: 0, w: 0}
+ overlayAlpha: 1
+ - id: tapered2
+ pack: {fileID: 21300000, guid: 061d65a86429c4eafa1b8edcca19d6f0, type: 3}
+ samguk: {fileID: 0}
+ overlay: {fileID: 0}
+ ppu: 1
+ inset: {x: 0, y: 0, z: 0, w: 0}
+ overlayAlpha: 1
+ - id: lv_bar_bg
+ pack: {fileID: 21300000, guid: 6332433fb34294d58bfc835736ee8ac3, type: 3}
+ samguk: {fileID: 0}
+ overlay: {fileID: 0}
+ ppu: 2
+ inset: {x: 0, y: 0, z: 0, w: 0}
+ overlayAlpha: 1
icons:
- id: cur_gold
pack: {fileID: 21300000, guid: 6d5687fb0dd3a428d9cd26a6f36c6d78, type: 3}
@@ -1452,6 +1493,42 @@ MonoBehaviour:
pack: {fileID: 21300000, guid: 5368592eacfda44c191265e7475562df, type: 3}
samguk: {fileID: 0}
tint: {r: 1, g: 1, b: 1, a: 1}
+ - id: map_point
+ pack: {fileID: 21300000, guid: 4864baeee50764eea909c546760b7c64, type: 3}
+ samguk: {fileID: 0}
+ tint: {r: 1, g: 1, b: 1, a: 1}
+ - id: tapered3
+ pack: {fileID: 21300000, guid: 461f4fe6d783646e993c8a7f39d054eb, type: 3}
+ samguk: {fileID: 0}
+ tint: {r: 1, g: 1, b: 1, a: 1}
+ - id: lock_s
+ pack: {fileID: 21300000, guid: 7a496f5f80b1c41d59f7bd0fc631cdb7, type: 3}
+ samguk: {fileID: 0}
+ tint: {r: 1, g: 1, b: 1, a: 1}
+ - id: lobby_mission
+ pack: {fileID: 21300000, guid: 924e36c4781e44055a9d539c1160fce2, type: 3}
+ samguk: {fileID: 0}
+ tint: {r: 1, g: 1, b: 1, a: 1}
+ - id: lobby_mail
+ pack: {fileID: 21300000, guid: add005f288b2e43b7a4772c8f316c598, type: 3}
+ samguk: {fileID: 0}
+ tint: {r: 1, g: 1, b: 1, a: 1}
+ - id: lobby_alliance
+ pack: {fileID: 21300000, guid: b24f4bd4b10df44d486a526496d3215b, type: 3}
+ samguk: {fileID: 0}
+ tint: {r: 1, g: 1, b: 1, a: 1}
+ - id: lobby_shop
+ pack: {fileID: 21300000, guid: 7ac6a27f0a991414f99328df090ad855, type: 3}
+ samguk: {fileID: 0}
+ tint: {r: 1, g: 1, b: 1, a: 1}
+ - id: lobby_chest
+ pack: {fileID: 21300000, guid: 3654b5c84fc0440f786a4918b576d3bb, type: 3}
+ samguk: {fileID: 0}
+ tint: {r: 1, g: 1, b: 1, a: 1}
+ - id: lobby_event
+ pack: {fileID: 21300000, guid: c0c390b014f3f4b0781cfca1e2ebe6f0, type: 3}
+ samguk: {fileID: 0}
+ tint: {r: 1, g: 1, b: 1, a: 1}
- id: tile_bridge
pack: {fileID: 0}
samguk: {fileID: 21300000, guid: 8e5bf7eb1e300474785ff2781eeb5093, type: 3}
diff --git a/Assets/Scripts/OutGame/UI/LobbyScreen.cs b/Assets/Scripts/OutGame/UI/LobbyScreen.cs
index 633c90ca..b40ba2ce 100644
--- a/Assets/Scripts/OutGame/UI/LobbyScreen.cs
+++ b/Assets/Scripts/OutGame/UI/LobbyScreen.cs
@@ -4,23 +4,34 @@ using UnityEngine.UI;
namespace TKS.OutGame
{
///
- /// 본영 로비(img03 · 기획 S4) — 진행 칩 · 출전 편성 5인 · 중앙 큰 「출정」(→ 챕터 월드맵) · 좌 「편성」 · 우 「연무장」(PD #1093 C) · 하단 탭 5.
+ /// 본영 로비(Fable 제안서 §4-1 · PD 2026-11-09 「카피바라GO·탕탕특공대 참고 상업 수준」) — 키아트 + 위 비네트 · 진행 띠(지도 핀 · 장 이름 · 진행 바 n/m) ·
+ /// 좌우 세로 버튼 열(임무·우편·동맹 / 상점·상자·이벤트 · 미구현 = 잠금 자리) · 출전 편성 5인 · 아래 버튼 행(편성 원 · 출정 3층 · 연무장 원) + 뒤 어두운 띠 · 하단 탭 5.
+ /// 본문 좌표 = 절대 y − 224.
///
public class LobbyScreen : OutGameScreen
{
Text progress;
+ Text progressNum;
+ RectTransform progressFill;
+ Text sortieSub;
+ Text chestBadge;
RectTransform field;
+ static RectTransform At(Transform p, string name, float x, float y, float w, float h)
+ {
+ return UiKit.Rect(name, p, new Vector2(0f, 1f), new Vector2(0f, 1f), new Vector2(x, -y), new Vector2(w, h));
+ }
+
public override void Build()
{
- Header("본영", "로비", false);
- var body = Body();
+ Header("본영", "", false);
+ var outer = Body();
- // 배경 = 테마 bg_lobby(키아트 04 · 어둡게 · 신규 제작 로비 배경이 오면 치환) · 없으면 땅 색 판
+ // 배경 = 테마 bg_lobby(키아트 · 어둡게) · 없으면 땅 색 판
var art = UISkin.Icon("bg_lobby");
if (art != null)
{
- var clip = UiKit.Fill("LobbyBg", body);
+ var clip = UiKit.Fill("LobbyBg", outer);
clip.gameObject.AddComponent();
// 위쪽 맞춤 × 1.22 — 키아트 아래쪽 아군 5인은 잘라 내고(편성 5인과 겹치지 않게) 전장·적진만 보이게
var art2 = UiKit.Rect("Art", clip, new Vector2(0.5f, 1f), new Vector2(0.5f, 1f), Vector2.zero, Vector2.zero);
@@ -35,10 +46,42 @@ namespace TKS.OutGame
fit.aspectMode = AspectRatioFitter.AspectMode.WidthControlsHeight;
fit.aspectRatio = art.rect.width / Mathf.Max(1f, art.rect.height);
}
+ // 위 비네트(Glow_Panel01 = 위 불투명 → 아래 투명 · 실측) · 아래 버튼 뒤 어두운 띠
+ var vg = UiKit.Rect("Vignette", outer, new Vector2(0.5f, 1f), new Vector2(0.5f, 1f), Vector2.zero, new Vector2(0f, 180f));
+ vg.anchorMin = new Vector2(0f, 1f);
+ vg.anchorMax = new Vector2(1f, 1f);
+ vg.sizeDelta = new Vector2(0f, 180f);
+ UiKit.Skin(vg, "scroll_fade", UiKit.Col("lobby_vignette", Color.clear)).enabled = UISkin.Has("scroll_fade");
+ var body = UiKit.Rect("Mock", outer, new Vector2(0.5f, 1f), new Vector2(0.5f, 1f), Vector2.zero, new Vector2(OutGameRoot.Reference.x, OutGameRoot.BodyH));
+ var band = At(body, "BottomBand", -40f, 1236f, 1160f, 330f);
+ UiKit.Skin(band, "card", UiKit.Col("lobby_band", Color.clear));
- var chip = UiKit.Box("Progress", body, new Vector2(0.5f, 1f), new Vector2(0.5f, 1f), new Vector2(0f, -28f), new Vector2(760f, 84f), UiKit.Paper);
- UiKit.Border(chip, UiKit.Line, 2f);
- progress = UiKit.FillLabel(chip.transform, "", 34, UiKit.Ink);
+ // 진행 띠(절대 236~312) = 지도 핀 + 장 이름 + 진행 바 n/m
+ var pb = At(body, "Progress", 24f, 12f, 1032f, 76f);
+ UiKit.Skin(pb, "card", UiKit.Col("chip_dark", UiKit.Dark));
+ UiKit.DropShadow(UiKit.Icon(pb, "map_point", new Vector2(0f, 0.5f), new Vector2(0f, 0.5f), new Vector2(18f, 2f), 50f), 3f);
+ progress = UiKit.Title(UiKit.Label(pb, "", 34, UiKit.White, TextAnchor.MiddleLeft, new Vector2(0f, 0.5f), new Vector2(0f, 0.5f), new Vector2(78f, 2f), new Vector2(560f, 60f)), true);
+ progress.horizontalOverflow = HorizontalWrapMode.Overflow;
+ var bar = UiKit.Rect("Bar", pb, new Vector2(1f, 0.5f), new Vector2(1f, 0.5f), new Vector2(-104f, 0f), new Vector2(240f, 26f));
+ UiKit.Skin(bar, "lv_bar_bg", UiKit.White);
+ progressFill = UiKit.Rect("Fill", bar, new Vector2(0f, 0.5f), new Vector2(0f, 0.5f), new Vector2(4f, 0f), new Vector2(0f, 16f));
+ UiKit.Skin(progressFill, "lv_fill", UiKit.Col("lv_fill", UiKit.Coin));
+ progressNum = UiKit.Title(UiKit.Label(pb, "", 26, UiKit.White, TextAnchor.MiddleRight, new Vector2(1f, 0.5f), new Vector2(1f, 0.5f), new Vector2(-18f, 2f), new Vector2(80f, 50f)), true);
+
+ // 좌우 세로 버튼 열(166×150 · 미구현 = 잠금 자리)
+ SideButton(body, 24f, 106f, "lobby_mission", "임무", true, () => Root.ComingSoon("임무"));
+ SideButton(body, 24f, 272f, "lobby_mail", "우편", true, () => Root.ComingSoon("우편"));
+ SideButton(body, 24f, 438f, "lobby_alliance", "동맹", true, () => Root.ComingSoon("동맹", true));
+ SideButton(body, 890f, 106f, "lobby_shop", "상점", false, () => Root.Trade.OpenShop());
+ var chest = SideButton(body, 890f, 272f, "lobby_chest", "상자", false, () =>
+ {
+ Root.Show(Root.Treasures);
+ Root.Treasures.SetPage(2);
+ });
+ var cb = UiKit.Skin(UiKit.Rect("Alert", chest, new Vector2(1f, 1f), new Vector2(0.5f, 0.5f), new Vector2(-12f, -12f), new Vector2(44f, 46f)), "badge_circle", UiKit.Col("alert_red", UiKit.Red));
+ cb.preserveAspect = true;
+ chestBadge = UiKit.Title(UiKit.FillLabel(cb.transform, "", 24, UiKit.White), true);
+ SideButton(body, 890f, 438f, "lobby_event", "이벤트", true, () => Root.ComingSoon("이벤트"));
// 전장 자리 · 출전 편성 5인
var ground = UiKit.Fill("Field", body, 24f, 24f, 140f, 520f);
@@ -48,49 +91,82 @@ namespace TKS.OutGame
shadow.type = Image.Type.Simple;
field = UiKit.Fill("Lineup", ground, 20f, 20f, 40f, 40f);
- float y = 40f;
- var sortie = UiKit.Btn("Sortie", body, "", 40, UiKit.Red, UiKit.White, new Vector2(0.5f, 0f), new Vector2(0.5f, 0f), new Vector2(0f, y), new Vector2(440f, 400f), () => Root.OpenWorldMap());
- UiKit.Border(sortie.GetComponent(), new Color(0.98f, 0.86f, 0.7f), 5f);
- UiKit.LabelOf(sortie).text = "";
- var si = UiKit.Icon(sortie.transform, "btn_sortie", new Vector2(0.5f, 1f), new Vector2(0.5f, 1f), new Vector2(0f, -26f), 92f);
- if (si != null) UISkin.Stroke(si, UiKit.Stroke, 3f);
- else UiKit.Label(sortie.transform, "로비 중앙", 28, new Color(1f, 0.85f, 0.8f), TextAnchor.MiddleCenter, new Vector2(0.5f, 1f), new Vector2(0.5f, 1f), new Vector2(0f, -22f), new Vector2(400f, 50f), false);
- UiKit.Title(UiKit.Label(sortie.transform, "출정", 120, UiKit.White, TextAnchor.MiddleCenter, new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(0f, 30f), new Vector2(420f, 170f)), true);
- int stages = Root.Battle != null ? Root.Battle.Config.stages.Length : 0;
- UiKit.Title(UiKit.Label(sortie.transform, "챕터 월드맵\n" + stages + " 스테이지", 34, UiKit.White, TextAnchor.MiddleCenter, new Vector2(0.5f, 0f), new Vector2(0.5f, 0f), new Vector2(0f, 34f), new Vector2(420f, 100f), false), true);
-
- SideButton(body, "Formation", "btn_formation", "편", "편성", "출정 좌측", -1, () => Root.Show(Root.Formation));
- SideButton(body, "Arena", "btn_arena", "연", "연무장", "출정 우측", 1, () =>
+ // 아래 버튼 행(절대 1500~1740) = 편성 원 · 출정 3층 · 연무장 원
+ RoundButton(body, 160f, "btn_formation", "편성", () => Root.Show(Root.Formation));
+ RoundButton(body, 920f, "btn_arena", "연무장", () =>
{
Root.Arena.SetPage(0);
Root.Show(Root.Arena); // 연무장(PD #1093 C)
});
+ var so = At(body, "Sortie", 310f, 1290f, 460f, 160f);
+ var soImg = UiKit.Skin(so, "tapered1", UiKit.Red, true);
+ so.gameObject.AddComponent