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:
@@ -7,19 +7,6 @@ namespace Wizard;
|
||||
|
||||
public class SealedData
|
||||
{
|
||||
private const int ACQUIRED_NORMAL_CARDID_END = 6;
|
||||
|
||||
private const int ACQUIRED_PREMIUM_CARDID_END = 7;
|
||||
|
||||
private const int PHANTOM_NORMAL_CARDID_END = 8;
|
||||
|
||||
private const int PHANTOM_PREMIUM_CARDID_END = 9;
|
||||
|
||||
public const int PHANTOM_CARD_SLEEVE_ID = 5070001;
|
||||
|
||||
public const int GACHA_RESOURCE_ID = 70;
|
||||
|
||||
public const GenerateDeckCodeTask.SubmitDeckType DECK_CODE_TYPE = GenerateDeckCodeTask.SubmitDeckType.SEALED;
|
||||
|
||||
private List<SealedCardInfo> _registeredSealedCardInfoList = new List<SealedCardInfo>();
|
||||
|
||||
@@ -65,8 +52,6 @@ public class SealedData
|
||||
|
||||
public bool? IsCompletedDeck { get; private set; }
|
||||
|
||||
public bool RegisteredSealedCardExists => _registeredSealedCardInfoList.Count > 0;
|
||||
|
||||
public bool IsSpecialEffect { get; private set; }
|
||||
|
||||
public void SetEntryInfo(JsonData rootData)
|
||||
@@ -85,8 +70,7 @@ public class SealedData
|
||||
if (jsonData2 != null)
|
||||
{
|
||||
SelectedClassId = jsonData2.ToInt();
|
||||
GameMgr.GetIns().GetDataMgr().GetClassPrm(SelectedClassId.Value)
|
||||
.SetCurrentCharaId(jsonData["leader_skin_id"].ToInt());
|
||||
// Pre-Phase-5b: dropped class-prm chara-id write; headless has no class prm map.
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -187,7 +171,7 @@ public class SealedData
|
||||
list.ForEach(RegisterSealedCard);
|
||||
list.ForEach(delegate(SealedCardInfo info)
|
||||
{
|
||||
GameMgr.GetIns().GetDataMgr().SetIsNewCard(info.OriginalCardId, isNew: false);
|
||||
// Pre-Phase-5b: SetIsNewCard write dropped; headless has no user card state.
|
||||
});
|
||||
}
|
||||
list.Sort(delegate(SealedCardInfo a, SealedCardInfo b)
|
||||
@@ -283,17 +267,13 @@ public class SealedData
|
||||
private void RegisterSealedCard(SealedCardInfo cardInfo)
|
||||
{
|
||||
CardMaster instance = CardMaster.GetInstance(CardMaster.CardMasterId.Default);
|
||||
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
|
||||
int sealedCardId = cardInfo.SealedCardId;
|
||||
int originalCardId = cardInfo.OriginalCardId;
|
||||
_registeredSealedCardInfoList.Add(cardInfo);
|
||||
CardParameter cardParam = instance.GetCardParameterFromId(originalCardId).Clone(sealedCardId);
|
||||
if (!cardInfo.IsPhantom)
|
||||
{
|
||||
dataMgr.SetIsNewCard(sealedCardId, dataMgr.IsNewCard(originalCardId));
|
||||
}
|
||||
// Pre-Phase-5b: DataMgr.SetIsNewCard + RegisterUserOwnCardData dropped; headless has
|
||||
// no user card state to update.
|
||||
instance.RegisterCardParameter(sealedCardId, cardParam);
|
||||
dataMgr.RegisterUserOwnCardData(sealedCardId, cardInfo.OwnNum);
|
||||
RegisterSealedCardInAllCardIdList(sealedCardId);
|
||||
}
|
||||
|
||||
@@ -326,9 +306,8 @@ public class SealedData
|
||||
private void UnregisterSealedCard(int sealedCardId)
|
||||
{
|
||||
_registeredSealedCardInfoList.RemoveAll((SealedCardInfo x) => x.SealedCardId == sealedCardId);
|
||||
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
|
||||
CardMaster.GetInstance(CardMaster.CardMasterId.Default).UnregisterCardParameter(sealedCardId);
|
||||
dataMgr.UnregisterUserOwnCardData(sealedCardId);
|
||||
// Pre-Phase-5b: DataMgr.UnregisterUserOwnCardData dropped; headless has no user card state.
|
||||
CardMaster.GetInstance(CardMaster.CardMasterId.Default).GetAllCardIds().Remove(sealedCardId);
|
||||
}
|
||||
|
||||
@@ -340,11 +319,6 @@ public class SealedData
|
||||
return originalCardId / 10 * 10 + num;
|
||||
}
|
||||
|
||||
private static int? ConvertToOriginalCardId(int sealedCardId)
|
||||
{
|
||||
return Data.ArenaData.SealedData.GetSealedCardInfo(sealedCardId)?.OriginalCardId;
|
||||
}
|
||||
|
||||
public static bool IsPhantomCard(int cardId)
|
||||
{
|
||||
return Data.ArenaData.SealedData.GetSealedCardInfo(cardId)?.IsPhantom ?? false;
|
||||
|
||||
Reference in New Issue
Block a user