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
@@ -5,67 +5,6 @@ using Wizard;
|
||||
|
||||
public class NtDataTranslateInfo
|
||||
{
|
||||
public const string TITLESTATEMENT = "titleStatement";
|
||||
|
||||
public const string CONTAINSTATEMENT = "containStatement";
|
||||
|
||||
public const string TITLEEMAIL = "titleEmail";
|
||||
|
||||
public const string EMAILADDRESS1 = "emailAddress1";
|
||||
|
||||
public const string EMAILADDRESS2 = "emailAddress2";
|
||||
|
||||
public const string EMAILADDRESSTIP1 = "emailAddressTip1";
|
||||
|
||||
public const string EMAILADDRESSTIP2 = "emailAddressTip2";
|
||||
|
||||
public const string TITLESUCCESS = "titleSuccess";
|
||||
|
||||
public const string CONTAINSUCCESS = "containSuccess";
|
||||
|
||||
public const string TITLETIP = "titleTip";
|
||||
|
||||
public const string CONTAINTIP = "containTip";
|
||||
|
||||
public const string TITLEREBIND = "titleRebind";
|
||||
|
||||
public const string CONTAINREBIND = "containRebind";
|
||||
|
||||
public const string ERRORID = "ERROR_ID";
|
||||
|
||||
public const string ERRORTITLE = "ERROR_TITLE";
|
||||
|
||||
public const string ERRORCONTAIN1 = "ERROR_CONTAIN1";
|
||||
|
||||
public const string ERRORCONTAIN2 = "ERROR_CONTAIN2";
|
||||
|
||||
public const string ERRORCONTAIN3 = "ERROR_CONTAIN3";
|
||||
|
||||
public const string ERRORCONTAIN4 = "ERROR_CONTAIN4";
|
||||
|
||||
public const string ERRORCONTAIN5 = "ERROR_CONTAIN5";
|
||||
|
||||
public const string ERRORCONTAIN6 = "ERROR_CONTAIN6";
|
||||
|
||||
public const string ERRORCONTAIN7 = "ERROR_CONTAIN7";
|
||||
|
||||
public const string SERVERURL = "serverUrl";
|
||||
|
||||
public const string BUTTONTEXT = "buttonTitle";
|
||||
|
||||
public const string BUTTONTEXT_ID1 = "buttonText_ID1";
|
||||
|
||||
public const string BUTTONTEXT_ID2 = "buttonText_ID2";
|
||||
|
||||
public const string BUTTONTEXT_ID3 = "buttonText_ID3";
|
||||
|
||||
public const string BUTTONTEXT_ID4 = "buttonText_ID4";
|
||||
|
||||
public const string BUTTONTEXT_ID5 = "buttonText_ID5";
|
||||
|
||||
public const string BUTTONTEXT_ID6 = "buttonText_ID6";
|
||||
|
||||
public const string BUTTONTEXT_ID7 = "buttonText_ID7";
|
||||
|
||||
public string titleStatement = "";
|
||||
|
||||
@@ -99,8 +38,6 @@ public class NtDataTranslateInfo
|
||||
|
||||
public string ERROR_CONTAIN2 = "";
|
||||
|
||||
public string ERROR_CONTAIN3 = "";
|
||||
|
||||
public string ERROR_CONTAIN4 = "";
|
||||
|
||||
public string ERROR_CONTAIN5 = "";
|
||||
@@ -163,50 +100,4 @@ public class NtDataTranslateInfo
|
||||
button_id7 = systemText.Get("Account_0136")
|
||||
};
|
||||
}
|
||||
|
||||
public static bool ContainsKey(JsonData json, string key)
|
||||
{
|
||||
if (((IDictionary)json).Contains((object)key))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public JsonData toJsonData()
|
||||
{
|
||||
return new JsonData
|
||||
{
|
||||
["titleStatement"] = titleStatement,
|
||||
["containStatement"] = containStatement,
|
||||
["titleEmail"] = titleEmail,
|
||||
["emailAddress1"] = emailAddress1,
|
||||
["emailAddress2"] = emailAddress2,
|
||||
["emailAddressTip1"] = emailAddressTip1,
|
||||
["emailAddressTip2"] = emailAddressTip2,
|
||||
["titleSuccess"] = titleSuccess,
|
||||
["containSuccess"] = containSuccess,
|
||||
["titleTip"] = titleTip,
|
||||
["containTip"] = containTip,
|
||||
["titleRebind"] = titleRebind,
|
||||
["containRebind"] = containRebind,
|
||||
["ERROR_TITLE"] = ERROR_TITLE,
|
||||
["ERROR_CONTAIN1"] = ERROR_CONTAIN1,
|
||||
["ERROR_CONTAIN2"] = ERROR_CONTAIN2,
|
||||
["ERROR_CONTAIN3"] = ERROR_CONTAIN3,
|
||||
["ERROR_CONTAIN4"] = ERROR_CONTAIN4,
|
||||
["ERROR_CONTAIN5"] = ERROR_CONTAIN5,
|
||||
["ERROR_CONTAIN6"] = ERROR_CONTAIN6,
|
||||
["ERROR_CONTAIN7"] = ERROR_CONTAIN7,
|
||||
["serverUrl"] = serverUrl,
|
||||
["buttonTitle"] = buttonTitle,
|
||||
["buttonText_ID1"] = button_id1,
|
||||
["buttonText_ID2"] = button_id2,
|
||||
["buttonText_ID3"] = button_id3,
|
||||
["buttonText_ID4"] = button_id4,
|
||||
["buttonText_ID5"] = button_id5,
|
||||
["buttonText_ID6"] = button_id6,
|
||||
["buttonText_ID7"] = button_id7
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user