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>
202 lines
4.9 KiB
C#
202 lines
4.9 KiB
C#
using System;
|
|
using UnityEngine;
|
|
|
|
[ExecuteInEditMode]
|
|
[AddComponentMenu("NGUI/UI/Anchor")]
|
|
public class UIAnchor : MonoBehaviour
|
|
{
|
|
public enum Side
|
|
{
|
|
Left,
|
|
TopLeft,
|
|
Top,
|
|
TopRight,
|
|
Right,
|
|
BottomRight,
|
|
Bottom,
|
|
Center
|
|
}
|
|
|
|
public Camera uiCamera;
|
|
|
|
public GameObject container;
|
|
|
|
public Side side = Side.Center;
|
|
|
|
public bool runOnlyOnce = true;
|
|
|
|
public Vector2 relativeOffset = Vector2.zero;
|
|
|
|
public Vector2 pixelOffset = Vector2.zero;
|
|
|
|
private Transform mTrans;
|
|
|
|
private Animation mAnim;
|
|
|
|
private Rect mRect;
|
|
|
|
private UIRoot mRoot;
|
|
|
|
private bool mStarted;
|
|
|
|
private void Awake()
|
|
{
|
|
mTrans = base.transform;
|
|
mAnim = GetComponent<Animation>();
|
|
UICamera.onScreenResize = (UICamera.OnScreenResize)Delegate.Combine(UICamera.onScreenResize, new UICamera.OnScreenResize(ScreenSizeChanged));
|
|
}
|
|
|
|
private void ScreenSizeChanged()
|
|
{
|
|
if (mStarted && runOnlyOnce)
|
|
{
|
|
Update();
|
|
}
|
|
}
|
|
|
|
private void Update()
|
|
{
|
|
if (mAnim != null && mAnim.enabled && mAnim.isPlaying)
|
|
{
|
|
return;
|
|
}
|
|
bool flag = false;
|
|
UIWidget uIWidget = ((container == null) ? null : container.GetComponent<UIWidget>());
|
|
UIPanel uIPanel = ((container == null && uIWidget == null) ? null : container.GetComponent<UIPanel>());
|
|
if (uIWidget != null)
|
|
{
|
|
Bounds bounds = uIWidget.CalculateBounds(container.transform.parent);
|
|
mRect.x = bounds.min.x;
|
|
mRect.y = bounds.min.y;
|
|
mRect.width = bounds.size.x;
|
|
mRect.height = bounds.size.y;
|
|
}
|
|
else if (uIPanel != null)
|
|
{
|
|
if (uIPanel.clipping == UIDrawCall.Clipping.None)
|
|
{
|
|
float num = ((mRoot != null) ? ((float)mRoot.activeHeight / (float)Screen.height * 0.5f) : 0.5f);
|
|
mRect.xMin = (float)(-Screen.width) * num;
|
|
mRect.yMin = (float)(-Screen.height) * num;
|
|
mRect.xMax = 0f - mRect.xMin;
|
|
mRect.yMax = 0f - mRect.yMin;
|
|
}
|
|
else
|
|
{
|
|
Vector4 finalClipRegion = uIPanel.finalClipRegion;
|
|
mRect.x = finalClipRegion.x - finalClipRegion.z * 0.5f;
|
|
mRect.y = finalClipRegion.y - finalClipRegion.w * 0.5f;
|
|
mRect.width = finalClipRegion.z;
|
|
mRect.height = finalClipRegion.w;
|
|
}
|
|
}
|
|
else if (container != null)
|
|
{
|
|
Transform parent = container.transform.parent;
|
|
Bounds bounds2 = ((parent != null) ? NGUIMath.CalculateRelativeWidgetBounds(parent, container.transform) : NGUIMath.CalculateRelativeWidgetBounds(container.transform));
|
|
mRect.x = bounds2.min.x;
|
|
mRect.y = bounds2.min.y;
|
|
mRect.width = bounds2.size.x;
|
|
mRect.height = bounds2.size.y;
|
|
}
|
|
else
|
|
{
|
|
if (!(uiCamera != null))
|
|
{
|
|
return;
|
|
}
|
|
flag = true;
|
|
mRect = uiCamera.pixelRect;
|
|
}
|
|
float x = (mRect.xMin + mRect.xMax) * 0.5f;
|
|
float y = (mRect.yMin + mRect.yMax) * 0.5f;
|
|
Vector3 vector = new Vector3(x, y, 0f);
|
|
if (uIWidget == null && uIPanel == null && container == null && mRect.height / mRect.width < 0.5625f)
|
|
{
|
|
float width = mRect.width;
|
|
float num2 = mRect.width * AspectCamera.SafeAreaRate;
|
|
float num3 = width - num2;
|
|
mRect.width = num2;
|
|
mRect.xMin = num3 / 2f;
|
|
mRect.xMax = width - num3 / 2f;
|
|
}
|
|
if (side != Side.Center)
|
|
{
|
|
if (side == Side.Right || side == Side.TopRight || side == Side.BottomRight)
|
|
{
|
|
vector.x = mRect.xMax;
|
|
}
|
|
else if (side == Side.Top || side == Side.Center || side == Side.Bottom)
|
|
{
|
|
vector.x = x;
|
|
}
|
|
else
|
|
{
|
|
vector.x = mRect.xMin;
|
|
}
|
|
if (side == Side.Top || side == Side.TopRight || side == Side.TopLeft)
|
|
{
|
|
vector.y = mRect.yMax;
|
|
}
|
|
else if (side == Side.Left || side == Side.Center || side == Side.Right)
|
|
{
|
|
vector.y = y;
|
|
}
|
|
else
|
|
{
|
|
vector.y = mRect.yMin;
|
|
}
|
|
}
|
|
float width2 = mRect.width;
|
|
float height = mRect.height;
|
|
vector.x += pixelOffset.x + relativeOffset.x * width2;
|
|
vector.y += pixelOffset.y + relativeOffset.y * height;
|
|
if (flag)
|
|
{
|
|
if (uiCamera.orthographic)
|
|
{
|
|
vector.x = Mathf.Round(vector.x);
|
|
vector.y = Mathf.Round(vector.y);
|
|
}
|
|
vector.z = uiCamera.WorldToScreenPoint(mTrans.position).z;
|
|
vector = uiCamera.ScreenToWorldPoint(vector);
|
|
}
|
|
else
|
|
{
|
|
vector.x = Mathf.Round(vector.x);
|
|
vector.y = Mathf.Round(vector.y);
|
|
if (uIPanel != null)
|
|
{
|
|
vector = uIPanel.cachedTransform.TransformPoint(vector);
|
|
}
|
|
else if (container != null)
|
|
{
|
|
Transform parent2 = container.transform.parent;
|
|
if (parent2 != null)
|
|
{
|
|
vector = parent2.TransformPoint(vector);
|
|
}
|
|
}
|
|
vector.z = mTrans.position.z;
|
|
}
|
|
if (flag && uiCamera.orthographic && mTrans.parent != null)
|
|
{
|
|
vector = mTrans.parent.InverseTransformPoint(vector);
|
|
vector.x = Mathf.RoundToInt(vector.x);
|
|
vector.y = Mathf.RoundToInt(vector.y);
|
|
if (mTrans.localPosition != vector)
|
|
{
|
|
mTrans.localPosition = vector;
|
|
}
|
|
}
|
|
else if (mTrans.position != vector)
|
|
{
|
|
mTrans.position = vector;
|
|
}
|
|
if (runOnlyOnce && Application.isPlaying)
|
|
{
|
|
base.enabled = false;
|
|
}
|
|
}
|
|
}
|