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
@@ -21,8 +21,6 @@ public class UIPanel : UIRect
|
||||
|
||||
public OnGeometryUpdated onGeometryUpdated;
|
||||
|
||||
public bool showInPanelTool = true;
|
||||
|
||||
public bool generateNormals;
|
||||
|
||||
public bool widgetsAreStatic;
|
||||
@@ -116,24 +114,6 @@ public class UIPanel : UIRect
|
||||
|
||||
private bool mForced;
|
||||
|
||||
public static int nextUnusedDepth
|
||||
{
|
||||
get
|
||||
{
|
||||
int num = int.MinValue;
|
||||
int i = 0;
|
||||
for (int count = list.Count; i < count; i++)
|
||||
{
|
||||
num = Mathf.Max(num, list[i].depth);
|
||||
}
|
||||
if (num != int.MinValue)
|
||||
{
|
||||
return num + 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
public override bool canBeAnchored => mClipping != UIDrawCall.Clipping.None;
|
||||
|
||||
public override float alpha
|
||||
@@ -187,8 +167,6 @@ public class UIPanel : UIRect
|
||||
}
|
||||
}
|
||||
|
||||
public float width => GetViewSize().x;
|
||||
|
||||
public float height => GetViewSize().y;
|
||||
|
||||
public bool halfPixelOffset => mHalfPixelOffset;
|
||||
@@ -266,23 +244,8 @@ public class UIPanel : UIRect
|
||||
}
|
||||
}
|
||||
|
||||
public bool hasClipping
|
||||
{
|
||||
get
|
||||
{
|
||||
if (mClipping != UIDrawCall.Clipping.SoftClip)
|
||||
{
|
||||
return mClipping == UIDrawCall.Clipping.TextureMask;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public bool hasCumulativeClipping => clipCount != 0;
|
||||
|
||||
[Obsolete("Use 'hasClipping' or 'hasCumulativeClipping' instead")]
|
||||
public bool clipsChildren => hasCumulativeClipping;
|
||||
|
||||
public Vector2 clipOffset
|
||||
{
|
||||
get
|
||||
@@ -303,34 +266,6 @@ public class UIPanel : UIRect
|
||||
}
|
||||
}
|
||||
|
||||
public Texture2D clipTexture
|
||||
{
|
||||
get
|
||||
{
|
||||
return mClipTexture;
|
||||
}
|
||||
set
|
||||
{
|
||||
if (mClipTexture != value)
|
||||
{
|
||||
mClipTexture = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[Obsolete("Use 'finalClipRegion' or 'baseClipRegion' instead")]
|
||||
public Vector4 clipRange
|
||||
{
|
||||
get
|
||||
{
|
||||
return baseClipRegion;
|
||||
}
|
||||
set
|
||||
{
|
||||
baseClipRegion = value;
|
||||
}
|
||||
}
|
||||
|
||||
public Vector4 baseClipRegion
|
||||
{
|
||||
get
|
||||
@@ -631,37 +566,6 @@ public class UIPanel : UIRect
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool IsVisible(Vector3 worldPos)
|
||||
{
|
||||
if (mAlpha < 0.001f)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (mClipping == UIDrawCall.Clipping.None || mClipping == UIDrawCall.Clipping.ConstrainButDontClip)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
UpdateTransformMatrix();
|
||||
Vector3 vector = worldToLocal.MultiplyPoint3x4(worldPos);
|
||||
if (vector.x < mMin.x)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (vector.y < mMin.y)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (vector.x > mMax.x)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (vector.y > mMax.y)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool IsVisible(UIWidget w)
|
||||
{
|
||||
UIPanel uIPanel = this;
|
||||
@@ -686,33 +590,6 @@ public class UIPanel : UIRect
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool Affects(UIWidget w)
|
||||
{
|
||||
if (w == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
UIPanel panel = w.panel;
|
||||
if (panel == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
UIPanel uIPanel = this;
|
||||
while (uIPanel != null)
|
||||
{
|
||||
if (uIPanel == panel)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (!uIPanel.hasCumulativeClipping)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
uIPanel = uIPanel.mParentPanel;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
[ContextMenu("Force Refresh")]
|
||||
public void RebuildAllDrawCalls()
|
||||
{
|
||||
@@ -1479,16 +1356,6 @@ public class UIPanel : UIRect
|
||||
return ConstrainTargetToBounds(target, ref targetBounds, immediate);
|
||||
}
|
||||
|
||||
public static UIPanel Find(Transform trans)
|
||||
{
|
||||
return Find(trans, createIfMissing: false, -1);
|
||||
}
|
||||
|
||||
public static UIPanel Find(Transform trans, bool createIfMissing)
|
||||
{
|
||||
return Find(trans, createIfMissing, -1);
|
||||
}
|
||||
|
||||
public static UIPanel Find(Transform trans, bool createIfMissing, int layer)
|
||||
{
|
||||
UIPanel uIPanel = NGUITools.FindInParents<UIPanel>(trans);
|
||||
|
||||
Reference in New Issue
Block a user