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

70
SVSim.BattleEngine/Engine/Wizard/RewardBase.cs
View File

@@ -80,20 +80,6 @@ public class RewardBase : MonoBehaviour
private Vector3 _cardScale = new Vector3(0.93f, 0.93f, 1f);
private const int SKIN_SPECIAL_SIZE_ID = 4403;
private const float DRAG_DEGREE = 70f;
private const int SLEEVE_WIDTH = 170;
private const int SLEEVE_HEIGHT = 230;
private const int SKIN_WIDTH = 170;
private const int SKIN_HEIGHT = 136;
private const int REWARD_NUM_PER_PAGE = 3;
private readonly Vector3 POS_GRID_CENTER = new Vector3(0f, 50f, 0f);
private readonly Vector3 POS_GRID_LEFT = new Vector3(-270f, 50f, 0f);
@@ -108,11 +94,6 @@ public class RewardBase : MonoBehaviour
private bool _isDragStart;
private void OnDestroy()
{
Toolbox.ResourcesManager.RemoveAssetGroup(_rewardThumbnailAssetList);
}
private void CreateDetail()
{
if (!(CardDetail != null))
@@ -176,48 +157,6 @@ public class RewardBase : MonoBehaviour
}
}
public void SetOnlyIconEndCreate(bool isSleeveRotate = true)
{
_isPaging = false;
_buttonPrev.gameObject.SetActive(value: false);
_buttonNext.gameObject.SetActive(value: false);
_flickCollider.gameObject.SetActive(value: false);
RewardGrid.cellWidth = 135f;
foreach (RewardObjectInfo rewardObjectInfo in _rewardObjectInfoList)
{
switch (rewardObjectInfo.GoodsType)
{
case UserGoods.Type.Sleeve:
if (isSleeveRotate)
{
rewardObjectInfo.ObjectData.textures[0].transform.localRotation = Quaternion.Euler(0f, 0f, -5f);
}
rewardObjectInfo.ObjectData.textures[0].transform.localScale = Vector3.one * 0.5f;
break;
case UserGoods.Type.Emblem:
rewardObjectInfo.ObjectData.textures[0].transform.localScale = Vector3.one * 0.6f;
break;
}
rewardObjectInfo.ObjectData.labels[0].gameObject.SetActive(value: false);
}
EndCreate();
}
public void AllInEndCreate(float sizeAjust, int cellWidthAdjust = 0)
{
_isPaging = false;
_buttonPrev.gameObject.SetActive(value: false);
_buttonNext.gameObject.SetActive(value: false);
_flickCollider.gameObject.SetActive(value: false);
RewardGrid.transform.localScale = RewardGrid.transform.localScale * sizeAjust;
RewardGrid.cellWidth = RewardGrid.cellWidth * sizeAjust + (float)cellWidthAdjust;
foreach (RewardObjectInfo rewardObjectInfo in _rewardObjectInfoList)
{
rewardObjectInfo.ObjectData.labels[0].width = (int)((float)rewardObjectInfo.ObjectData.labels[0].width * sizeAjust);
}
EndCreate();
}
public void EndCreate()
{
if (_rewardCardDataList.Count > 0)
@@ -371,7 +310,7 @@ public class RewardBase : MonoBehaviour
{
if (_currentPage < GetLastPage())
{
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_SLIDE_BTN);
ShowPage(_currentPage + 1);
}
}
@@ -380,7 +319,7 @@ public class RewardBase : MonoBehaviour
{
if (_currentPage > 1)
{
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_SLIDE_BTN);
ShowPage(_currentPage - 1);
}
}
@@ -517,9 +456,4 @@ public class RewardBase : MonoBehaviour
_labelTitle.gameObject.SetActive(isEnabled);
_labelTitle.text = title;
}
public void SetActiveMyPageLayerCamera(bool isActive)
{
_mypageCamera.gameObject.SetActive(isActive);
}
}