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

97
SVSim.BattleEngine/Engine/Wizard.DeckCardEdit/CardObject.cs
View File

@@ -18,8 +18,6 @@ public class CardObject
public GameObject BlackOut;
private const float ALPHA_TIME = 0.3f;
public UseInfo(GameObject parent, CardMaster.CardMasterId cardMasterId)
{
Parent = parent;
@@ -67,41 +65,6 @@ public class CardObject
}
}
public void SetInfoDestruct(int haveNum, int destructNum, bool isMaintenance, bool isOnlySpotCard, CardMaster.CardMasterId cardMasterId)
{
if ((bool)CardInfoObj)
{
SystemText systemText = Data.SystemText;
if (isMaintenance)
{
SetMaintenance();
}
else if (destructNum <= 0)
{
TweenAlpha.Begin(CardInfoObj.gameObject, 0.3f, 0f);
}
else if (destructNum < haveNum)
{
TweenAlpha.Begin(CardInfoObj.gameObject, 0.3f, 1f);
CardInfoText.text = systemText.Get("Card_0169", destructNum.ToString());
}
else if (!isOnlySpotCard)
{
TweenAlpha.Begin(CardInfoObj.gameObject, 0.3f, 1f);
CardInfoText.text = systemText.Get("Card_0170", destructNum.ToString());
}
if (haveNum <= 0 && !isOnlySpotCard)
{
CardTemplateObj.AttachGrayShader();
}
else
{
CardTemplateObj.AttachShaders(cardMasterId);
}
BlackOut.gameObject.SetActive((haveNum > 0 && (destructNum >= haveNum || isMaintenance)) || isOnlySpotCard);
}
}
public void SetMaintenance()
{
TweenAlpha.Begin(CardInfoObj.gameObject, 0.3f, 1f);
@@ -136,24 +99,6 @@ public class CardObject
}
}
private const float FADE_DURATION = 0.18f;
private const float ROTATE_DURATION = 0.125f;
private const float SCALE_DURATION = 0.1f;
private const float SELECT_SCALE = 1.2f;
private const float EFFECT_SCALE = 500f;
private const float EFFECT_Z = -1f;
public const string EFFECT_CHAR_PATH = "cmn_frame_card_1";
public const string EFFECT_SPELL_PATH = "cmn_frame_card_3";
public const string EFFECT_FIELD_PATH = "cmn_frame_card_2";
private static readonly Vector3 SLEEVE_POSITION = new Vector3(0f, -0.5f, 0f);
private static readonly Vector3 SLEEVE_SCALE = new Vector3(1.025f, 1.025f, 1f);
@@ -288,7 +233,7 @@ public class CardObject
private bool IsIncludingSpotCard()
{
if (IsDisplaySpotCardNum && GameMgr.GetIns().GetDataMgr().SpotCardData.ExistsSpotCard(BaseCard.ids))
if (false /* Pre-Phase-5b: no spot card headless */)
{
if (IsHideZeroSpotCardNum)
{
@@ -463,7 +408,7 @@ public class CardObject
public void UpdateCardInfo(GameObject original, int haveNum, int haveNumWithFoil, int usedNum, int usedNumWithFoil, int sameKindNumMax, bool isMaintenance)
{
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
DataMgr dataMgr = null; // Pre-Phase-5b: headless has no DataMgr
MainCardNum = Mathf.Max(_formatBehavior.GetPossessionCardNum(BaseCard.ids, isIncludingSpotCard: false) - usedNum, 0);
SubCardNum = Mathf.Max(Mathf.Min(haveNum - usedNum, dataMgr.SpotCardData.GetSpotCardNum(BaseCard.ids)), 0);
PrepareCardInfo(original);
@@ -471,15 +416,6 @@ public class CardObject
VisibleCardNumLabel(haveNum > 0);
}
public void UpdateCardInfoDestruct(GameObject original, int haveNum, int destructNum, bool isMaintenance, bool isOnlySpotCard)
{
MainCardNum = haveNum - destructNum;
SubCardNum = GameMgr.GetIns().GetDataMgr().SpotCardData.GetSpotCardNum(BaseCard.ids);
PrepareCardInfo(original);
_info.SetInfoDestruct(haveNum, destructNum, isMaintenance, isOnlySpotCard, _formatBehavior.CardMasterId);
VisibleCardNumLabel(haveNum > 0 || isOnlySpotCard);
}
public void SetCardToMaintenance(GameObject original)
{
PrepareCardInfo(original);
@@ -506,26 +442,6 @@ public class CardObject
}
}
public void EnableAlpha(bool isEnable)
{
if (BaseCard != null && !(BaseCard.CardObj == null))
{
if (isEnable)
{
UITexture cardTexture = BaseCard.CardObj.GetComponent<CardListTemplate>()._cardTexture;
Texture mainTexture = cardTexture.material.mainTexture;
cardTexture.mainTexture = mainTexture;
cardTexture.material = null;
cardTexture.depth = -1;
cardTexture.Invalidate(includeChildren: false);
}
else
{
ResetMaterial();
}
}
}
public void ResetMaterial()
{
if (BaseCard != null && !(BaseCard.CardObj == null))
@@ -716,15 +632,6 @@ public class CardObject
}
}
public void AttachNormalShaderRotationOnlyIcon()
{
CardListTemplate component = CardObj.GetComponent<CardListTemplate>();
if (!(component == null))
{
component.AttachNormalShaderRotationOnlyIcon();
}
}
public void AttachRedShader()
{
CardListTemplate component = CardObj.GetComponent<CardListTemplate>();