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

77
SVSim.BattleEngine/Engine/Wizard/UIUtil.cs
View File

@@ -8,7 +8,6 @@ namespace Wizard;
public static class UIUtil
{
private const int TEMP_STRING_BUILDER_CAPACITY = 1024;
public static StringBuilder _tempStringBuilder = new StringBuilder(1024);
@@ -18,13 +17,6 @@ public static class UIUtil
return _tempStringBuilder;
}
public static void SetPositionX(Transform targetTransform, float x)
{
Vector2 vector = targetTransform.localPosition;
vector.x = x;
targetTransform.localPosition = vector;
}
public static void SetPositionY(Transform targetTransform, float y)
{
Vector2 vector = targetTransform.localPosition;
@@ -46,35 +38,6 @@ public static class UIUtil
targetTransform.localPosition = localPosition;
}
public static string GetBattleTypeName(NetworkDefine.ServerBattleType battleType)
{
switch (battleType)
{
case NetworkDefine.ServerBattleType.Free:
return Data.SystemText.Get("Battle_0001");
case NetworkDefine.ServerBattleType.Rank:
return Data.SystemText.Get("Battle_0002");
case NetworkDefine.ServerBattleType.OpenRoom:
case NetworkDefine.ServerBattleType.RoomTwoPick:
case NetworkDefine.ServerBattleType.Gathering:
case NetworkDefine.ServerBattleType.OfflineEvent:
return Data.SystemText.Get("Battle_0003");
case NetworkDefine.ServerBattleType.TwoPick:
return Data.SystemText.Get("Battle_0004");
case NetworkDefine.ServerBattleType.Colosseum:
case NetworkDefine.ServerBattleType.ColosseumTwoPick:
return Data.SystemText.Get("Colosseum_0001");
case NetworkDefine.ServerBattleType.Competition:
case NetworkDefine.ServerBattleType.CompetitionTwoPick:
return Data.SystemText.Get("Competition_0006");
case NetworkDefine.ServerBattleType.Sealed:
return Data.SystemText.Get("BattleName_Sealed");
default:
Debug.LogError($"unsupported BattleType : {battleType}({(int)battleType})");
return string.Empty;
}
}
public static string GetFormatName(Format format)
{
return format switch
@@ -91,34 +54,6 @@ public static class UIUtil
};
}
public static bool IsTwoPickForReplay(BattleParameter battleParameter)
{
if (battleParameter.IsTwoPick)
{
if (battleParameter.TwoPickFormat != TwoPickFormat.Cube && battleParameter.TwoPickFormat != TwoPickFormat.Chaos && battleParameter.TwoPickFormat != TwoPickFormat.BackdraftChaos)
{
return battleParameter.TwoPickFormat != TwoPickFormat.BackdraftCube;
}
return false;
}
return false;
}
public static string GetFormatSmallSpriteName(Format format)
{
return format switch
{
Format.Rotation => "icon_timesliprotation_s",
Format.Unlimited => "icon_unlimited_s",
Format.PreRotation => "icon_prerotation_s",
Format.Sealed => "icon_sealed_s",
Format.Crossover => "icon_crossover_s",
Format.MyRotation => "icon_myrotation_s",
Format.Avatar => "icon_heroesbattle_s",
_ => string.Empty,
};
}
public static string GetShortClassName(CardBasePrm.ClanType clan)
{
switch (clan)
@@ -184,11 +119,6 @@ public static class UIUtil
return result >= 0;
}
public static bool IsValidViewerId(string idString)
{
return IsValidIdDigits(idString, 9);
}
public static string CreateListText(IList<string> list, string separator, string header = null, string footer = null)
{
StringBuilder tempStringBuilder = GetTempStringBuilder();
@@ -235,13 +165,6 @@ public static class UIUtil
UIManager.GetInstance().StartCoroutine(grid.RepositionNextFrame());
}
public static void SetCountryTexture(UITexture texture, string countryCode)
{
bool flag = !string.IsNullOrEmpty(countryCode);
texture.gameObject.SetActive(flag);
texture.mainTexture = (flag ? (Toolbox.ResourcesManager.LoadObject(Toolbox.ResourcesManager.GetAssetTypePath(countryCode, ResourcesManager.AssetLoadPathType.Country_M, isfetch: true)) as Texture) : null);
}
public static string ExtractStringAlphabet(string str)
{
return Regex.Replace(str, "[^a-zA-z]", string.Empty);