diff --git a/Assets/Data/UI/ui_theme.csv b/Assets/Data/UI/ui_theme.csv index edd393bc..4103d300 100644 --- a/Assets/Data/UI/ui_theme.csv +++ b/Assets/Data/UI/ui_theme.csv @@ -473,7 +473,7 @@ skin,card3_inner,Frame/CardFrame03_n_InnerBg.png,,1,,,,상자 카드 안쪽 skin,card3_light,Frame/CardFrame03_n_Light.png,,1,,,,상자 카드 광택 color,card3_inner,,,,,,#00000040,상자 카드 안쪽(검정 25 %) color,card3_light,,,,,,#FFFFFF80,상자 카드 광택(흰 50 %) -color,chest_glow,,,,,,#FFD24AE6,상자 뒤 빛(그림 가운데 α 0.5 × 0.9) +color,chest_glow,,,,,,#FFF6D0FF,상자 뒤 빛(흰 금 · 금 상자 카드 위에서도 보이게 · 검수2 결함 4) skin,banner_point,Frame/BannerFrame05_Single.png,,3,,,,상자 포인트 띠(h90 · 장식 비율 유지) color,banner_point,,,,,,#FFFFFF,상자 포인트 띠(그림 원색 · 왼쪽 어두운 칸 + 사선) skin,bar4_bg,Slider/Slider_Basic04_Bg.png,,1.5,,,,가는 진행 바 바탕 @@ -495,3 +495,6 @@ color,skill_glow,,,,,,#FFD24AFF,스킬 버튼 뒤 빛(사용 가능 · 금빛 · icon,shield,IconMisc/Icon_Shield.png,,,,,,방어 스탯(Fable §5-8) color,popup_band,,,,,,#1F2138,팝업 제목 띠(공용 · 스테이지 팝업 통일 · 검수 결함 6) skin,btn_green,Button/Button01_s_Green.png,,1.22,,,,Secondary 녹 h100(광고 보기 · btn_sky 와 같은 비율) +color,stage_pattern,,,,,,#FFFFFF0D,상자 탭 무대 문양(흰 5 % · 검수2 결함 4) +color,chest_select,,,,,,#FFFFFF,상자 행 선택 테두리(흰 · 금 틀과 구분 · 검수2 결함 5) +color,chest_dim,,,,,,#00000040,상자 행 비선택 어둡게(25 %) diff --git a/Assets/Resources/UI/UITheme.asset b/Assets/Resources/UI/UITheme.asset index 95ae38bd..211c2298 100644 --- a/Assets/Resources/UI/UITheme.asset +++ b/Assets/Resources/UI/UITheme.asset @@ -562,7 +562,7 @@ MonoBehaviour: - id: card3_light color: {r: 1, g: 1, b: 1, a: 0.5019608} - id: chest_glow - color: {r: 1, g: 0.8235294, b: 0.2901961, a: 0.9019608} + color: {r: 1, g: 0.9647059, b: 0.8156863, a: 1} - id: banner_point color: {r: 1, g: 1, b: 1, a: 1} - id: arena_art @@ -571,6 +571,12 @@ MonoBehaviour: color: {r: 1, g: 0.8235294, b: 0.2901961, a: 1} - id: popup_band color: {r: 0.12156863, g: 0.12941177, b: 0.21960784, a: 1} + - id: stage_pattern + color: {r: 1, g: 1, b: 1, a: 0.050980393} + - id: chest_select + color: {r: 1, g: 1, b: 1, a: 1} + - id: chest_dim + color: {r: 0, g: 0, b: 0, a: 0.2509804} skins: - id: card pack: {fileID: 21300000, guid: 3070a6f23e6ca4273897acf1b7e8c5ce, type: 3} diff --git a/Assets/Scripts/OutGame/Arena/ArenaScreen.cs b/Assets/Scripts/OutGame/Arena/ArenaScreen.cs index 3f867cf8..be3afd8b 100644 --- a/Assets/Scripts/OutGame/Arena/ArenaScreen.cs +++ b/Assets/Scripts/OutGame/Arena/ArenaScreen.cs @@ -140,7 +140,7 @@ namespace TKS.OutGame new[] { "gear_flag", "cur_shard" }, new[] { "chest_general" }, }; - static readonly string[] EntryIcons = { "cur_ticket", null, "sword", "fire" }; + static readonly string[] EntryIcons = { "cur_ticket", "lobby_event", "sword", "fire" }; /// /// 모드 카드(Fable 제안서 §4-6 · #1104) = CardFrame04 카드색 + 리본 제목(유지) · 위 일러 자리(픽토그램 220 흰 25 %) + 요약 한 줄 · @@ -190,12 +190,9 @@ namespace TKS.OutGame rt.rectTransform.offsetMin = new Vector2(rt.rectTransform.offsetMin.x, 16f); if (i == 3) { - var ev = UiKit.Icon(card, "badge_hot", new Vector2(1f, 1f), new Vector2(0.5f, 0.5f), new Vector2(-30f, -118f), 96f); - if (ev != null) - { - UiKit.DropShadow(ev, 3f); - UiKit.Title(UiKit.FillLabel(ev.transform, "이벤트", 22, UiKit.White), true); - } + // 「이벤트」 = 카드 안 오른쪽 위 꼬리 칩(카드 밖 돌출 0 · 검수2 결함 7) + var ev = UiKit.Skin(UiKit.Rect("Event", card, new Vector2(1f, 1f), new Vector2(1f, 1f), new Vector2(-20f, -102f), new Vector2(120f, 44f)), "tail", UiKit.Col("tail_red", UiKit.Red)); + UiKit.Title(UiKit.FillLabel(ev.transform, "이벤트", 22, UiKit.White), true); } var info = UiKit.Rect("Info", card, new Vector2(0f, 1f), new Vector2(0.5f, 0.5f), new Vector2(46f, -122f), new Vector2(60f, 60f)); UiKit.Skin(info, "badge_circle", UiKit.Col("chip_dark", UiKit.Dark), true); diff --git a/Assets/Scripts/OutGame/Domestic/DomesticScreen.cs b/Assets/Scripts/OutGame/Domestic/DomesticScreen.cs index 2d80a683..6183aaf9 100644 --- a/Assets/Scripts/OutGame/Domestic/DomesticScreen.cs +++ b/Assets/Scripts/OutGame/Domestic/DomesticScreen.cs @@ -295,7 +295,7 @@ namespace TKS.OutGame float cap = PatrolRules.CapHours(db, d); float h = PatrolRules.Hours(db, d, S.Now); var soft = UiKit.Col("text_soft", UiKit.InkSoft); - const float W = 1032f, Fw = W - 12f, GaugeBar = 640f; + const float W = 1032f, Fw = W - 12f, GaugeBar = 800f; // ① 순찰 RectTransform ar; @@ -308,9 +308,9 @@ namespace TKS.OutGame UiKit.SetGauge(fill, cap > 0f ? h / cap : 0f, GaugeBar); badge.text = Mathf.FloorToInt(h) + "h"; badge.fontSize = 30; - var cur = UiKit.Title(UiKit.Label(a, FormatHours(h) + " / " + FormatHours(cap), 30, UiKit.White, TextAnchor.MiddleRight, new Vector2(1f, 1f), new Vector2(1f, 1f), new Vector2(-24f, -84f), new Vector2(220f, 60f)), true); + var cur = UiKit.Title(UiKit.Label(a, FormatHours(h) + " / " + FormatHours(cap), 30, UiKit.White, TextAnchor.MiddleLeft, new Vector2(0f, 1f), new Vector2(0f, 1f), new Vector2(24f, -164f), new Vector2(260f, 52f)), true); cur.horizontalOverflow = HorizontalWrapMode.Overflow; - UiKit.Label(a, "최대 " + FormatHours(cap) + " · 성장 패스 24시간(준비 중) · 농업 개발 +" + Mathf.RoundToInt(DevRules.Mod(db, d, DevRules.PatrolCap)) + "분", 24, soft, TextAnchor.MiddleLeft, new Vector2(0f, 1f), new Vector2(0f, 1f), new Vector2(24f, -168f), new Vector2(Fw - 48f, 44f), false); + UiKit.Label(a, "성장 패스 24시간(준비 중) · 농업 개발 +" + Mathf.RoundToInt(DevRules.Mod(db, d, DevRules.PatrolCap)) + "분", 24, soft, TextAnchor.MiddleLeft, new Vector2(1f, 1f), new Vector2(1f, 1f), new Vector2(-24f, -168f), new Vector2(Fw - 320f, 44f), false).alignment = TextAnchor.MiddleRight; // ② 시간당 수확 RectTransform br; diff --git a/Assets/Scripts/OutGame/Treasure/TreasureScreen.cs b/Assets/Scripts/OutGame/Treasure/TreasureScreen.cs index f4ce342b..da956838 100644 --- a/Assets/Scripts/OutGame/Treasure/TreasureScreen.cs +++ b/Assets/Scripts/OutGame/Treasure/TreasureScreen.cs @@ -15,6 +15,7 @@ namespace TKS.OutGame int page; int chestIdx; + bool chestPicked; readonly List