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:
@@ -9,17 +9,6 @@ using Wizard.RoomMatch;
|
||||
|
||||
public class DeckDecisionUI : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
private UILabel _textForOneLine;
|
||||
|
||||
[SerializeField]
|
||||
private UILabel _descTextLabel;
|
||||
|
||||
[SerializeField]
|
||||
private UILabel _deckNameTextLabel;
|
||||
|
||||
[SerializeField]
|
||||
private ItemToggle m_simpleStageToggle;
|
||||
|
||||
[SerializeField]
|
||||
private GameObject _uiCardListPrefab;
|
||||
@@ -27,17 +16,10 @@ public class DeckDecisionUI : MonoBehaviour
|
||||
[SerializeField]
|
||||
private GameObject _cardDetailPrefab;
|
||||
|
||||
[SerializeField]
|
||||
private UILabel _optionLabel;
|
||||
|
||||
protected List<string> _loadCardAssetList;
|
||||
|
||||
private bool _textSetEnd;
|
||||
|
||||
protected static int DetailLayer;
|
||||
|
||||
protected const float CARD_DETAIL_Z = -300f;
|
||||
|
||||
private ConventionDeckList conventionDeckList;
|
||||
|
||||
public bool IsCanShowQRCode = true;
|
||||
@@ -48,8 +30,6 @@ public class DeckDecisionUI : MonoBehaviour
|
||||
|
||||
public string DeckName { get; set; }
|
||||
|
||||
public UILabel OptionLabel => _optionLabel;
|
||||
|
||||
public Action<UICardList> CardListCustomize { get; set; }
|
||||
|
||||
protected CardDetailUI CardDetail { get; set; }
|
||||
@@ -67,74 +47,6 @@ public class DeckDecisionUI : MonoBehaviour
|
||||
_formatBehavior = FormatBehaviorManager.Create(deck.Format, deckList);
|
||||
}
|
||||
|
||||
public virtual void Start()
|
||||
{
|
||||
DetailLayer = LayerMask.NameToLayer("MyPage");
|
||||
UIWidget component = GetComponent<UIWidget>();
|
||||
if (!_textSetEnd)
|
||||
{
|
||||
_descTextLabel.text = Data.SystemText.Get("Card_0006");
|
||||
_deckNameTextLabel.text = Data.SystemText.Get("Card_0299", DeckName);
|
||||
SetTextLabelesState(string.IsNullOrEmpty(_descTextLabel.text), string.IsNullOrEmpty(_deckNameTextLabel.text));
|
||||
}
|
||||
if (IsShowSimpleStageOption)
|
||||
{
|
||||
SettingToggle_SimpleStage();
|
||||
component.pivot = UIWidget.Pivot.Center;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_simpleStageToggle.gameObject.SetActive(value: false);
|
||||
component.pivot = UIWidget.Pivot.Bottom;
|
||||
}
|
||||
}
|
||||
|
||||
public void SetText(string descText, string cardDeckText)
|
||||
{
|
||||
_textForOneLine.text = descText;
|
||||
_descTextLabel.text = descText;
|
||||
_deckNameTextLabel.text = cardDeckText;
|
||||
SetTextLabelesState(string.IsNullOrEmpty(descText), string.IsNullOrEmpty(cardDeckText));
|
||||
_textSetEnd = true;
|
||||
}
|
||||
|
||||
protected void OnDestroy()
|
||||
{
|
||||
if (_loadCardAssetList != null)
|
||||
{
|
||||
Toolbox.ResourcesManager.RemoveAssetGroup(_loadCardAssetList);
|
||||
_loadCardAssetList = null;
|
||||
}
|
||||
if (UiCardList != null)
|
||||
{
|
||||
UnityEngine.Object.Destroy(UiCardList.gameObject);
|
||||
UiCardList = null;
|
||||
}
|
||||
if (CardDetail != null)
|
||||
{
|
||||
UnityEngine.Object.Destroy(CardDetail.gameObject);
|
||||
CardDetail = null;
|
||||
}
|
||||
}
|
||||
|
||||
protected ItemToggle SettingToggle_SimpleStage(bool isSperatorUse = true)
|
||||
{
|
||||
SystemText systemText = Data.SystemText;
|
||||
ItemToggle item = m_simpleStageToggle;
|
||||
item.SetTitleLabel(systemText.Get("OtherConfig_0022"));
|
||||
item.SetValue(PlayerPrefsWrapper.GetBool(PlayerPrefsWrapper.SIMPLE_STAGE));
|
||||
item.AddChangeCallback(delegate
|
||||
{
|
||||
bool value = item.GetValue();
|
||||
PlayerPrefsWrapper.SetBool(PlayerPrefsWrapper.SIMPLE_STAGE, value);
|
||||
});
|
||||
if (isSperatorUse)
|
||||
{
|
||||
item.SetActive_SeparatorLine(isActive: true);
|
||||
}
|
||||
return item;
|
||||
}
|
||||
|
||||
public void OnClickCreateCardList()
|
||||
{
|
||||
CheckTimeSlipRotationPeriodTask task = new CheckTimeSlipRotationPeriodTask();
|
||||
@@ -223,23 +135,4 @@ public class DeckDecisionUI : MonoBehaviour
|
||||
{
|
||||
UIManager.GetInstance().ActiveChangeDialogAll(inDisp);
|
||||
}
|
||||
|
||||
private void SetTextLabelesState(bool noDescText, bool noDeckNameText)
|
||||
{
|
||||
if (noDescText && noDeckNameText)
|
||||
{
|
||||
_textForOneLine.gameObject.SetActive(value: false);
|
||||
_descTextLabel.gameObject.SetActive(value: false);
|
||||
_deckNameTextLabel.gameObject.SetActive(value: false);
|
||||
}
|
||||
else if (noDeckNameText)
|
||||
{
|
||||
_descTextLabel.gameObject.SetActive(value: false);
|
||||
_deckNameTextLabel.gameObject.SetActive(value: false);
|
||||
}
|
||||
else
|
||||
{
|
||||
_textForOneLine.gameObject.SetActive(value: false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user