engine cleanup passes 4-7 + multi-instancing ambient rip
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
@@ -8,9 +8,7 @@ public class MyPageBanner : MyPageBannerBase
|
||||
{
|
||||
protected enum MoveSide
|
||||
{
|
||||
Left,
|
||||
Right
|
||||
}
|
||||
}
|
||||
|
||||
[SerializeField]
|
||||
protected UICenterOnChild _uiCenterOnChild;
|
||||
@@ -27,15 +25,6 @@ public class MyPageBanner : MyPageBannerBase
|
||||
[SerializeField]
|
||||
protected GameObject _buttonBase;
|
||||
|
||||
[SerializeField]
|
||||
protected GameObject _buttonLeftObject;
|
||||
|
||||
[SerializeField]
|
||||
protected GameObject _buttonRightObject;
|
||||
|
||||
[SerializeField]
|
||||
private GameObject _bgObject;
|
||||
|
||||
protected bool _isAnimation;
|
||||
|
||||
protected bool _isCanSlide;
|
||||
@@ -48,59 +37,8 @@ public class MyPageBanner : MyPageBannerBase
|
||||
|
||||
protected List<UISprite> _pagerSpriteList;
|
||||
|
||||
protected float _updateTimer;
|
||||
|
||||
protected GameObject _centerObject;
|
||||
|
||||
protected bool _isLeftButtonPressed;
|
||||
|
||||
protected bool _isRightButtonPressed;
|
||||
|
||||
private const int SLIDE_LIMIT_VALUE = 30;
|
||||
|
||||
private const string PAGER_OFF_SPRITE_NAME = "carousel_marker_off";
|
||||
|
||||
private const string PAGER_ON_SPRITE_NAME = "carousel_marker_on";
|
||||
|
||||
private const string CSV_NAME = "banner";
|
||||
|
||||
private void Start()
|
||||
{
|
||||
UIEventListener.Get(_buttonLeftObject).onPress = LeftButtonOnPress;
|
||||
UIEventListener.Get(_buttonRightObject).onPress = RightButtonOnPress;
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (!base.IsCreateEnd)
|
||||
{
|
||||
return;
|
||||
}
|
||||
slideMoveUpdate();
|
||||
if (_bannerList.Count > 1 && _isCanSlide)
|
||||
{
|
||||
_updateTimer += Time.deltaTime;
|
||||
float changeTime = _bannerList[_bannerNo]._changeTime;
|
||||
if (_updateTimer >= changeTime)
|
||||
{
|
||||
SlideStartSetting(MoveSide.Right);
|
||||
}
|
||||
}
|
||||
if (_isCanSlide)
|
||||
{
|
||||
if (_isLeftButtonPressed)
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_SLIDE_BTN);
|
||||
SlideStartSetting(MoveSide.Left);
|
||||
}
|
||||
else if (_isRightButtonPressed)
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_SLIDE_BTN);
|
||||
SlideStartSetting(MoveSide.Right);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override IEnumerator CreateBannerImage()
|
||||
{
|
||||
_bannerList = new List<BannerInfo>(Data.MyPage.data._bannerList);
|
||||
@@ -163,74 +101,6 @@ public class MyPageBanner : MyPageBannerBase
|
||||
}
|
||||
}
|
||||
|
||||
private void slideMoveUpdate()
|
||||
{
|
||||
if (!_isAnimation)
|
||||
{
|
||||
_isCanSlide = true;
|
||||
}
|
||||
if (_isClickStart && Input.GetMouseButton(0) && _isCanSlide)
|
||||
{
|
||||
if (Input.mousePosition.x < _touchPoint.x - 30f)
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_SLIDE_BTN);
|
||||
SlideStartSetting(MoveSide.Right);
|
||||
}
|
||||
else if (Input.mousePosition.x > _touchPoint.x + 30f)
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_SLIDE_BTN);
|
||||
SlideStartSetting(MoveSide.Left);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void LeftButtonOnPress(GameObject inObject, bool isPressed)
|
||||
{
|
||||
_isLeftButtonPressed = isPressed;
|
||||
_OnFinishedCenterChild();
|
||||
}
|
||||
|
||||
protected void RightButtonOnPress(GameObject inObject, bool isPressed)
|
||||
{
|
||||
_isRightButtonPressed = isPressed;
|
||||
_OnFinishedCenterChild();
|
||||
}
|
||||
|
||||
protected void SlideStartSetting(MoveSide inMoveSide)
|
||||
{
|
||||
_isAnimation = true;
|
||||
_isCanSlide = false;
|
||||
_isClickStart = false;
|
||||
_touchPoint = Input.mousePosition;
|
||||
_updateTimer = 0f;
|
||||
if (inMoveSide == MoveSide.Left)
|
||||
{
|
||||
_bannerNo = ((_bannerNo - 1 < 0) ? (_bannerList.Count - 1) : (_bannerNo - 1));
|
||||
}
|
||||
else
|
||||
{
|
||||
_bannerNo = (_bannerNo + 1) % _bannerList.Count;
|
||||
}
|
||||
if (_bannerList.Count == 2)
|
||||
{
|
||||
GameObject gameObject = _uiWrapContent.transform.Find(_bannerNo.ToString()).gameObject;
|
||||
Vector3 localPosition = _centerObject.transform.localPosition;
|
||||
if (inMoveSide == MoveSide.Left)
|
||||
{
|
||||
localPosition.x -= _uiWrapContent.itemSize;
|
||||
gameObject.transform.localPosition = localPosition;
|
||||
}
|
||||
else
|
||||
{
|
||||
localPosition.x += _uiWrapContent.itemSize;
|
||||
gameObject.transform.localPosition = localPosition;
|
||||
}
|
||||
}
|
||||
_centerObject = _uiWrapContent.transform.Find(_bannerNo.ToString()).gameObject;
|
||||
_uiCenterOnChild.CenterOn(_centerObject.transform);
|
||||
_PagerUpDate();
|
||||
}
|
||||
|
||||
protected void _OnInitializeItem(GameObject go, int wrapIndex, int realIndex)
|
||||
{
|
||||
int index = wrapIndex;
|
||||
@@ -281,14 +151,4 @@ public class MyPageBanner : MyPageBannerBase
|
||||
tweenScaleComponent.PlayReverse();
|
||||
}
|
||||
}
|
||||
|
||||
protected void OnDisable()
|
||||
{
|
||||
_isClickStart = false;
|
||||
}
|
||||
|
||||
public void SetChild(GameObject obj)
|
||||
{
|
||||
obj.transform.parent = _bgObject.transform;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user