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
@@ -4,8 +4,6 @@ namespace Wizard.Dialog.Setting;
|
||||
|
||||
public class ItemToggle : Item
|
||||
{
|
||||
[SerializeField]
|
||||
private SettingBase m_parant;
|
||||
|
||||
[SerializeField]
|
||||
private UILabel m_titleLabel;
|
||||
@@ -22,12 +20,6 @@ public class ItemToggle : Item
|
||||
[SerializeField]
|
||||
private GameObject m_separatorLineObj;
|
||||
|
||||
[SerializeField]
|
||||
private UISprite _spriteON;
|
||||
|
||||
[SerializeField]
|
||||
private UISprite _spriteOFF;
|
||||
|
||||
[SerializeField]
|
||||
private BoxCollider _collider;
|
||||
|
||||
@@ -59,7 +51,7 @@ public class ItemToggle : Item
|
||||
UpdateStateLabel();
|
||||
if (m_isPlaySe)
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(m_toggle.value ? Se.TYPE.SYS_TOGGLE_ON : Se.TYPE.SYS_TOGGLE_OFF);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -87,39 +79,6 @@ public class ItemToggle : Item
|
||||
m_titleLabel.text = title;
|
||||
}
|
||||
|
||||
public void SetSutTextLabel(string text)
|
||||
{
|
||||
_subTextLabel.gameObject.SetActive(value: true);
|
||||
_subTextLabel.text = text;
|
||||
}
|
||||
|
||||
public void SetStateText(string onText, string offText)
|
||||
{
|
||||
m_OnText = onText;
|
||||
m_OffText = offText;
|
||||
UpdateStateLabel();
|
||||
}
|
||||
|
||||
public void SetActive_StateText(bool isActive)
|
||||
{
|
||||
m_stateLabel.gameObject.SetActive(isActive);
|
||||
}
|
||||
|
||||
public void SetTitleTextLocalPos(Vector3 localPos)
|
||||
{
|
||||
m_titleLabel.transform.localPosition = localPos;
|
||||
}
|
||||
|
||||
public void SetStateTextLocalPos(Vector3 localPos)
|
||||
{
|
||||
m_stateLabel.transform.localPosition = localPos;
|
||||
}
|
||||
|
||||
public void SetToggleLocalPos(Vector3 localPos)
|
||||
{
|
||||
m_toggle.transform.localPosition = localPos;
|
||||
}
|
||||
|
||||
private void UpdateStateLabel()
|
||||
{
|
||||
if (!string.IsNullOrEmpty(m_OnText) && !string.IsNullOrEmpty(m_OffText))
|
||||
@@ -128,56 +87,6 @@ public class ItemToggle : Item
|
||||
}
|
||||
}
|
||||
|
||||
public void SetToggleLooks(bool isNormal)
|
||||
{
|
||||
UIManager.SetObjectToGrey(m_toggle.gameObject, !isNormal);
|
||||
bool value = GetValue();
|
||||
SetValue(!value, isDisablePlayse: false);
|
||||
SetValue(value, isDisablePlayse: false);
|
||||
_collider.enabled = isNormal;
|
||||
}
|
||||
|
||||
public void SetLabelLooks(bool isNormal)
|
||||
{
|
||||
UIManager.SetObjectToGrey(m_stateLabel.gameObject, !isNormal);
|
||||
UIManager.SetObjectToGrey(m_titleLabel.gameObject, !isNormal);
|
||||
}
|
||||
|
||||
public void SetSpriteONName(string spriteName, bool isMakePixelPerfect, bool isCollisionResize)
|
||||
{
|
||||
_spriteON.spriteName = spriteName;
|
||||
if (isMakePixelPerfect)
|
||||
{
|
||||
_spriteON.MakePixelPerfect();
|
||||
}
|
||||
if (isCollisionResize)
|
||||
{
|
||||
_collider.size = new Vector3(_spriteON.width, _spriteON.height);
|
||||
}
|
||||
}
|
||||
|
||||
public void SetSpriteOFFName(string spriteName, bool isMakePixelPerfect, bool isCollisionResize)
|
||||
{
|
||||
_spriteOFF.spriteName = spriteName;
|
||||
if (isMakePixelPerfect)
|
||||
{
|
||||
_spriteOFF.MakePixelPerfect();
|
||||
}
|
||||
if (isCollisionResize)
|
||||
{
|
||||
_collider.size = new Vector3(_spriteOFF.width, _spriteOFF.height);
|
||||
}
|
||||
}
|
||||
|
||||
public void SetButtonEnable(bool isEnable)
|
||||
{
|
||||
UIButton component = m_toggle.GetComponent<UIButton>();
|
||||
if (null != component && component.enabled != isEnable)
|
||||
{
|
||||
component.enabled = isEnable;
|
||||
}
|
||||
}
|
||||
|
||||
public void SetValidator(UIToggle.Validate validator)
|
||||
{
|
||||
m_toggle.validator = validator;
|
||||
@@ -188,45 +97,8 @@ public class ItemToggle : Item
|
||||
EventDelegate.Add(m_toggle.onChange, callback);
|
||||
}
|
||||
|
||||
public void ClearChangeCallback()
|
||||
{
|
||||
m_toggle.onChange.Clear();
|
||||
}
|
||||
|
||||
public void AddChangeCallback(EventDelegate callback)
|
||||
{
|
||||
m_toggle.onChange.Add(callback);
|
||||
}
|
||||
|
||||
public override void SetActive_SeparatorLine(bool isActive)
|
||||
{
|
||||
m_separatorLineObj.SetActive(isActive);
|
||||
}
|
||||
|
||||
public void SetScrollView(UIScrollView view)
|
||||
{
|
||||
_collider.gameObject.AddMissingComponent<UIDragScrollView>().scrollView = view;
|
||||
}
|
||||
|
||||
public void SetToggleEnable(bool isEnable)
|
||||
{
|
||||
if (!(m_toggle != null))
|
||||
{
|
||||
return;
|
||||
}
|
||||
m_toggle.enabled = isEnable;
|
||||
if (isEnable)
|
||||
{
|
||||
return;
|
||||
}
|
||||
TweenColor[] componentsInChildren = m_toggle.GetComponentsInChildren<TweenColor>();
|
||||
if (componentsInChildren != null)
|
||||
{
|
||||
TweenColor[] array = componentsInChildren;
|
||||
for (int i = 0; i < array.Length; i++)
|
||||
{
|
||||
array[i].enabled = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user