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
@@ -15,18 +15,6 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
Prev
|
||||
}
|
||||
|
||||
public const int CARD_PER_PAGE_IN_SELECTION_AREA = 10;
|
||||
|
||||
public const int CARD_PER_PAGE = 8;
|
||||
|
||||
public const float CARD_WIDTH = 120f;
|
||||
|
||||
private const float DRAG_DEGREE = 70f;
|
||||
|
||||
public const float SELECTION_AREA_CARD_SCALE = 0.5f;
|
||||
|
||||
public const float PAGE_CARD_SCALE = 0.6f;
|
||||
|
||||
[SerializeField]
|
||||
protected MecanimStateBase _stateDefaultView;
|
||||
|
||||
@@ -76,9 +64,6 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
[SerializeField]
|
||||
protected GameObject m_cardInfoOriginal;
|
||||
|
||||
[SerializeField]
|
||||
private GameObject _hideFilter;
|
||||
|
||||
[SerializeField]
|
||||
private FilterController _prefabFilter;
|
||||
|
||||
@@ -165,8 +150,6 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsSliding => _slideType != SlideType.None;
|
||||
|
||||
protected bool IsShowCardDetailCraftPanel { get; set; } = true;
|
||||
|
||||
public IFormatBehavior FormatBehavior { get; private set; }
|
||||
@@ -265,7 +248,7 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
if (!_isDisableTouchWhileLoading)
|
||||
{
|
||||
SearchApplyOwn(m_searchInput.value);
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_COMMON_BUTTON);
|
||||
|
||||
}
|
||||
};
|
||||
m_searchInput.onSubmit.Add(new EventDelegate(delegate
|
||||
@@ -299,8 +282,7 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
_selectCardFilter.Hide();
|
||||
_pagingFilter.Hide();
|
||||
RegistFilterEvent();
|
||||
GameMgr.GetIns().GetGameObjMgr().GetUIContainer()
|
||||
.SetActive(value: false);
|
||||
/* Pre-Phase-5b: GameObjMgr.GetUIContainer().SetActive(false) dropped; headless has no UIContainer. */
|
||||
_stateEdit.ResetScroll();
|
||||
m_searchInput.value = "";
|
||||
m_searchCancelButton.gameObject.SetActive(value: false);
|
||||
@@ -336,7 +318,7 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
Toolbox.ResourcesManager.LoadObject<GameObject>(Toolbox.ResourcesManager.GetAssetTypePath("cmn_frame_card_2", ResourcesManager.AssetLoadPathType.Effect2D, isfetch: true)),
|
||||
Toolbox.ResourcesManager.LoadObject<GameObject>(Toolbox.ResourcesManager.GetAssetTypePath("cmn_frame_card_1", ResourcesManager.AssetLoadPathType.Effect2D, isfetch: true))
|
||||
};
|
||||
GameMgr.GetIns().GetEffectMgr().SetUIParticleShader(effectObjList, callback);
|
||||
/* Pre-Phase-5b: SetUIParticleShader dropped */ if (callback != null) callback();
|
||||
}
|
||||
|
||||
protected void SetupState()
|
||||
@@ -467,20 +449,9 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
}
|
||||
}
|
||||
|
||||
public void OnBtnPushSeachCancelOwn()
|
||||
{
|
||||
if (!IsLoading)
|
||||
{
|
||||
SearchApplyOwn("");
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_BTN_CANCEL);
|
||||
}
|
||||
}
|
||||
|
||||
private void PagingBase(Action<Action> anim, int page, Action next)
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_SLIDE_BTN);
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_DECK_CARD_MOVE_OUT);
|
||||
GameMgr.GetIns().GetSoundMgr().StopSe(Se.TYPE.SYS_CARDLIST_REVERSE);
|
||||
|
||||
anim.Call(delegate
|
||||
{
|
||||
if (LoadPagingCard(page))
|
||||
@@ -663,7 +634,7 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
|
||||
private void SelectCard(GameObject obj, bool isSelectionArea)
|
||||
{
|
||||
Se.TYPE setype = Se.TYPE.NONE;
|
||||
int setype = 0;
|
||||
CardObject cardObject = SelectionAreaList.FindWithObject(_detailTargetObj);
|
||||
if (cardObject == null)
|
||||
{
|
||||
@@ -672,16 +643,16 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
if (cardObject != null && cardObject.IsVisibleCursorEffect)
|
||||
{
|
||||
cardObject.ChangeSelectingState(isSelect: false);
|
||||
setype = Se.TYPE.SYS_CARD_INFO_CANCEL;
|
||||
setype = 0;
|
||||
}
|
||||
CardObject cardObject2 = (isSelectionArea ? SelectionAreaList.FindWithObject(obj) : PagingList.FindWithObject(obj));
|
||||
if (cardObject2 != null)
|
||||
{
|
||||
cardObject2.ChangeSelectingState(isSelect: true);
|
||||
setype = Se.TYPE.SYS_CARD_INFO_SMALL;
|
||||
setype = 0;
|
||||
}
|
||||
_detailTargetObj = obj;
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(setype);
|
||||
|
||||
}
|
||||
|
||||
protected virtual void AccordCardInfo()
|
||||
@@ -710,23 +681,6 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
}
|
||||
}
|
||||
|
||||
protected void ShowFilterMenu(FilterController filter, string title)
|
||||
{
|
||||
HideDetail();
|
||||
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
||||
dialogBase.SetSize(DialogBase.Size.XL);
|
||||
dialogBase.SetTitleLabel(title);
|
||||
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.OkBtn);
|
||||
dialogBase.SetObj(filter.gameObject);
|
||||
dialogBase.CloseOnOff(flag: false);
|
||||
filter.Show();
|
||||
dialogBase.OnClose = delegate
|
||||
{
|
||||
filter.Hide();
|
||||
filter.transform.parent = _hideFilter.transform;
|
||||
};
|
||||
}
|
||||
|
||||
protected virtual void OnValidateSelectionAreaFilter()
|
||||
{
|
||||
_stateCardDrag.OnChangeSelectionAreaFilter();
|
||||
@@ -772,7 +726,7 @@ public abstract class CardSelectListUIBase : MecanimSceneBase
|
||||
{
|
||||
_cardBundle.OnCreateCard(_simpleDetail.CardID);
|
||||
AccordCardInfo();
|
||||
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
|
||||
DataMgr dataMgr = null; // Pre-Phase-5b: headless has no DataMgr
|
||||
if (dataMgr.GetPossessionCardNum(_simpleDetail.CardID, _isSelectableSpotCard) == 1)
|
||||
{
|
||||
if (!_cardBundle.IsCraftMode)
|
||||
|
||||
Reference in New Issue
Block a user