Files
SVSimServer/SVSim.BattleEngine/Engine/UIDragDropItem.cs
gamer147 2d9a6eea4b 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>
2026-07-03 19:18:54 -04:00

254 lines
5.6 KiB
C#

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
[AddComponentMenu("NGUI/Interaction/Drag and Drop Item")]
public class UIDragDropItem : MonoBehaviour
{
public enum Restriction
{
None,
Horizontal,
Vertical,
PressAndHold
}
public Restriction restriction;
public bool cloneOnDrag;
[HideInInspector]
public float pressAndHoldDelay = 1f;
public bool interactable = true;
public bool IsGridRepositionUse = true;
[NonSerialized]
protected Transform mTrans;
[NonSerialized]
protected Transform mParent;
[NonSerialized]
protected Collider mCollider;
[NonSerialized]
protected Collider2D mCollider2D;
[NonSerialized]
protected UIButton mButton;
[NonSerialized]
protected UIRoot mRoot;
[NonSerialized]
protected UIGrid mGrid;
[NonSerialized]
protected UITable mTable;
[NonSerialized]
protected float mDragStartTime;
[NonSerialized]
protected UIDragScrollView mDragScrollView;
[NonSerialized]
protected bool mPressed;
[NonSerialized]
protected bool mDragging;
[NonSerialized]
protected UICamera.MouseOrTouch mTouch;
public static List<UIDragDropItem> draggedItems = new List<UIDragDropItem>();
protected virtual void Awake()
{
mTrans = base.transform;
mCollider = base.gameObject.GetComponent<Collider>();
mCollider2D = base.gameObject.GetComponent<Collider2D>();
}
protected virtual void Start()
{
mButton = GetComponent<UIButton>();
mDragScrollView = GetComponent<UIDragScrollView>();
}
protected virtual void OnPress(bool isPressed)
{
if (!interactable || UICamera.currentTouchID == -2 || UICamera.currentTouchID == -3)
{
return;
}
if (isPressed)
{
if (!mPressed)
{
mTouch = UICamera.currentTouch;
mDragStartTime = RealTime.time + pressAndHoldDelay;
mPressed = true;
}
}
else if (mPressed && mTouch == UICamera.currentTouch)
{
mPressed = false;
mTouch = null;
}
}
protected virtual void Update()
{
if (restriction == Restriction.PressAndHold && mPressed && !mDragging && mDragStartTime < RealTime.time)
{
StartDragging();
}
}
protected virtual void OnDragStart()
{
if (!interactable || !base.enabled || mTouch != UICamera.currentTouch)
{
return;
}
if (restriction != Restriction.None)
{
if (restriction == Restriction.Horizontal)
{
Vector2 totalDelta = mTouch.totalDelta;
if (Mathf.Abs(totalDelta.x) < Mathf.Abs(totalDelta.y))
{
return;
}
}
else if (restriction == Restriction.Vertical)
{
Vector2 totalDelta2 = mTouch.totalDelta;
if (Mathf.Abs(totalDelta2.x) > Mathf.Abs(totalDelta2.y))
{
return;
}
}
else if (restriction == Restriction.PressAndHold)
{
return;
}
}
StartDragging();
}
public virtual void StartDragging()
{
if (!interactable || mDragging)
{
return;
}
if (cloneOnDrag)
{
mPressed = false;
GameObject gameObject = NGUITools.AddChild(base.transform.parent.gameObject, base.gameObject);
gameObject.transform.localPosition = base.transform.localPosition;
gameObject.transform.localRotation = base.transform.localRotation;
gameObject.transform.localScale = base.transform.localScale;
UIButtonColor component = gameObject.GetComponent<UIButtonColor>();
if (component != null)
{
component.defaultColor = GetComponent<UIButtonColor>().defaultColor;
}
if (mTouch != null && mTouch.pressed == base.gameObject)
{
mTouch.current = gameObject;
mTouch.pressed = gameObject;
mTouch.dragged = gameObject;
mTouch.last = gameObject;
}
UIDragDropItem component2 = gameObject.GetComponent<UIDragDropItem>();
component2.mTouch = mTouch;
component2.mPressed = true;
component2.mDragging = true;
component2.Start();
component2.OnClone(base.gameObject);
component2.OnDragDropStart();
if (UICamera.currentTouch == null)
{
UICamera.currentTouch = mTouch;
}
mTouch = null;
UICamera.Notify(base.gameObject, "OnPress", false);
UICamera.Notify(base.gameObject, "OnHover", false);
}
else
{
mDragging = true;
OnDragDropStart();
}
}
protected virtual void OnClone(GameObject original)
{
}
protected virtual void OnDragDropStart()
{
if (!draggedItems.Contains(this))
{
draggedItems.Add(this);
}
if (mDragScrollView != null)
{
mDragScrollView.enabled = false;
}
if (mButton != null)
{
mButton.isEnabled = false;
}
else if (mCollider != null)
{
mCollider.enabled = false;
}
else if (mCollider2D != null)
{
mCollider2D.enabled = false;
}
mParent = mTrans.parent;
mRoot = NGUITools.FindInParents<UIRoot>(mParent);
mGrid = NGUITools.FindInParents<UIGrid>(mParent);
mTable = NGUITools.FindInParents<UITable>(mParent);
if (UIDragDropRoot.root != null)
{
mTrans.parent = UIDragDropRoot.root;
}
Vector3 localPosition = mTrans.localPosition;
localPosition.z = 0f;
mTrans.localPosition = localPosition;
TweenPosition component = GetComponent<TweenPosition>();
if (component != null)
{
component.enabled = false;
}
SpringPosition component2 = GetComponent<SpringPosition>();
if (component2 != null)
{
component2.enabled = false;
}
NGUITools.MarkParentAsChanged(base.gameObject);
if (mTable != null)
{
mTable.repositionNow = true;
}
if (mGrid != null)
{
mGrid.repositionNow = true;
}
}
protected virtual void OnDragDropMove(Vector2 delta)
{
mTrans.localPosition += (Vector3)delta;
}
}