diff --git a/Assets/Resources/Net.meta b/Assets/Resources/Net.meta
new file mode 100644
index 00000000..0630760a
--- /dev/null
+++ b/Assets/Resources/Net.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5666a6162d2ef964a9bb7244113f1908
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Net/server.csv b/Assets/Resources/Net/server.csv
new file mode 100644
index 00000000..abca7819
--- /dev/null
+++ b/Assets/Resources/Net/server.csv
@@ -0,0 +1,9 @@
+key,value
+enabled,0
+base_url,http://127.0.0.1:8080
+game_id,1
+timeout_sec,10
+retry,2
+reconcile_delay_sec,1
+wait_notice_sec,0.6
+cache_file,save_server.json
diff --git a/Assets/Resources/Net/server.csv.meta b/Assets/Resources/Net/server.csv.meta
new file mode 100644
index 00000000..6eff49d1
--- /dev/null
+++ b/Assets/Resources/Net/server.csv.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 68380d9e673a9214aa8e9adf0b4f2810
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Editor/ServerMenu.cs b/Assets/Scripts/Editor/ServerMenu.cs
new file mode 100644
index 00000000..8fede241
--- /dev/null
+++ b/Assets/Scripts/Editor/ServerMenu.cs
@@ -0,0 +1,62 @@
+using TKS.OutGame;
+using TKS.OutGame.Net;
+using UnityEditor;
+using UnityEngine;
+
+namespace TKS.EditorTools
+{
+ ///
+ /// 메뉴 「TKS/Server」 — 이 PC 에서만 서버 연결을 켜고 끈다(표 `Resources/Net/server.csv` 는 그대로 · PlayerPrefs 에 적는다).
+ /// 켠 뒤 Play 하면 표의 base_url 서버에 붙는다(로컬 서버 = 서버 저장소에서 `npx pnpm@10 local:up`).
+ ///
+ public static class ServerMenu
+ {
+ const string MenuOn = "TKS/Server/이 PC 에서 서버 연결 켜기";
+ const string MenuOff = "TKS/Server/이 PC 에서 서버 연결 끄기";
+ const string MenuTable = "TKS/Server/표 설정 따르기 (덮어쓰기 지움)";
+ const string MenuLogout = "TKS/Server/저장한 로그인 지우기 (다음 접속 = 새 게스트 계정)";
+ const string MenuStatus = "TKS/Server/지금 설정 보기";
+
+ [MenuItem(MenuOn)]
+ static void On()
+ {
+ PlayerPrefs.SetInt(ServerConfig.PrefEnabled, 1);
+ PlayerPrefs.Save();
+ Status();
+ }
+
+ [MenuItem(MenuOff)]
+ static void Off()
+ {
+ PlayerPrefs.SetInt(ServerConfig.PrefEnabled, 0);
+ PlayerPrefs.Save();
+ Status();
+ }
+
+ [MenuItem(MenuTable)]
+ static void FollowTable()
+ {
+ PlayerPrefs.DeleteKey(ServerConfig.PrefEnabled);
+ PlayerPrefs.DeleteKey(ServerConfig.PrefUrl);
+ PlayerPrefs.Save();
+ Status();
+ }
+
+ [MenuItem(MenuLogout)]
+ static void Logout()
+ {
+ PlayerPrefs.DeleteKey(ServerClient.RefreshKey(ServerConfig.BaseUrl));
+ PlayerPrefs.Save();
+ Debug.Log("[TKS] 저장한 로그인을 지웠습니다 (" + ServerConfig.BaseUrl + ")");
+ }
+
+ [MenuItem(MenuStatus)]
+ static void Status()
+ {
+ Debug.Log("[TKS] 서버 연결 = " + (ServerConfig.Enabled ? "켜짐" : "꺼짐")
+ + (PlayerPrefs.HasKey(ServerConfig.PrefEnabled) ? " (이 PC 덮어쓰기)" : " (표 설정)")
+ + " · 주소 = " + ServerConfig.BaseUrl
+ + " · 기기 사본 = " + ServerConfig.CacheFile + " (기존 " + SaveStore.FileName + " 은 건드리지 않음)");
+ }
+ }
+}
diff --git a/Assets/Scripts/Editor/ServerMenu.cs.meta b/Assets/Scripts/Editor/ServerMenu.cs.meta
new file mode 100644
index 00000000..94cc2d0e
--- /dev/null
+++ b/Assets/Scripts/Editor/ServerMenu.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6314c5da748f80a4db5952e6f14f6519
\ No newline at end of file
diff --git a/Assets/Scripts/OutGame/Arena/ArenaRules.cs b/Assets/Scripts/OutGame/Arena/ArenaRules.cs
index 56521435..ec6af8ca 100644
--- a/Assets/Scripts/OutGame/Arena/ArenaRules.cs
+++ b/Assets/Scripts/OutGame/Arena/ArenaRules.cs
@@ -27,6 +27,23 @@ namespace TKS.OutGame
public const string Arena = "arena";
public const string Raid = "raid";
+ /// 주간 랭킹 정산 중 안내(PD 2026-11-17 「랭킹 정보를 정산중입니다.」).
+ public const string SettleNotice = "랭킹 정보를 정산중입니다.";
+
+ ///
+ /// 지금이 주간 랭킹 정산 시간이고 그 컨텐츠(kind)가 닫히는 대상인가 — 정산 시간과 대상은 서버가 준다(서버 모드만 · PD 2026-11-17
+ /// 「매주 한국 시간 일요일 22시~24시 정산 · 정산 기간에는 랭킹 관련 컨텐츠 이용 불가」). 지금 시각은 서버 시각에 맞춘 세션 시각을 넘긴다.
+ ///
+ public static bool Settling(SaveData d, string kind, DateTime nowUtc)
+ {
+ var a = d.arena;
+ if (!a.server || a.settleContents == null || !a.settleContents.Contains(kind)) return false;
+ if (string.IsNullOrEmpty(a.settleStart) || string.IsNullOrEmpty(a.settleEnd)) return false;
+ var start = SaveStore.ParseIso(a.settleStart, DateTime.MaxValue);
+ var end = SaveStore.ParseIso(a.settleEnd, DateTime.MinValue);
+ return nowUtc >= start && nowUtc < end;
+ }
+
// ---------- 공통 ----------
public static bool ParseStageKey(string key, out int chapter, out int stage)
@@ -90,6 +107,7 @@ namespace TKS.OutGame
public static string CanTower(OutGameData db, SaveData d, DateTime nowUtc)
{
+ if (Settling(d, Tower, nowUtc)) return SettleNotice;
RollDaily(db, d, nowUtc);
if (d.arena.towerFloor >= db.Tower.Top) return "100층 정복 완료";
if (d.arena.towerTickets <= 0) return "입장권 없음(매일 " + db.Economy.TowerTicketsDaily + "장 · 광고 +" + db.Economy.TowerAdTickets + ")";
@@ -114,6 +132,7 @@ namespace TKS.OutGame
public static string TowerAd(OutGameData db, SaveData d, DateTime nowUtc)
{
+ if (Settling(d, Tower, nowUtc)) return SettleNotice;
RollDaily(db, d, nowUtc);
if (d.dailyC.towerAd >= 1) return "오늘 광고 입장권을 받았습니다";
d.dailyC.towerAd++;
@@ -258,6 +277,7 @@ namespace TKS.OutGame
public static void EnsureSeason(OutGameData db, SaveData d, DateTime nowUtc, System.Random rng)
{
var a = d.arena;
+ if (a.server) return; // 서버 모드 = 시즌 · 순위 보상 · 상대 목록을 서버가 정한다
var start = SaveStore.ParseIso(a.seasonStart, DateTime.MinValue);
if (start == DateTime.MinValue)
{
@@ -305,14 +325,32 @@ namespace TKS.OutGame
/// 내 주간 순위 = 1 + 나보다 점수 높은 샘플 수.
public static int Rank(SaveData d)
{
+ if (d.arena.server && d.arena.rank > 0) return d.arena.rank; // 서버 모드 = 실제 유저 사이의 순위
int r = 1;
foreach (var s in d.arena.samples)
if (s.score > d.arena.seasonScore) r++;
return r;
}
+ /// 순위를 매기는 인원(서버 모드 = 순위에 오른 유저 수 · 그 밖 = 표본 + 나).
+ public static int RankTotal(SaveData d)
+ {
+ return d.arena.server && d.arena.rankTotal > 0 ? d.arena.rankTotal : d.arena.samples.Count + 1;
+ }
+
+ /// 상대 편성 i 번째 칸의 강함 — 서버 모드 = 칸마다 레벨 · 등급 · ★(실제 유저의 방어 편성) · 그 밖 = 표본 Lv · 첫 등급 · ★ = 희귀도.
+ public static HeroState SampleState(OutGameData db, ArenaSample s, int i, HeroDb.Hero h)
+ {
+ bool own = s.units != null && i < s.units.Count;
+ int lv = own ? s.units[i].lv : s.lv;
+ string grade = own && !string.IsNullOrEmpty(s.units[i].grade) ? s.units[i].grade : db.Promotion.FirstGrade;
+ int star = own && s.units[i].star > 0 ? s.units[i].star : h.rarity;
+ return new HeroState { id = h.id, lv = Mathf.Max(1, lv), grade = grade, star = Mathf.Clamp(star, 1, db.Evolve.MaxStar) };
+ }
+
public static string CanArena(OutGameData db, SaveData d, int sample, DateTime nowUtc)
{
+ if (Settling(d, Arena, nowUtc)) return SettleNotice;
if (sample < 0 || sample >= d.arena.samples.Count) return "없는 상대";
if (ArenaLeft(db, d, nowUtc) <= 0) return "오늘 " + db.Arena.EntriesPerDay + "회 완료";
return null;
@@ -326,7 +364,7 @@ namespace TKS.OutGame
{
var h = db.Heroes.Get(s.heroes[i]);
if (h == null) continue;
- var hs = new HeroState { id = h.id, lv = s.lv, grade = db.Promotion.FirstGrade, star = Mathf.Clamp(h.rarity, 1, db.Evolve.MaxStar) };
+ var hs = SampleState(db, s, i, h);
var stats = HeroRules.Compute(db, cfg, h, hs);
var p = cfg.playerSpawnPoints[i];
st.enemies.Add(new BalanceConfig.EnemySpawn
@@ -359,6 +397,7 @@ namespace TKS.OutGame
/// 메달 상점: shop_price 메달 → 그 영웅 조각 shop_shards(하루 shop_daily 회 · 보유 영웅만).
public static string BuyShards(OutGameData db, SaveData d, string heroId, DateTime nowUtc)
{
+ if (Settling(d, Arena, nowUtc)) return SettleNotice;
RollDaily(db, d, nowUtc);
var hs = d.Hero(heroId);
if (hs == null) return "보유 영웅만";
@@ -383,6 +422,7 @@ namespace TKS.OutGame
/// 이번 주 보스 = raid_bosses 를 주 번호로 순환 · 주가 바뀌면 누적 피해 초기화.
public static string RaidBoss(OutGameData db, SaveData d, DateTime nowUtc)
{
+ if (d.arena.server) return d.arena.raidBoss ?? ""; // 서버 모드 = 서버(한국 시간 주)가 정한 보스 · 누적 피해
var bosses = db.Economy.RaidBosses;
if (bosses.Length == 0) return "";
var wk = WeekKey(nowUtc);
@@ -406,6 +446,7 @@ namespace TKS.OutGame
public static string CanRaid(OutGameData db, SaveData d, DateTime nowUtc)
{
+ if (Settling(d, Raid, nowUtc)) return SettleNotice;
if (RaidLeft(db, d, nowUtc) <= 0) return "오늘 " + db.Economy.RaidDaily + "회 완료";
return null;
}
diff --git a/Assets/Scripts/OutGame/Arena/ArenaScreen.cs b/Assets/Scripts/OutGame/Arena/ArenaScreen.cs
index be3afd8b..529de92f 100644
--- a/Assets/Scripts/OutGame/Arena/ArenaScreen.cs
+++ b/Assets/Scripts/OutGame/Arena/ArenaScreen.cs
@@ -30,21 +30,25 @@ namespace TKS.OutGame
root = Body();
}
+ // 쪽 번호 → 연무장 종류(0 = 카드 4장)
+ static readonly string[] PageKinds = { null, ArenaRules.Tower, ArenaRules.Dungeon, ArenaRules.Arena, ArenaRules.Raid };
+
public void SetPage(int p)
{
- page = Mathf.Clamp(p, 0, 4);
+ p = Mathf.Clamp(p, 0, 4);
+ // 주간 랭킹 정산 중에는 랭킹 관련 컨텐츠에 들어갈 수 없다 — 안내를 띄우고 카드 화면에 머문다(PD 2026-11-17)
+ if (p > 0 && ArenaRules.Settling(S.Save, PageKinds[p], S.Now))
+ {
+ Root.Modal("연무장", ArenaRules.SettleNotice, new OutGameRoot.ModalButton("확인", UiKit.Dark, null));
+ p = 0;
+ }
+ page = p;
Refresh();
}
public override void OnShow()
{
- S.Do(() =>
- {
- ArenaRules.RollDaily(S.Db, S.Save, S.Now);
- ArenaRules.EnsureSeason(S.Db, S.Save, S.Now, S.Rng);
- ArenaRules.RaidBoss(S.Db, S.Save, S.Now);
- return null;
- });
+ S.ArenaEnter();
}
public override bool OnBack()
@@ -218,11 +222,14 @@ namespace TKS.OutGame
return band;
}
- void Title(string t)
+ /// 쪽 제목 띠. rankBoard 를 주면(순위가 있는 쪽) 서버 모드에서 오른쪽 끝에 「순위 표」 버튼을 단다(순위 = 실제 유저 사이의 순위 · Net/RankPanel).
+ void Title(string t, string rankBoard = null)
{
var band = UiKit.TopBand("Title", root, 12f, 96f, 24f, 24f);
UiKit.Paint(band, UiKit.Red);
UiKit.FillLabel(band, t, 48, UiKit.White);
+ if (rankBoard != null && S.RankAvailable)
+ UiKit.Btn("Rank", band, "순위 표", 30, UiKit.Dark, UiKit.White, new Vector2(1f, 0.5f), new Vector2(1f, 0.5f), new Vector2(-16f, 0f), new Vector2(200f, 64f), () => Net.RankPanel.Open(Root, rankBoard));
}
// ---------- ① 천하제일 탑 ----------
@@ -231,7 +238,7 @@ namespace TKS.OutGame
{
var db = S.Db;
var d = S.Save;
- Title("천하제일 탑");
+ Title("천하제일 탑", ArenaRules.Tower);
int next = ArenaRules.TowerNext(db, d);
var f = db.Tower.Get(next);
var stage = ArenaRules.TowerStage(db, Root.Battle.Config, next);
@@ -251,14 +258,14 @@ namespace TKS.OutGame
var tk = Panel("Tickets", 664f, 150f);
UiKit.Label(tk, "입장권 " + d.arena.towerTickets + " (매일 " + db.Economy.TowerTicketsDaily + "장까지 채움 · 입장 = 1장)", 40, UiKit.Ink, TextAnchor.MiddleLeft, new Vector2(0f, 0.5f), new Vector2(0f, 0.5f), new Vector2(24f, 0f), new Vector2(720f, 80f));
var ad = UiKit.Btn("Ad", tk, "광고 +" + db.Economy.TowerAdTickets + "\n(시험 · " + d.dailyC.towerAd + "/1)", 32, UiKit.Grain, UiKit.White, new Vector2(1f, 0.5f), new Vector2(1f, 0.5f), new Vector2(-16f, 0f), new Vector2(240f, 110f), () =>
- Root.Toast(S.Do(() => ArenaRules.TowerAd(S.Db, S.Save, S.Now)) ?? "입장권 +" + S.Db.Economy.TowerAdTickets + " (광고 SDK 미연동 · 시험 지급)"));
+ Root.Toast(S.TowerAd() ?? "입장권 +" + S.Db.Economy.TowerAdTickets + " (광고 SDK 미연동 · 시험 지급)"));
ad.interactable = d.dailyC.towerAd < 1;
var why = ArenaRules.CanTower(db, d, S.Now);
if (stage == null && why == null) why = "템플릿 스테이지 없음";
var go = UiKit.Btn("Go", root, why == null ? "도전 — " + next + "층" : why, 48, why == null ? UiKit.Red : UiKit.Disabled, UiKit.White, new Vector2(0.5f, 1f), new Vector2(0.5f, 1f), new Vector2(0f, -840f), new Vector2(1032f, 150f), () =>
{
- var w = S.Do(() => ArenaRules.EnterTower(S.Db, S.Save, S.Now));
+ var w = S.EnterTower();
if (w != null)
{
Root.Toast(w);
@@ -346,10 +353,10 @@ namespace TKS.OutGame
var db = S.Db;
var d = S.Save;
var now = S.Now;
- Title("투기장");
+ Title("투기장", ArenaRules.Arena);
var me = Panel("Me", 124f, 200f);
int left = ArenaRules.ArenaLeft(db, d, now);
- UiKit.Label(me, "메달 " + d.arena.medals + " · 주간 점수 " + d.arena.seasonScore + " · " + ArenaRules.Rank(d) + "위 / " + (d.arena.samples.Count + 1), 36, UiKit.Ink, TextAnchor.MiddleLeft, new Vector2(0f, 1f), new Vector2(0f, 1f), new Vector2(24f, -14f), new Vector2(980f, 56f));
+ UiKit.Label(me, "메달 " + d.arena.medals + " · 주간 점수 " + d.arena.seasonScore + " · " + ArenaRules.Rank(d) + "위 / " + ArenaRules.RankTotal(d), 36, UiKit.Ink, TextAnchor.MiddleLeft, new Vector2(0f, 1f), new Vector2(0f, 1f), new Vector2(24f, -14f), new Vector2(980f, 56f));
var start = SaveStore.ParseIso(d.arena.seasonStart, now);
int daysLeft = Mathf.Max(0, db.Arena.SeasonDays - (int)(now - start).TotalDays);
UiKit.Label(me, "전적 " + d.arena.wins + "승 " + d.arena.losses + "패 · 오늘 남은 도전 " + left + "/" + db.Arena.EntriesPerDay + " · 시즌 " + daysLeft + "일 남음 · 승 +" + db.Arena.MedalWin + " / 패 +" + db.Arena.MedalLose + "\n" +
@@ -370,7 +377,7 @@ namespace TKS.OutGame
{
var h = db.Heroes.Get(s.heroes[j]);
if (h == null) continue;
- power += HeroRules.Compute(db, Root.Battle.Config, h, new HeroState { id = h.id, lv = s.lv, grade = db.Promotion.FirstGrade, star = Mathf.Clamp(h.rarity, 1, db.Evolve.MaxStar) }).power;
+ power += HeroRules.Compute(db, Root.Battle.Config, h, ArenaRules.SampleState(db, s, j, h)).power;
UiKit.Portrait("H" + j, cell.transform, h, new Vector2(0f, 0.5f), new Vector2(0f, 0.5f), new Vector2(16f + j * 92f, 0f), new Vector2(84f, 104f), false, 1.8f, new Color(0.9f, 0.86f, 0.8f));
}
UiKit.Label(cell.transform, s.name + "\n전투력 " + power.ToString("N0") + " · 점수 " + s.score + "", 30, UiKit.Ink, TextAnchor.MiddleLeft, new Vector2(0f, 0.5f), new Vector2(0f, 0.5f), new Vector2(490f, 0f), new Vector2(330f, 110f));
@@ -385,7 +392,7 @@ namespace TKS.OutGame
}
Root.StartMode(ArenaRules.Arena, "", k, ArenaRules.ArenaStage(S.Db, Root.Battle.Config, S.Save.arena.samples[k]), 0, 3);
});
- b.interactable = why == null;
+ b.interactable = why == null || why == ArenaRules.SettleNotice; // 정산 중에는 눌러서 안내를 볼 수 있게
}
}
@@ -405,7 +412,7 @@ namespace TKS.OutGame
string id = h.id;
var cell = UiKit.Cell(grid, "Buy_" + id, UiKit.Paper, () =>
{
- var w = S.Do(() => ArenaRules.BuyShards(S.Db, S.Save, id, S.Now));
+ var w = S.BuyArenaShards(id);
Root.Toast(w ?? h.nameKo + " 조각 +" + S.Db.Arena.ShopShards);
if (w == null) MedalShop();
});
@@ -422,7 +429,7 @@ namespace TKS.OutGame
var d = S.Save;
var now = S.Now;
var e = db.Economy;
- Title("적장 토벌 (이벤트)");
+ Title("적장 토벌 (이벤트)", ArenaRules.Raid);
string bossId = ArenaRules.RaidBoss(db, d, now);
var h = db.Heroes.Get(bossId);
var stage = ArenaRules.RaidStage(db, Root.Battle.Config, bossId);
diff --git a/Assets/Scripts/OutGame/Domestic/DomesticScreen.cs b/Assets/Scripts/OutGame/Domestic/DomesticScreen.cs
index fe9fcea7..f54286ab 100644
--- a/Assets/Scripts/OutGame/Domestic/DomesticScreen.cs
+++ b/Assets/Scripts/OutGame/Domestic/DomesticScreen.cs
@@ -261,7 +261,7 @@ namespace TKS.OutGame
{
var b = UiKit.Btn("Up", card.transform, TrainingRules.Cost(db, d, t, i).ToString("N0") + " 골드", 28, UiKit.Coin, UiKit.Ink, new Vector2(0.5f, 0f), new Vector2(0.5f, 0f), new Vector2(0f, 12f), new Vector2(280f, 62f), () =>
{
- var why = S.Do(() => TrainingRules.Level(S.Db, S.Save, TrainType, k));
+ var why = S.TrainLevel(TrainType, k);
if (why != null) Root.Toast(why);
});
b.interactable = TrainingRules.CanLevel(db, d, t, i) == null;
@@ -272,7 +272,7 @@ namespace TKS.OutGame
{
var pb = UiKit.Btn("Promote", p, "랭크 승급 → " + TrainingRules.RankName(db, rank + 1) + " · 골드 " + TrainingRules.PromoteCost(db, d, t).ToString("N0"), 34, UiKit.Red, UiKit.White, new Vector2(0.5f, 1f), new Vector2(0.5f, 1f), new Vector2(0f, -FootY + 8f), new Vector2(900f, 84f), () =>
{
- var why = S.Do(() => TrainingRules.Promote(S.Db, S.Save, TrainType));
+ var why = S.TrainPromote(TrainType);
Root.Toast(why ?? UnitTypeInfo.Korean(TrainType) + " 랭크 승급 → " + TrainingRules.RankName(S.Db, TrainingRules.Rank(S.Save, TrainType)));
});
pb.interactable = TrainingRules.CanPromote(db, d, t) == null;
@@ -490,10 +490,11 @@ namespace TKS.OutGame
hb.interactable = h > 0f;
var ins = UiKit.SkinBtn(p, "Instant", "btn_purple", UiKit.White, "즉시 수확", 44, UiKit.White, 1056f - 505f, 1270f, 505f, 128f, () =>
{
- string why;
- var r = S.InstantHarvest(out why);
- if (r == null) Root.Toast(why);
- else ShowYield("즉시 수확", r);
+ S.InstantHarvestAsync((r, why) =>
+ {
+ if (r == null) Root.Toast(why);
+ else ShowYield("즉시 수확", r);
+ });
});
UiKit.BtnCost(ins, "cur_gem", e.PatrolInstantGem.ToString(), 40f, 32);
// 즉시 수확 분량 = 버튼 위끝에 걸친 배지(칩)
@@ -601,10 +602,11 @@ namespace TKS.OutGame
void DoHarvest(bool ad)
{
- string why;
- var r = S.Harvest(ad, out why);
- if (r == null) Root.Toast(why);
- else ShowYield(ad ? "광고 2배 수확" : "수확", r);
+ S.HarvestAsync(ad, (r, why) =>
+ {
+ if (r == null) Root.Toast(why);
+ else ShowYield(ad ? "광고 2배 수확" : "수확", r);
+ });
}
void ShowYield(string title, PatrolYield y)
@@ -676,7 +678,7 @@ namespace TKS.OutGame
ci.raycastTarget = true;
cell.gameObject.AddComponent