SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

engine cleanup passes 4-7 + multi-instancing ambient rip

Browse Source 
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
2026-07-03 19:18:54 -04:00
parent 5c1db83967
commit 2d9a6eea4b
2045 changed files with 11704 additions and 158495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
SVSim.BattleEngine/Engine/Wizard.DeckCardEdit/CardSelectListUI_State_CardDrag.cs
View File

@@ -95,19 +95,6 @@ public class CardSelectListUI_State_CardDrag : MecanimStateBase
m_parentCloneCard.gameObject.layer = LayerMask.NameToLayer("Detail");
}
private void Start()
{
if (m_scene == null)
{
MonoBehaviour.print("シーンがセットされていません");
}
_colliderSelectionArea.gameObject.SetActive(value: false);
_colliderPagingArea.gameObject.SetActive(value: false);
m_darkMask_Insert.gameObject.SetActive(value: false);
m_darkMask_Grab.gameObject.SetActive(value: false);
_sameCardAddCollider.gameObject.SetActive(value: false);
}
public override bool onCloseRequest(MecanimStateBase next, bool isSkip)
{
if (!(next == _stateEdit))
@@ -134,7 +121,7 @@ public class CardSelectListUI_State_CardDrag : MecanimStateBase
m_removeInfo.SetActive(value: true);
break;
}
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_DRAG_CARD);
}
public override void onFinishCloseAnim()
@@ -276,14 +263,14 @@ public class CardSelectListUI_State_CardDrag : MecanimStateBase
}
base.CloseStateName = m_closeStateName_Insert;
_isFlashWhenInsert = true;
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_DECK_CARD_MOVE_IN);
}
else
{
m_parentClone_Insert.gameObject.SetActive(value: false);
base.CloseStateName = m_closeStateName_Insert;
_isFlashWhenInsert = false;
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_DECK_CARD_MOVE_IN);
}
}
@@ -305,7 +292,7 @@ public class CardSelectListUI_State_CardDrag : MecanimStateBase
m_parentClone_Grab.alpha = 0f;
base.CloseStateName = "";
m_darkMask_Grab.gameObject.SetActive(value: false);
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_DECK_CARD_MOVE_OUT);
break;
}
break;
@@ -322,7 +309,7 @@ public class CardSelectListUI_State_CardDrag : MecanimStateBase
m_parentClone_Grab.alpha = 0f;
base.CloseStateName = "";
m_darkMask_Grab.gameObject.SetActive(value: false);
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_DECK_CARD_MOVE_OUT);
break;
case Area.OutSelectionArea:
{
@@ -343,7 +330,7 @@ public class CardSelectListUI_State_CardDrag : MecanimStateBase
_stateEdit.RefreshSelectionArea(isImmediate: false);
_stateEdit.RefreshPage(isImmediate: true);
base.CloseStateName = m_closeStateName_Remove;
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_DECK_OUT);
break;
}
}
@@ -375,7 +362,7 @@ public class CardSelectListUI_State_CardDrag : MecanimStateBase
}
if (_lastDragArea != Area.NoSelectionArea)
{
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_DECK_IN);
}
}
}
@@ -407,7 +394,7 @@ public class CardSelectListUI_State_CardDrag : MecanimStateBase
{
return null;
}
bool flag = !IsDraggableMaintenance && GameMgr.GetIns().GetDataMgr().IsMaintenanceCard(grabCard.CardId);
bool flag = false; // Pre-Phase-5b: no maintenance list headless
if (grabCard.IsVisibleSleeve || flag)
{
return null;
@@ -579,51 +566,4 @@ public class CardSelectListUI_State_CardDrag : MecanimStateBase
{
DestroyDragCard();
}
public void DragEmulate(CardObject original, CardObject target)
{
CloneToGrab(original);
StartCoroutine(MoveToTarget(m_parentClone_Grab.transform, target.CardObj.transform));
}
public void DropDown(CardObject original)
{
CloneToGrab(original);
Vector3 point = m_parentClone_Grab.transform.position + Vector3.down * 0.5f;
StartCoroutine(MoveToPoint(m_parentClone_Grab.transform, point));
TweenAlpha.Begin(m_parentClone_Grab.gameObject, 0.15f, 0f);
}
private void CloneToGrab(CardObject original)
{
Vector3 position = original.CardObj.transform.position;
DestroyDragCard();
CreateDragCard(original);
m_parentClone_Grab.transform.position = position;
m_parentClone_Grab.transform.localScale = Vector3.one;
m_parentClone_Grab.alpha = 1f;
m_darkMask_Grab.gameObject.SetActive(value: false);
m_darkMask_Insert.gameObject.SetActive(value: false);
m_parentClone_Insert.gameObject.SetActive(value: false);
}
private IEnumerator MoveToTarget(Transform obj, Transform target)
{
for (float num = Vector3.Distance(target.position, obj.position); num >= 0.05f; num = Vector3.Distance(target.position, obj.position))
{
obj.position += (target.position - obj.position) * 0.4f;
yield return null;
}
DestroyDragCard();
}
private IEnumerator MoveToPoint(Transform obj, Vector3 point)
{
for (float num = Vector3.Distance(point, obj.position); num >= 0.05f; num = Vector3.Distance(point, obj.position))
{
obj.position += (point - obj.position) * 0.4f;
yield return null;
}
DestroyDragCard();
}
}