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:
@@ -24,8 +24,8 @@ namespace Wizard.ErrorDialog
|
||||
// back to the static Wizard.Data god-object (CS0718/0722/0723 + missing ButtonType).
|
||||
public class Data
|
||||
{
|
||||
public enum ContactDisplayType { _NONE_, 表示, MAX }
|
||||
public enum ButtonType { _NONE_, OK, リトライ, タイトルへ戻る, ホームへ戻る, アプリ終了, バージョンアップ, 推奨端末一覧, MAX }
|
||||
public enum ContactDisplayType { }
|
||||
public enum ButtonType { _NONE_, OK, リトライ, タイトルへ戻る, ホームへ戻る, アプリ終了, バージョンアップ, 推奨端末一覧}
|
||||
|
||||
public string TitleId { get; private set; }
|
||||
public string BodyId { get; private set; }
|
||||
@@ -41,7 +41,7 @@ namespace Wizard.ErrorDialog
|
||||
|
||||
namespace Wizard.Battle.UI
|
||||
{
|
||||
public enum CantAttackType { Null, All, Class, NotHasGuard, Unit, Max }
|
||||
public enum CantAttackType { Null, All, Class, NotHasGuard, Unit}
|
||||
}
|
||||
|
||||
namespace Wizard.Battle.View
|
||||
@@ -96,50 +96,26 @@ namespace Wizard.Battle.View.Vfx
|
||||
|
||||
namespace AnimationOrTween
|
||||
{
|
||||
public enum DisableCondition { DisableAfterReverse = -1, DoNotDisable, DisableAfterForward }
|
||||
public enum EnableCondition { DoNothing, EnableThenPlay, IgnoreDisabledState }
|
||||
public enum DisableCondition { DoNotDisable}
|
||||
public enum EnableCondition { EnableThenPlay, IgnoreDisabledState }
|
||||
}
|
||||
|
||||
namespace Wizard.UI.LoginBonus
|
||||
{
|
||||
public class ContinuousData { public ContinuousData(LitJson.JsonData jsonData) { } }
|
||||
public class NormalData { public NormalData(LitJson.JsonData jsonData) { } }
|
||||
public class SpecialData { public SpecialData(LitJson.JsonData jsonData) { } }
|
||||
public class FreeCardPackBoxData { public FreeCardPackBoxData(LitJson.JsonData jsonData) { } }
|
||||
}
|
||||
|
||||
namespace DeckBuilder
|
||||
{
|
||||
public partial class GenerateDeckCode { }
|
||||
public partial class GetDeckDataFromCode { }
|
||||
}
|
||||
|
||||
namespace Wizard.Story.ChapterSelection.SelectionProcessing.BattleResult
|
||||
{
|
||||
public interface IProcessing
|
||||
{
|
||||
IProcessing NextProcessing { get; set; }
|
||||
void Execute(Parameter param);
|
||||
}
|
||||
// Parameter is generated full-surface (ctor + props) in Shim/Generated/Parameter__*.g.cs
|
||||
}
|
||||
|
||||
namespace Wizard.RoomMatch
|
||||
{
|
||||
public partial class PlayerControllerForWatching { } // SEND_PARAMETER enum is in Generated/PlayerControllerForWatching.g.cs
|
||||
public partial class RoomRuleSetting { }
|
||||
}
|
||||
|
||||
namespace Cute
|
||||
{
|
||||
public class SceneChangeParameter { public bool KeepAssets; public SceneType BeforeScene; public SceneType NextScene; public string NextState; }
|
||||
public class SceneManager
|
||||
{
|
||||
public SceneChangeParameter SceneChangeParameter = new SceneChangeParameter();
|
||||
public void ChangeScene(string next_scene) { }
|
||||
public void ChangeScene(string next_scene, string active_state) { }
|
||||
public void ChangeScene(SceneType type, string active_state = "") { }
|
||||
}
|
||||
}
|
||||
|
||||
namespace Wizard.Story
|
||||
@@ -147,54 +123,18 @@ namespace Wizard.Story
|
||||
public enum StoryApiType { None, MainStory, LimitedStory, EventStory }
|
||||
public partial class SelectedStoryInfo { }
|
||||
public partial class StoryWorldDataManager { }
|
||||
public sealed class StoryWorldData { } // signature-only type pulled by StoryWorldDataManager full-surface (non-battle)
|
||||
}
|
||||
|
||||
namespace Wizard.Title
|
||||
{
|
||||
// ITitleProc impls pulled by full-surface stubs; referenced as signature types only (non-battle).
|
||||
public class BattleRecovery { }
|
||||
public class ResourceDownloader { }
|
||||
public class TemporaryAssetDeleter { }
|
||||
}
|
||||
|
||||
namespace BestHTTP.SocketIO
|
||||
{
|
||||
// BestHTTP SDK types — minimal hand shim (full-surface would pull the whole SocketIO
|
||||
// closure). Node-server real-time socket path is Phase-2; these are off the battle path.
|
||||
public sealed class Packet { public System.Collections.Generic.List<byte[]> Attachments { get; set; } }
|
||||
public delegate void SocketIOCallback(Socket socket, Packet packet, params object[] args);
|
||||
public sealed class Socket
|
||||
{
|
||||
public string Id => "";
|
||||
public Socket On(string eventName, SocketIOCallback callback) => this;
|
||||
public Socket On(BestHTTP.SocketIO.SocketIOEventTypes type, SocketIOCallback callback) => this;
|
||||
public Socket Off(string eventName) => this;
|
||||
public Socket Off() => this;
|
||||
public Socket Emit(string eventName, params object[] args) => this;
|
||||
}
|
||||
public class SocketOptions
|
||||
{
|
||||
public bool AutoConnect { get; set; }
|
||||
public Transports.TransportTypes ConnectWith { get; set; }
|
||||
public PlatformSupport.Collections.ObjectModel.ObservableDictionary<string, string> AdditionalQueryParams { get; set; }
|
||||
}
|
||||
public sealed class SocketManager
|
||||
{
|
||||
public enum States { Initial, Opening, Open, Paused, Pausing, Reconnecting, Closed }
|
||||
public SocketManager(System.Uri uri) { }
|
||||
public SocketManager(System.Uri uri, SocketOptions options) { }
|
||||
public States State => States.Closed;
|
||||
public Socket Socket { get; } = new Socket();
|
||||
public Socket this[string nsp] => Socket;
|
||||
public void Open() { }
|
||||
public void Close() { }
|
||||
public void SettingRealtimeNetworkAgent(object agent) { }
|
||||
}
|
||||
}
|
||||
|
||||
// ---- namespace anchors (referenced via `using`/qualified path; no type used yet) ----
|
||||
namespace Wizard.Scripts.Network.Task { internal class _ShimAnchor { } }
|
||||
namespace Wizard.Scripts.Network.Task.Arena { internal class _ShimAnchor { } }
|
||||
namespace Wizard.Scripts.Network.Task.Arena.TwoPick { internal class _ShimAnchor { } }
|
||||
namespace BestHTTP.Decompression.Zlib { internal class _ShimAnchor { } }
|
||||
namespace Wizard.Scripts.Network.Task { }
|
||||
namespace Wizard.Scripts.Network.Task.Arena { }
|
||||
namespace Wizard.Scripts.Network.Task.Arena.TwoPick { }
|
||||
namespace BestHTTP.Decompression.Zlib { }
|
||||
|
||||
Reference in New Issue
Block a user