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
@@ -7,11 +7,6 @@ namespace Wizard;
|
||||
|
||||
public class CardSelectListConfirmPagerView : MonoBehaviour
|
||||
{
|
||||
private const float CARD_SCALE = 0.55f;
|
||||
|
||||
private const int CARD_NUM_PER_PAGE = 8;
|
||||
|
||||
private const float DRAG_VALUE = 70f;
|
||||
|
||||
[SerializeField]
|
||||
private UIButton _buttonNext;
|
||||
@@ -19,9 +14,6 @@ public class CardSelectListConfirmPagerView : MonoBehaviour
|
||||
[SerializeField]
|
||||
private UIButton _buttonPrev;
|
||||
|
||||
[SerializeField]
|
||||
private GameObject _pagingDragPanel;
|
||||
|
||||
[SerializeField]
|
||||
private UIGrid _gridCardList;
|
||||
|
||||
@@ -44,8 +36,6 @@ public class CardSelectListConfirmPagerView : MonoBehaviour
|
||||
|
||||
private Dictionary<int, int> _dictCardIdNum = new Dictionary<int, int>();
|
||||
|
||||
public Action OnCallbackRemoveCard;
|
||||
|
||||
protected int _currentPage;
|
||||
|
||||
private List<UIToggle> _indicatorList = new List<UIToggle>();
|
||||
@@ -58,8 +48,6 @@ public class CardSelectListConfirmPagerView : MonoBehaviour
|
||||
|
||||
private bool _isDrag;
|
||||
|
||||
public List<string> LoadedAssetPathList => _loadedAssetPathList;
|
||||
|
||||
public Dictionary<int, int> DictCardIdNum
|
||||
{
|
||||
get
|
||||
@@ -72,12 +60,6 @@ public class CardSelectListConfirmPagerView : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
UIEventListener.Get(_pagingDragPanel).onDrag = OnDrag;
|
||||
UIEventListener.Get(_pagingDragPanel).onDragEnd = OnDragEnd;
|
||||
}
|
||||
|
||||
private void OnDrag(GameObject obj, Vector2 dir)
|
||||
{
|
||||
if (!_isDrag && Mathf.Abs(dir.x) >= 70f)
|
||||
@@ -262,7 +244,7 @@ public class CardSelectListConfirmPagerView : MonoBehaviour
|
||||
uIEventListener.onClick = _cardDetailUI.OnPushCardDetailOn;
|
||||
uIEventListener.onDrag = OnDrag;
|
||||
uIEventListener.onDragEnd = OnDragEnd;
|
||||
if (GameMgr.GetIns().GetDataMgr().IsMaintenanceCard(ids))
|
||||
if (false /* Pre-Phase-5b: no maintenance list */)
|
||||
{
|
||||
SetBlackOutCardInfoText(cardObj, text);
|
||||
}
|
||||
@@ -305,7 +287,7 @@ public class CardSelectListConfirmPagerView : MonoBehaviour
|
||||
if (_isInit && !_cardDetailUI.GetIsDetailOn() && _currentPage < _dictPageCardObj.Count)
|
||||
{
|
||||
ViewCardList(++_currentPage);
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_SLIDE_BTN);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -314,7 +296,7 @@ public class CardSelectListConfirmPagerView : MonoBehaviour
|
||||
if (_isInit && !_cardDetailUI.GetIsDetailOn() && _currentPage > 1)
|
||||
{
|
||||
ViewCardList(--_currentPage);
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_SLIDE_BTN);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -344,7 +326,7 @@ public class CardSelectListConfirmPagerView : MonoBehaviour
|
||||
|
||||
private List<int> SortCardIdList(List<int> idList)
|
||||
{
|
||||
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
|
||||
DataMgr dataMgr = null; // Pre-Phase-5b: headless has no DataMgr
|
||||
List<int> list = new List<int>();
|
||||
List<int> list2 = new List<int>();
|
||||
List<int> list3 = new List<int>();
|
||||
|
||||
Reference in New Issue
Block a user