engine cleanup passes 4-7 + multi-instancing ambient rip
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>
This commit is contained in:
gamer147
@@ -13,12 +13,6 @@ public class Crossover
|
||||
public DateTime EndTime = DateTime.MinValue;
|
||||
}
|
||||
|
||||
public const int MAIN_CLASS_CARD_MIN_NUM = 24;
|
||||
|
||||
public const int SUB_CLASS_CARD_MIN_NUM = 9;
|
||||
|
||||
public const int AUTO_CREATE_NEUTRAL_MAX = 7;
|
||||
|
||||
public PeriodData RankMatchPeriod = new PeriodData();
|
||||
|
||||
public PeriodData FreeMatchPeriod = new PeriodData();
|
||||
@@ -33,14 +27,6 @@ public class Crossover
|
||||
|
||||
public CrossoverRestrictedCard RestrictedCard = new CrossoverRestrictedCard();
|
||||
|
||||
private int _startRankId;
|
||||
|
||||
private int _maxRankId;
|
||||
|
||||
private Dictionary<int, RankInfo> UserRankData = new Dictionary<int, RankInfo>();
|
||||
|
||||
private List<RankInfo> _userRankList = new List<RankInfo>();
|
||||
|
||||
public static int AUTO_CREATE_MAIN_AND_NEUTRAL_MAX => 31;
|
||||
|
||||
public static int AUTO_CREATE_SUB_AND_NEUTRAL_MAX => 16;
|
||||
@@ -74,91 +60,4 @@ public class Crossover
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void Parse(JsonData data)
|
||||
{
|
||||
JsonData data2 = data["schedules"];
|
||||
if (data2.TryGetValue("rank_battle", out var value))
|
||||
{
|
||||
SetPeriodData(RankMatchPeriod, value);
|
||||
}
|
||||
if (data2.TryGetValue("free_battle", out var value2))
|
||||
{
|
||||
SetPeriodData(FreeMatchPeriod, value2);
|
||||
}
|
||||
if (data2.TryGetValue("gathering", out var value3))
|
||||
{
|
||||
SetPeriodData(GatheringPeriod, value3);
|
||||
}
|
||||
if (data2.TryGetValue("practice", out var value4))
|
||||
{
|
||||
SetPeriodData(PracticePeriod, value4);
|
||||
}
|
||||
if (data.TryGetValue("card_set_id_list", out var value5))
|
||||
{
|
||||
for (int i = 0; i < value5.Count; i++)
|
||||
{
|
||||
CardSetIdList.Add(value5[i].ToInt());
|
||||
}
|
||||
}
|
||||
if (data.TryGetValue("reprinted_base_card_ids", out var value6))
|
||||
{
|
||||
for (int j = 0; j < value6.Count; j++)
|
||||
{
|
||||
ReprintedBaseCardIds.Add(value6[j].ToInt());
|
||||
}
|
||||
}
|
||||
if (data.TryGetValue("restricted_base_card_id_list", out var value7))
|
||||
{
|
||||
RestrictedCard.Parse(value7);
|
||||
}
|
||||
ParseRankData(data);
|
||||
}
|
||||
|
||||
public void ParseRankData(JsonData data)
|
||||
{
|
||||
JsonData jsonData = data["rank_info"];
|
||||
_startRankId = int.MaxValue;
|
||||
_maxRankId = int.MinValue;
|
||||
for (int i = 0; i < jsonData.Count; i++)
|
||||
{
|
||||
RankInfo rankInfo = new RankInfo(jsonData[i]);
|
||||
_userRankList.Add(rankInfo);
|
||||
UserRankData[rankInfo.RankId] = rankInfo;
|
||||
if (rankInfo.RankId < _startRankId)
|
||||
{
|
||||
_startRankId = rankInfo.RankId;
|
||||
}
|
||||
if (rankInfo.RankId > _maxRankId)
|
||||
{
|
||||
_maxRankId = rankInfo.RankId;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public RankInfo GetRankInfo(int rankId)
|
||||
{
|
||||
return UserRankData[rankId];
|
||||
}
|
||||
|
||||
public bool IsStartRank(int rankId)
|
||||
{
|
||||
return rankId == _startRankId;
|
||||
}
|
||||
|
||||
public bool IsMaxRank(int rankId)
|
||||
{
|
||||
return rankId == _maxRankId;
|
||||
}
|
||||
|
||||
public List<RankInfo> GetRankInfoRawList()
|
||||
{
|
||||
return _userRankList;
|
||||
}
|
||||
|
||||
private void SetPeriodData(PeriodData period, JsonData jsonData)
|
||||
{
|
||||
period.BeginTime = DateTime.Parse(jsonData["begin_time"].ToString());
|
||||
period.EndTime = DateTime.Parse(jsonData["end_time"].ToString());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user