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,13 +7,9 @@ using Wizard.Battle.View;
|
||||
|
||||
public class SimpleCardDetail : CardDetailBase
|
||||
{
|
||||
private const string EVO_EFFECT_PATH = "cmn_deckedit_evo_1";
|
||||
|
||||
private int _cardID;
|
||||
|
||||
[SerializeField]
|
||||
private Transform _offset;
|
||||
|
||||
[SerializeField]
|
||||
private UILabel _attackLabel;
|
||||
|
||||
@@ -23,9 +19,6 @@ public class SimpleCardDetail : CardDetailBase
|
||||
[SerializeField]
|
||||
private BoxCollider _skillCollider;
|
||||
|
||||
[SerializeField]
|
||||
private UISprite _evoPanel;
|
||||
|
||||
[SerializeField]
|
||||
private UILabel _evoAttackLabel;
|
||||
|
||||
@@ -56,16 +49,9 @@ public class SimpleCardDetail : CardDetailBase
|
||||
[SerializeField]
|
||||
private BoxCollider _closeCollider;
|
||||
|
||||
[SerializeField]
|
||||
private PurchaseConfirm _purchaseConfirmPrefab;
|
||||
|
||||
[SerializeField]
|
||||
private UITweener[] _openTween;
|
||||
|
||||
private CardMake _cardMaker;
|
||||
|
||||
private List<BuffInfo> _buffList;
|
||||
|
||||
private BoxCollider _craftPanelCollider;
|
||||
|
||||
private DetailPanelInfo _currentPanel;
|
||||
@@ -116,71 +102,6 @@ public class SimpleCardDetail : CardDetailBase
|
||||
_currentPanel = _followerPanel;
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_cardMaker = base.gameObject.AddComponent<CardMake>();
|
||||
_cardMaker.OnCardBuy = delegate
|
||||
{
|
||||
UpdateCraftPanel();
|
||||
this.OnClickCreateButton.Call();
|
||||
};
|
||||
_cardMaker.OnCardSellId = delegate(int cardId)
|
||||
{
|
||||
UpdateCraftPanel();
|
||||
this.OnClickLiquefyButton.Call(cardId);
|
||||
};
|
||||
if ((bool)_closeCollider)
|
||||
{
|
||||
UIEventListener.Get(_closeCollider.gameObject).onClick = delegate
|
||||
{
|
||||
this.OnClickCloseButton.Call();
|
||||
};
|
||||
}
|
||||
Action onClickCreateBtn = delegate
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_BTN_DECIDE);
|
||||
OpenCraftDialog(delegate
|
||||
{
|
||||
_cardMaker.StartCardCraft(CardID);
|
||||
}, buy: true);
|
||||
};
|
||||
Action onClickDestructBtn = delegate
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_BTN_DECIDE);
|
||||
OpenCraftDialog(delegate
|
||||
{
|
||||
_cardMaker.StartCardDestruct(CardID);
|
||||
}, buy: false);
|
||||
};
|
||||
_craftPanel.Init(onClickCreateBtn, onClickDestructBtn);
|
||||
UIEventListener.Get(_followerPanel.DiscCollider.gameObject).onClick = delegate
|
||||
{
|
||||
if (UIManager.GetInstance().IsTouchable)
|
||||
{
|
||||
OpenSkillInfo(_followerPanel.DiscLabel, isEvol: false);
|
||||
}
|
||||
};
|
||||
BattlePlayerView.SetKeyWordColor(_followerPanel.DiscCollider.gameObject, _followerPanel.DiscLabel);
|
||||
UIEventListener.Get(_followerEvoPanel.DiscCollider.gameObject).onClick = delegate
|
||||
{
|
||||
if (UIManager.GetInstance().IsTouchable)
|
||||
{
|
||||
OpenSkillInfo(_followerEvoPanel.DiscLabel, isEvol: true);
|
||||
}
|
||||
};
|
||||
BattlePlayerView.SetKeyWordColor(_followerEvoPanel.DiscCollider.gameObject, _followerEvoPanel.DiscLabel);
|
||||
UIEventListener.Get(_nonFollowerPanel.DiscCollider.gameObject).onClick = delegate
|
||||
{
|
||||
OpenSkillInfo(_nonFollowerPanel.DiscLabel, isEvol: false);
|
||||
};
|
||||
BattlePlayerView.SetKeyWordColor(_nonFollowerPanel.DiscCollider.gameObject, _nonFollowerPanel.DiscLabel);
|
||||
_followerPanel.Initialize();
|
||||
_nonFollowerPanel.Initialize();
|
||||
_followerEvoPanel.Initialize();
|
||||
_craftPanelCollider = _craftPanel.GetComponent<BoxCollider>();
|
||||
HideDetail();
|
||||
}
|
||||
|
||||
public void ChangeDetail(int id, CardMaster.CardMasterId cardMasterId, MyRotationInfo myRotationInfo = null)
|
||||
{
|
||||
if (!IsVisible || CardID != id)
|
||||
@@ -236,22 +157,12 @@ public class SimpleCardDetail : CardDetailBase
|
||||
IsDetailPanelDragging = false;
|
||||
}
|
||||
|
||||
public void SetLocalOffset(Vector3 pos)
|
||||
{
|
||||
_offset.localPosition = pos;
|
||||
}
|
||||
|
||||
public void ActiveCraftPanel(bool isActive)
|
||||
{
|
||||
_craftPanel.gameObject.SetActive(isActive);
|
||||
UpdateCraftPanel();
|
||||
}
|
||||
|
||||
public void ActiveCloseCollider(bool isActive)
|
||||
{
|
||||
_closeCollider.enabled = isActive;
|
||||
}
|
||||
|
||||
private void ActivePanelColliders(bool isActive)
|
||||
{
|
||||
_skillColliderEvo.enabled = isActive;
|
||||
@@ -281,7 +192,7 @@ public class SimpleCardDetail : CardDetailBase
|
||||
{
|
||||
SetDescLabelText(_currentPanel, CardParam.ConvertedSkillDescription);
|
||||
}
|
||||
_currentPanel._classLabel.text = GameMgr.GetIns().GetDataMgr().GetClanNameByKey((int)CardParam.Clan);
|
||||
_currentPanel._classLabel.text = ((int)CardParam.Clan).ToString(); // Pre-Phase-5b: no clan-name lookup
|
||||
if (CardParam.TribeName != "ALL")
|
||||
{
|
||||
UILabel classLabel = _currentPanel._classLabel;
|
||||
@@ -306,18 +217,6 @@ public class SimpleCardDetail : CardDetailBase
|
||||
}
|
||||
}
|
||||
|
||||
private void SetDragEvent(BoxCollider dragCollider)
|
||||
{
|
||||
UIEventListener.Get(dragCollider.gameObject).onDragStart = delegate
|
||||
{
|
||||
IsDetailPanelDragging = true;
|
||||
};
|
||||
UIEventListener.Get(dragCollider.gameObject).onDragEnd = delegate
|
||||
{
|
||||
IsDetailPanelDragging = false;
|
||||
};
|
||||
}
|
||||
|
||||
private void UpdateCraftPanel()
|
||||
{
|
||||
if (CardParam != null && !(_craftPanel == null) && _craftPanel.gameObject.activeInHierarchy)
|
||||
@@ -363,43 +262,6 @@ public class SimpleCardDetail : CardDetailBase
|
||||
}
|
||||
}
|
||||
|
||||
private void OpenSkillInfo(UILabel label, bool isEvol)
|
||||
{
|
||||
CardParameter cardParameterFromId = CardMaster.GetInstance(_cardMasterId).GetCardParameterFromId(CardID);
|
||||
if (cardParameterFromId != null && (isEvol ? cardParameterFromId.EvoSkillDescription : cardParameterFromId.SkillDescription).Length > 0 && BattlePlayerView.HasKeyword(cardParameterFromId) && !UIManager.GetInstance().isOpenDialog())
|
||||
{
|
||||
BattlePlayerView.CreateKeyPanel(cardParameterFromId.ConvertedSkillDescription + cardParameterFromId.ConvertedEvoSkillDescription, label, _cardMasterId);
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_COMMON_BUTTON);
|
||||
}
|
||||
}
|
||||
|
||||
private void OpenCraftDialog(Action onOk, bool buy)
|
||||
{
|
||||
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
||||
PurchaseConfirm purchaseConfirm = UnityEngine.Object.Instantiate(_purchaseConfirmPrefab);
|
||||
dialogBase.SetObj(purchaseConfirm.gameObject);
|
||||
int userRedEtherCount = PlayerStaticData.UserRedEtherCount;
|
||||
SystemText systemText = Data.SystemText;
|
||||
CardParameter cardParameterFromId = CardMaster.GetInstance(_cardMasterId).GetCardParameterFromId(CardID);
|
||||
if (buy)
|
||||
{
|
||||
dialogBase.SetTitleLabel(systemText.Get("Card_0081"));
|
||||
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.BlueBtn_CancelBtn);
|
||||
dialogBase.SetButtonText(systemText.Get("Dia_CardList_003_Button"));
|
||||
int useRedEther = cardParameterFromId.UseRedEther;
|
||||
purchaseConfirm.SetCardBuy(systemText.Get("Common_0205"), userRedEtherCount, useRedEther, cardParameterFromId);
|
||||
}
|
||||
else
|
||||
{
|
||||
dialogBase.SetTitleLabel(systemText.Get("Card_0080"));
|
||||
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.RedBtn_CancelBtn);
|
||||
dialogBase.SetButtonText(systemText.Get("Dia_CardList_002_Button"));
|
||||
int getRedEther = cardParameterFromId.GetRedEther;
|
||||
purchaseConfirm.SetCardSell(systemText.Get("Common_0205"), userRedEtherCount, getRedEther, cardParameterFromId.CardName, cardParameterFromId.IsFoil);
|
||||
}
|
||||
dialogBase.onPushButton1 = onOk;
|
||||
}
|
||||
|
||||
private string GetIllustPath(int id, bool isFetch)
|
||||
{
|
||||
CardMaster instance = CardMaster.GetInstance(_cardMasterId);
|
||||
|
||||
Reference in New Issue
Block a user