Squashes 146 commits from battle-engine-extraction. Net: 2,045 files changed, +11,896 / -158,687 lines. Ships engine passes 4-7 (dead-code cull, view-layer stub, receive-path shrink) plus the Phase-5 AsyncLocal ambient deletion that turns concurrent battles into a type-system property rather than a scope contract. ## What landed **Passes 4-7 (chunks 1-34):** Extended the Phase-4 const-false collapse into a cascading cull across the skill graph, view layer, and receive-path periphery. Six mode flags (IsWatchBattle/IsReplayBattle/IsAdmin/IsAdminWatch/IsPuzzleQuest/ IsAINetwork) became `const false`, every guarded block deleted. Field*.cs subclass ctors + BackGroundBase + ObjectChecker culled to no-ops. Mulligan family reworked to take a mgr param through IMulliganMgr.InitMulligan. Emotion/Recovery/Resource clusters null-stubbed. Prediction/OperationSimulator/ skill filters converted from static ambient reads to per-mgr reads via SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr / ins.BattleMgr / this.BattleMgr. **Phase-5 ambient rip (chunks 35-47):** Deleted BattleAmbient / BattleAmbient- Context / TestBattleScope in full. Every per-battle mutable slot now lives on the mgr instance itself: mgr.InstanceIsForecast / InstanceIsRandomDraw / InstanceRecoveryInfo / InstanceViewerId / InstanceNetworkAgent / GameMgr BattleManagerBase.GetIns() returns null unconditionally; the residual static flags + 3 façades (Certification.ViewerId, Data.BattleRecoveryInfo, ToolboxGame.RealTimeNetworkAgent) are null-tolerant defaults kept for the handful of engine-internal readers that still reference their types. Zero BattleAmbient references anywhere in engine + node + tests. Added pre-seeded GameMgr ctor overload threaded through the mgr chain (BattleManagerBase → SingleBattleMgr / NetworkBattleManagerBase → NetworkStandard- BattleMgr → HeadlessBattleMgr / HeadlessNetworkBattleMgr). Fixtures build a GameMgr, seed it via HeadlessEngineEnv.SeedCharaIds/SeedNetUser, and pass it to the mgr's ctor — no ambient reach. Node side (SVSim.BattleNode/SessionBattleEngine): _ctx replaced with a plain GameMgr field; 34 `using var _ambient = BattleAmbient.Enter(_ctx)` scope wraps ripped from every accessor and mutator; EngineGlobalInit.WirePerSessionGameMgr takes GameMgr as a param and runs from SessionBattleEngine.SetupInternal BEFORE mgr construction. Test side: TestBattleScope deleted; 18 fixture [SetUp]s migrated to `HeadlessEngineEnv.EnsureProcessGlobals()`; MultiInstanceEngineTests rewritten around per-mgr construction (GetIns() → null is the pinned invariant). ## Regression fixes - **chunk-48** (MulliganCtrl): chunk-35's `= null` stubs on card lookups broke the live receive-driven Deal path (BattlePlayerBase.DrawCard NRE'd downstream of NetworkPlayerMulliganCtrl.StartMulliganVfx). Restored the three lookups via `_battlePlayer.BattleMgr.GetBattleCardIdx`. Engine tests were satisfied by the WireMulliganPhase seam; unit tests exposed the live-path gap. ## Ship state - SVSim.BattleEngine.Tests: 56/56 pass, 2 skip - SVSim.UnitTests: 1554/1554 pass (was 1523/31-fail before chunk 48) - Solution build: 0 source warnings (40 pre-existing NU1902 MessagePack CVEs in SVSim.EmulatedEntrypoint, unrelated) - Sequential PVP smoke: verified live (two back-to-back battles, no regression on cleanup/spinup) - Concurrent PVP smoke: verified live Adds tools/engine-port/ClosureAnalyzer/ — the Roslyn transitive-type-closure analyzer needed to make future cascade cleanup safe (per feedback memory "Engine cleanup needs closure tool" from the 2026-06-28 pass-3 failure). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
80 lines
2.1 KiB
C#
80 lines
2.1 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using LitJson;
|
|
|
|
namespace Wizard;
|
|
|
|
public class Prerelease
|
|
{
|
|
public enum eStatus
|
|
{
|
|
NONE,
|
|
PRE_ROTATION,
|
|
DISPLAY_DECK_ONLY
|
|
}
|
|
|
|
public static Prerelease Instance { get; private set; }
|
|
|
|
public static eStatus Status { get; set; }
|
|
|
|
public DateTime EndTime { get; private set; }
|
|
|
|
public DateTime DisplayEndTime { get; private set; }
|
|
|
|
public List<int> RotationCardSetList { get; private set; }
|
|
|
|
public List<int> ReprintedBaseCardIds { get; private set; }
|
|
|
|
public List<int> LatestReprintedBaseCardIds { get; private set; }
|
|
|
|
public int NextCardSetId { get; private set; }
|
|
|
|
public CardMaster.CardMasterId CardMasterId { get; private set; }
|
|
|
|
public bool IsEnableFreeMatch { get; private set; }
|
|
|
|
public static void Clear()
|
|
{
|
|
Instance = null;
|
|
}
|
|
|
|
private Prerelease(JsonData json)
|
|
{
|
|
ParseJsonData(json);
|
|
}
|
|
|
|
private void ParseJsonData(JsonData data)
|
|
{
|
|
EndTime = DateTime.Parse(data["end_time"].ToString());
|
|
DisplayEndTime = DateTime.Parse(data["display_end_time"].ToString());
|
|
RotationCardSetList = new List<int>();
|
|
JsonData jsonData = data["rotation_card_set_id_list"];
|
|
for (int i = 0; i < jsonData.Count; i++)
|
|
{
|
|
RotationCardSetList.Add(jsonData[i].ToInt());
|
|
}
|
|
ReprintedBaseCardIds = new List<int>();
|
|
JsonData jsonData2 = data["reprinted_base_card_ids"];
|
|
for (int j = 0; j < jsonData2.Count; j++)
|
|
{
|
|
ReprintedBaseCardIds.Add(jsonData2[j].ToInt());
|
|
}
|
|
LatestReprintedBaseCardIds = new List<int>();
|
|
JsonData jsonData3 = data["latest_reprinted_base_card_ids"];
|
|
for (int k = 0; k < jsonData3.Count; k++)
|
|
{
|
|
LatestReprintedBaseCardIds.Add(jsonData3[k].ToInt());
|
|
}
|
|
NextCardSetId = data["next_card_set_id"].ToInt();
|
|
CardMasterId = ParseCardMasterId(data["card_master_id"].ToString());
|
|
Status = (eStatus)data["pre_release_status"].ToInt();
|
|
IsEnableFreeMatch = data["is_pre_rotation_free_match_term"].ToInt() == 1;
|
|
}
|
|
|
|
private CardMaster.CardMasterId ParseCardMasterId(JsonData cardMasterIdJson)
|
|
{
|
|
Enum.TryParse<CardMaster.CardMasterId>(cardMasterIdJson.ToString(), out var result);
|
|
return result;
|
|
}
|
|
}
|