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
@@ -9,8 +9,6 @@ public class ReplayDetailInfo
|
||||
|
||||
public Format deck_format;
|
||||
|
||||
public bool is_two_pick;
|
||||
|
||||
public TwoPickFormat _twoPickFormat;
|
||||
|
||||
public long battle_id;
|
||||
@@ -23,8 +21,6 @@ public class ReplayDetailInfo
|
||||
|
||||
public Dictionary<string, object> play_list;
|
||||
|
||||
public int _battleType;
|
||||
|
||||
public List<int> TurnStartIndexList = new List<int>();
|
||||
|
||||
public int viewer_id;
|
||||
@@ -91,110 +87,6 @@ public class ReplayDetailInfo
|
||||
|
||||
public string OpponentMyRotationId = "";
|
||||
|
||||
protected const string PLAYLIST_BATTLE_ID_KEY = "battleId";
|
||||
|
||||
protected const string PLAYLIST_SEED_KEY = "seed";
|
||||
|
||||
protected const string PLAYLIST_FIELD_ID_KEY = "fieldId";
|
||||
|
||||
protected const string PLAYLIST_FIRST_TURN_KEY = "firstTurn";
|
||||
|
||||
protected const string PLAYLIST_PLAYLIST_KEY = "playlist";
|
||||
|
||||
protected const string PLAYLIST_URI_KEY = "uri";
|
||||
|
||||
protected const string URI_WATCH_KEY = "Watch";
|
||||
|
||||
protected const string PARAM_PLAYER_VIEWER_ID_KEY = "vid1";
|
||||
|
||||
protected const string PARAM_PLAYER_NAME_KEY = "name1";
|
||||
|
||||
protected const string PARAM_PLAYER_CHARA_ID_KEY = "charaId1";
|
||||
|
||||
protected const string PARAM_PLAYER_CLASS_ID_KEY = "classId1";
|
||||
|
||||
protected const string PARAM_PLAYER_EMBLEM_ID_KEY = "emblemId1";
|
||||
|
||||
protected const string PARAM_PLAYER_DEGREE_ID_KEY = "degreeId1";
|
||||
|
||||
protected const string PARAM_PLAYER_COUNTRY_CODE_KEY = "countryCode1";
|
||||
|
||||
protected const string PARAM_PLAYER_SLEEVE_ID_KEY = "sleeveId1";
|
||||
|
||||
protected const string PARAM_PLAYER_BATTLE_POINT_KEY = "battlePoint1";
|
||||
|
||||
protected const string PARAM_PLAYER_MASTER_POINT_KEY = "masterPoint1";
|
||||
|
||||
protected const string PARAM_PLAYER_RANK_KEY = "rank1";
|
||||
|
||||
protected const string PARAM_PLAYER_IS_OFFICIAL_KEY = "isOfficial1";
|
||||
|
||||
protected const string PARAM_PLAYER_DECK_KEY = "deck1";
|
||||
|
||||
protected const string PARAM_PLAYER_CHAOS_ID_KEY = "chaosId1";
|
||||
|
||||
protected const string PARAM_PLAYER_SUB_CLASS_ID_KEY = "subclassId1";
|
||||
|
||||
protected const string PARAM_PLAYER_MY_ROTATION_ID_KEY = "rotationId1";
|
||||
|
||||
protected const string PARAM_ENEMY_VIEWER_ID_KEY = "vid2";
|
||||
|
||||
protected const string PARAM_ENEMY_NAME_KEY = "name2";
|
||||
|
||||
protected const string PARAM_ENEMY_CHARA_ID_KEY = "charaId2";
|
||||
|
||||
protected const string PARAM_ENEMY_CLASS_ID_KEY = "classId2";
|
||||
|
||||
protected const string PARAM_ENEMY_EMBLEM_ID_KEY = "emblemId2";
|
||||
|
||||
protected const string PARAM_ENEMY_DEGREE_ID_KEY = "degreeId2";
|
||||
|
||||
protected const string PARAM_ENEMY_COUNTRY_CODE_KEY = "countryCode2";
|
||||
|
||||
protected const string PARAM_ENEMY_SLEEVE_ID_KEY = "sleeveId2";
|
||||
|
||||
protected const string PARAM_ENEMY_BATTLE_POINT_KEY = "battlePoint2";
|
||||
|
||||
protected const string PARAM_ENEMY_MASTER_POINT_KEY = "masterPoint2";
|
||||
|
||||
protected const string PARAM_ENEMY_RANK_KEY = "rank2";
|
||||
|
||||
protected const string PARAM_ENEMY_IS_OFFICIAL_KEY = "isOfficial2";
|
||||
|
||||
protected const string PARAM_ENEMY_DECK_KEY = "deck2";
|
||||
|
||||
protected const string PARAM_ENEMY_OPPO_DECK_COUNT_KEY = "oppoDeckCount";
|
||||
|
||||
protected const string PARAM_ENEMY_CHAOS_ID_KEY = "chaosId2";
|
||||
|
||||
protected const string PARAM_ENEMY_SUB_CLASS_ID_KEY = "subclassId2";
|
||||
|
||||
protected const string PARAM_ENEMY_MY_ROTATION_ID_KEY = "rotationId2";
|
||||
|
||||
protected const string PARAM_COMMON_IDX_KEY = "idx";
|
||||
|
||||
protected const string PARAM_COMMON_CARD_ID_KEY = "cardId";
|
||||
|
||||
protected const string PARAM_COMMON_IS_WIN_KEY = "is_win";
|
||||
|
||||
protected const string PARAM_COMMON_DECK_FORMAT_KEY = "deck_format";
|
||||
|
||||
protected const string PARAM_COMMON_IDX_CHANGE_SEED_KEY = "idxChangeSeed";
|
||||
|
||||
protected const string PARAM_COMMON_OPPO_IDX_CHANGE_SEED_KEY = "oppoIdxChangeSeed";
|
||||
|
||||
protected const string PARAM_COMMON_IS_CHAOS_SKIN_OVERRIDE_KEY = "isChaosSkinOverride";
|
||||
|
||||
protected const string PARAM_COMMON_MISSION_PARAMETER = "mission_parameter";
|
||||
|
||||
protected const string PARAM_COMMON_TURN_START_INDEX_LIST = "turn_start_index_list";
|
||||
|
||||
protected const string PARAM_COMMON_TWOPICK_TYPE = "twoPickType";
|
||||
|
||||
public UIManager.ViewScene ReplayEndBackScene { get; private set; }
|
||||
|
||||
public UIManager.ChangeViewSceneParam ReplayEndBackSceneParam { get; private set; }
|
||||
|
||||
public bool IsOfficialUser { get; set; }
|
||||
|
||||
public bool IsOpponentOfficialUser { get; set; }
|
||||
@@ -205,7 +97,7 @@ public class ReplayDetailInfo
|
||||
{
|
||||
IdxChangeSeed = -1;
|
||||
OppoIdxChangeSeed = -1;
|
||||
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
|
||||
DataMgr dataMgr = null; // Pre-Phase-5b: headless has no DataMgr
|
||||
battle_id = data["battleId"].ToLong();
|
||||
seed = data["seed"].ToInt();
|
||||
field_id = data["fieldId"].ToInt();
|
||||
@@ -268,7 +160,7 @@ public class ReplayDetailInfo
|
||||
string text = "deck1";
|
||||
if (data.Keys.Contains(text))
|
||||
{
|
||||
GameMgr.GetIns().GetDataMgr().SetDeckMaxCount(data[text].Count, isSelf: true);
|
||||
/* Pre-Phase-5b: SetDeckMaxCount dropped */
|
||||
}
|
||||
opponent_viewer_id = data["vid2"].ToInt();
|
||||
opponent_name = data["name2"].ToString();
|
||||
@@ -288,7 +180,7 @@ public class ReplayDetailInfo
|
||||
OpponentMyRotationId = (data.Keys.Contains("rotationId2") ? data["rotationId2"].ToString() : "");
|
||||
if (data.Keys.Contains("oppoDeckCount"))
|
||||
{
|
||||
GameMgr.GetIns().GetDataMgr().SetDeckMaxCount(data["oppoDeckCount"].ToInt(), isSelf: false);
|
||||
/* Pre-Phase-5b: SetDeckMaxCount dropped */
|
||||
}
|
||||
if (data.Keys.Contains("turn_start_index_list"))
|
||||
{
|
||||
@@ -300,12 +192,6 @@ public class ReplayDetailInfo
|
||||
}
|
||||
}
|
||||
|
||||
public void SetReplayEndBackScene(UIManager.ViewScene scene, UIManager.ChangeViewSceneParam param = null)
|
||||
{
|
||||
ReplayEndBackScene = scene;
|
||||
ReplayEndBackSceneParam = param;
|
||||
}
|
||||
|
||||
protected virtual void CheckMulliganFlags(JsonData data)
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user