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>
99 lines
2.2 KiB
C#
99 lines
2.2 KiB
C#
using System.Collections.Generic;
|
|
|
|
public class CardDataModel
|
|
{
|
|
public int Index { get; set; }
|
|
|
|
public int CardId { get; set; }
|
|
|
|
public int RedrawCardPosition { get; set; }
|
|
|
|
public bool isOpponent { get; set; }
|
|
|
|
public NetworkBattleDefine.NetworkCardPlaceState fromState { get; set; }
|
|
|
|
public List<NetworkBattleDefine.NetworkCardPlaceState> ToStateList { get; set; }
|
|
|
|
public int skillCardIndex { get; set; }
|
|
|
|
public int publishedActiveSkillCount { get; set; }
|
|
|
|
public int skillMovementNum { get; set; }
|
|
|
|
public List<int> skillKeyCardIdxList { get; set; }
|
|
|
|
public List<int> SkillKeyCardIdList { get; set; }
|
|
|
|
public int playCardCost { get; set; }
|
|
|
|
public int? AddLife { get; set; }
|
|
|
|
public int? SetLife { get; set; }
|
|
|
|
public int? AddAtk { get; set; }
|
|
|
|
public int? SetAtk { get; set; }
|
|
|
|
public int Clan { get; set; }
|
|
|
|
public string Tribe { get; set; }
|
|
|
|
public bool IsOpen { get; set; }
|
|
|
|
public int Spellboost { get; set; } = -1;
|
|
|
|
public int? AddChantCount { get; set; }
|
|
|
|
public int? SetChantCount { get; set; }
|
|
|
|
public int UnionBurstCount { get; set; }
|
|
|
|
public int SkyboundArtCount { get; set; }
|
|
|
|
public int SkillIndex { get; set; }
|
|
|
|
public string AttachTarget { get; private set; }
|
|
|
|
public int RandomTargetIndex { get; set; } = -1;
|
|
|
|
public List<int> FusionIngredientList { get; set; }
|
|
|
|
public bool IsInvoked { get; set; }
|
|
|
|
public bool IsGotUnapproved { get; set; }
|
|
|
|
public int SkillCallCount { get; set; }
|
|
|
|
public int SkillValueCount { get; set; }
|
|
|
|
public int? SkillValueParameter { get; set; }
|
|
|
|
public int activate { get; set; }
|
|
|
|
public bool IsHighlander { get; set; }
|
|
|
|
public CardDataModel()
|
|
{
|
|
Clan = -1;
|
|
Tribe = "NONE";
|
|
playCardCost = -1;
|
|
publishedActiveSkillCount = -1;
|
|
SkillCallCount = -1;
|
|
SkillValueCount = -1;
|
|
SkillValueParameter = null;
|
|
activate = -1;
|
|
SkillIndex = -1;
|
|
IsHighlander = false;
|
|
ToStateList = new List<NetworkBattleDefine.NetworkCardPlaceState>();
|
|
skillKeyCardIdxList = new List<int>();
|
|
SkillKeyCardIdList = new List<int>();
|
|
UnionBurstCount = -1;
|
|
SkyboundArtCount = -1;
|
|
}
|
|
|
|
public void SetAttachTarget(string attach)
|
|
{
|
|
AttachTarget = attach;
|
|
}
|
|
}
|