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

21
SVSim.BattleEngine/Engine/Wizard.Battle.View.Vfx/NotEmptyNullVfx.cs
View File

@@ -1,21 +0,0 @@
namespace Wizard.Battle.View.Vfx;
public class NotEmptyNullVfx : VfxBase
{
private static NotEmptyNullVfx _instance;
public override bool IsEnd => true;
public static NotEmptyNullVfx GetInstance()
{
if (_instance == null)
{
_instance = new NotEmptyNullVfx();
}
return _instance;
}
protected NotEmptyNullVfx()
{
}
}

236
SVSim.BattleEngine/Engine/Wizard.Battle.View.Vfx/NullCardVfxCreator.cs
View File

@@ -1,236 +0,0 @@
using UnityEngine;
namespace Wizard.Battle.View.Vfx;
public class NullCardVfxCreator : ICardVfxCreator
{
private static NullCardVfxCreator m_instance;
public static NullCardVfxCreator GetInstance()
{
if (m_instance == null)
{
m_instance = new NullCardVfxCreator();
}
return m_instance;
}
private NullCardVfxCreator()
{
}
public VfxBase CreateDraw(Vector3 pos, bool isCardRare)
{
return NullVfx.GetInstance();
}
public VfxBase CreatePick()
{
return NullVfx.GetInstance();
}
public VfxBase CreateDestroy(BattleCardBase.DeathTypeInformation deathTypes, BattlePlayerBase battlePlayerBase)
{
return NullVfx.GetInstance();
}
public VfxBase CreateDestroyHand(BattleCardBase.DeathTypeInformation deathTypes, BattlePlayerBase battlePlayerBase)
{
return NullVfx.GetInstance();
}
public VfxBase CreateBanish(BattleCardBase.DeathTypeInformation deathTypes, BattlePlayerBase battlePlayerBase)
{
return NullVfx.GetInstance();
}
public VfxWithLoading CreateBanishHand(BattleCardBase.DeathTypeInformation deathTypes, BattlePlayerBase battlePlayerBase)
{
return NullVfxWithLoading.GetInstance();
}
public VfxBase CreateGeton(Transform vehicleCardTrans, IBattleCardView vehicleCardView, BattleCardBase.DeathTypeInformation deathTypes, BattlePlayerBase battlePlayerBase)
{
return NullVfxWithLoading.GetInstance();
}
public VfxWithLoading CreateFusionHand(BattlePlayerBase battlePlayerBase, IBattleCardView fusionCard, bool isFusionMetamorphose)
{
return NullVfxWithLoading.GetInstance();
}
public VfxBase CreateParameterChange(BattleCardBase.ParameterChangeInformation parameterChangeInfo, bool isDead, bool isEvolve, bool skipWait)
{
return NullVfx.GetInstance();
}
public VfxBase CreateBuffStart(BattleCardBase.ParameterChangeInformation parameterChangeInfo, bool useWait = true)
{
return NullVfx.GetInstance();
}
public VfxBase CreateBuffStop(BattleCardBase.ParameterChangeInformation parameterChangeInfo, bool useWait = true)
{
return NullVfx.GetInstance();
}
public VfxBase CreateDebuffStart(BattleCardBase.ParameterChangeInformation parameterChangeInfo, bool useWait = true)
{
return NullVfx.GetInstance();
}
public VfxBase CreateDebuffStop(BattleCardBase.ParameterChangeInformation parameterChangeInfo, bool useWait = true)
{
return NullVfx.GetInstance();
}
public VfxBase CreateBuffStartInHand(BattleCardBase.ParameterChangeInformation parameterChangeInfo, bool useWait = true, bool isDebuff = false)
{
return NullVfx.GetInstance();
}
public VfxBase CreateGuardStart()
{
return NullVfx.GetInstance();
}
public VfxBase CreateGuardStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateKillerStart()
{
return NullVfx.GetInstance();
}
public VfxBase CreateKillerStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateProtectionStart(ProtectionColorType tyep)
{
return NullVfx.GetInstance();
}
public VfxBase CreateProtectionStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateNotBeAttackedStart()
{
return NullVfx.GetInstance();
}
public VfxBase CreateNotBeAttackedStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateUntouchableStart()
{
return NullVfx.GetInstance();
}
public VfxBase CreateUntouchableStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateQuick(bool hasAttacksRemaining, bool isCardUnableToAttackClass)
{
return NullVfx.GetInstance();
}
public VfxBase CreateSneakStart()
{
return NullVfx.GetInstance();
}
public VfxBase CreateSneakStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateForceCantAttackStart()
{
return NullVfx.GetInstance();
}
public VfxBase CreateForceCantAttackStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateDrainStart()
{
return NullVfx.GetInstance();
}
public VfxBase CreateDrainStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateAttack(IBattleCardView attackCardView, IBattleCardView attackTargetCardView)
{
return NullVfx.GetInstance();
}
public VfxBase CreateAttackFloatUp()
{
return NullVfx.GetInstance();
}
public VfxBase CreateAttackFloatDown(bool isAttacker, bool isDead, int attackableCount)
{
return NullVfx.GetInstance();
}
public VfxBase CreateMoving(Vector3 pos)
{
return NullVfx.GetInstance();
}
public VfxBase CreateDamage(int damage, int currentHealth, int maxHealth, int baseHealth, bool isReflectedDamage, bool IsSkillDamage)
{
return NotEmptyNullVfx.GetInstance();
}
public VfxBase CreateHealing(int healAmount, int currentHealth, int maxHealth, int baseHealth)
{
return NullVfx.GetInstance();
}
public VfxBase CreateMaskCardInPlay()
{
return NullVfx.GetInstance();
}
public VfxBase CreateReflectionStart()
{
return NullVfx.GetInstance();
}
public VfxBase CreateReflectionStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateHeavenlyAegisStart()
{
return NullVfx.GetInstance();
}
public VfxBase CreateHeavenlyAegisStop()
{
return NullVfx.GetInstance();
}
public VfxBase CreateChangeAffiliation(BattleCardBase card, CardBasePrm.ClanType clan, bool showEffect)
{
return NullVfx.GetInstance();
}
}

4
SVSim.BattleEngine/Engine/Wizard.Battle.View.Vfx/NullVfxWithLoading.cs
View File

@@ -1,4 +1,8 @@
using System.Collections.Generic;
// TODO(engine-cleanup-pass2): 4 of 7 methods unrun in baseline
// Type: Wizard.Battle.View.Vfx.NullVfxWithLoading
// See data_dumps/reports/engine-cleanup/live-methods.baseline.txt
namespace Wizard.Battle.View.Vfx;

4
SVSim.BattleEngine/Engine/Wizard.Battle.View.Vfx/VfxResultEventExtension.cs
View File

@@ -1,4 +1,8 @@
using System;
// TODO(engine-cleanup-pass2): 4 of 6 methods unrun in baseline
// Type: Wizard.Battle.View.Vfx.VfxResultEventExtension
// See data_dumps/reports/engine-cleanup/live-methods.baseline.txt
namespace Wizard.Battle.View.Vfx;