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
@@ -39,12 +39,6 @@ public class BattleCardIconAnimations : MonoBehaviour
|
||||
|
||||
private int _inductionLabelNumber = -1;
|
||||
|
||||
private const float ALPHA_BLEND_RATE = 0.6f;
|
||||
|
||||
private const string INDUCTION_ICON_SPRITE_NAME = "battle_notice_status_04";
|
||||
|
||||
private const string WHITE_RITUAL_STACK_SPRITE_NAME = "battle_notice_status_11";
|
||||
|
||||
public VfxBase Initialize(BattleCardBase card, SkillCollectionBase collection, bool isStackWhiteRitual = false)
|
||||
{
|
||||
_card = card;
|
||||
@@ -66,19 +60,6 @@ public class BattleCardIconAnimations : MonoBehaviour
|
||||
});
|
||||
}
|
||||
|
||||
public VfxBase InitializeOnlyStack(BattleCardBase card, SkillCollectionBase collection)
|
||||
{
|
||||
_card = card;
|
||||
this.collection = collection;
|
||||
bool isEarthRiteField = IsEarthRiteField();
|
||||
bool hasWhiteRirualStackSkill = HasStackWhiteRitualSkill();
|
||||
int whiteRitualCount = _card.SkillApplyInformation.WhiteRitualCount;
|
||||
return InstantVfx.Create(delegate
|
||||
{
|
||||
InitializeIcon(isEarthRiteField && !hasWhiteRirualStackSkill, isEarthRiteField && hasWhiteRirualStackSkill, whiteRitualCount, hasInductionSkill: false, hasInductionNumberSkill: false, hasKiller: false, hasDrain: false, hasWhenDestroySkill: false, hasGetonSkill: false);
|
||||
});
|
||||
}
|
||||
|
||||
private void InitializeIcon(bool hasWhiteRirualSkill, bool hasWhiteRirualStackSkill, int whiteRitualCount, bool hasInductionSkill, bool hasInductionNumberSkill, bool hasKiller, bool hasDrain, bool hasWhenDestroySkill, bool hasGetonSkill, bool isGetOnAfter = false, bool isReplay = false, bool isStackWhiteRitual = false)
|
||||
{
|
||||
if (!(_card.BattleCardView.GameObject == null))
|
||||
@@ -123,43 +104,6 @@ public class BattleCardIconAnimations : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public VfxBase UpdateLabelNumber()
|
||||
{
|
||||
return InstantVfx.Create(delegate
|
||||
{
|
||||
SkillIcon skillIcon = skillIconListWithoutDuplicates.FirstOrDefault((SkillIcon i) => i._key == "induction_number");
|
||||
if (skillIcon != null)
|
||||
{
|
||||
skillIcon.LabelNumber = GetInductionLabelNumber();
|
||||
if (cardTemplate.SkillIconTemp.spriteName == "battle_notice_status_04")
|
||||
{
|
||||
ChangeSkillIconLabel(cardTemplate.SkillIconLabelTemp, skillIcon.LabelNumber);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public VfxBase UpdateWhiteRitualCountLabel()
|
||||
{
|
||||
if (!HasStackWhiteRitualSkill() || !IsEarthRiteField())
|
||||
{
|
||||
return NullVfx.GetInstance();
|
||||
}
|
||||
int whiteRitualCount = _card.SkillApplyInformation.WhiteRitualCount;
|
||||
return InstantVfx.Create(delegate
|
||||
{
|
||||
SkillIcon skillIcon = skillIconListWithoutDuplicates.FirstOrDefault((SkillIcon i) => i._key == "stack_white_ritual");
|
||||
if (skillIcon != null)
|
||||
{
|
||||
skillIcon.LabelNumber = whiteRitualCount;
|
||||
if (cardTemplate.SkillIconTemp.spriteName == "battle_notice_status_11")
|
||||
{
|
||||
ChangeSkillIconLabel(cardTemplate.SkillIconLabelTemp, skillIcon.LabelNumber);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void AddToIconList(string key, string spriteName, bool addCondition, int labelNumber = -1)
|
||||
{
|
||||
if (addCondition)
|
||||
@@ -189,37 +133,6 @@ public class BattleCardIconAnimations : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public VfxBase ShowIcon()
|
||||
{
|
||||
return InstantVfx.Create(delegate
|
||||
{
|
||||
cardTemplate.SkillIconTemp.gameObject.SetActive(value: true);
|
||||
});
|
||||
}
|
||||
|
||||
public VfxBase HideIcon()
|
||||
{
|
||||
return InstantVfx.Create(delegate
|
||||
{
|
||||
cardTemplate.SkillIconTemp.gameObject.SetActive(value: false);
|
||||
});
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (cardTemplate != null)
|
||||
{
|
||||
if (cardTemplate.SkillIconTemp.gameObject.activeSelf)
|
||||
{
|
||||
SkillIconAlphaBlend();
|
||||
}
|
||||
else
|
||||
{
|
||||
cardTemplate.SkillIconTemp.alpha = 0f;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void AddSkillIcon(string key, string fileName, int labelNumber = -1)
|
||||
{
|
||||
string iconSpriteName = ((!skillIconList.Any((SkillIcon v) => v._key == key)) ? fileName : null);
|
||||
@@ -242,22 +155,6 @@ public class BattleCardIconAnimations : MonoBehaviour
|
||||
ChangeTexture();
|
||||
}
|
||||
|
||||
public void DeleteUnneededSkillIcons()
|
||||
{
|
||||
RemoveSkillIconFromList("white_ritual", () => !IsEarthRiteField());
|
||||
RemoveSkillIconFromList("induction", () => !HasInductionSkill());
|
||||
RemoveSkillIconFromList("induction_number", () => !HasInductionNumberSkill());
|
||||
RemoveSkillIconFromList("destroy", () => !HasWhenDestroySkill());
|
||||
}
|
||||
|
||||
private void RemoveSkillIconFromList(string key, Func<bool> deleteCondition)
|
||||
{
|
||||
if (deleteCondition())
|
||||
{
|
||||
DeleteSkillIcon(key);
|
||||
}
|
||||
}
|
||||
|
||||
private void ChangeTexture()
|
||||
{
|
||||
if (skillIconListWithoutDuplicates.Count() - 1 > skillCount)
|
||||
@@ -307,48 +204,6 @@ public class BattleCardIconAnimations : MonoBehaviour
|
||||
skillIconListWithoutDuplicates.Clear();
|
||||
}
|
||||
|
||||
private void SkillIconAlphaBlend()
|
||||
{
|
||||
bool flag = cardTemplate.SkillIconLabelTemp.text.IsNotNullOrEmpty();
|
||||
if (skillIconListWithoutDuplicates.Count > 1)
|
||||
{
|
||||
if (skillIconAlphaFlg)
|
||||
{
|
||||
cardTemplate.SkillIconTemp.alpha += (flag ? (0.6f * Time.deltaTime * 2f) : (0.6f * Time.deltaTime));
|
||||
}
|
||||
else
|
||||
{
|
||||
cardTemplate.SkillIconTemp.alpha -= (flag ? (0.6f * Time.deltaTime * 2f) : (0.6f * Time.deltaTime));
|
||||
}
|
||||
}
|
||||
else if (cardTemplate.SkillIconTemp.spriteName == string.Empty)
|
||||
{
|
||||
cardTemplate.SkillIconTemp.alpha = 1f;
|
||||
if (skillIconListWithoutDuplicates.Count > 0)
|
||||
{
|
||||
if (cardTemplate.SkillIconTemp.spriteName != skillIconListWithoutDuplicates[0]._iconSpriteName)
|
||||
{
|
||||
cardTemplate.SkillIconTemp.spriteName = skillIconListWithoutDuplicates[0]._iconSpriteName;
|
||||
}
|
||||
ChangeSkillIconLabel(cardTemplate.SkillIconLabelTemp, skillIconListWithoutDuplicates[0].LabelNumber);
|
||||
UpdateSkillIconLabelColor();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
cardTemplate.SkillIconTemp.alpha = 1f;
|
||||
}
|
||||
if (skillIconAlphaFlg && cardTemplate.SkillIconTemp.alpha >= (flag ? 2f : 1f))
|
||||
{
|
||||
skillIconAlphaFlg = false;
|
||||
}
|
||||
else if (!skillIconAlphaFlg && cardTemplate.SkillIconTemp.alpha <= 0f)
|
||||
{
|
||||
ChangeTexture();
|
||||
skillIconAlphaFlg = true;
|
||||
}
|
||||
}
|
||||
|
||||
private bool HasWhenDestroySkill()
|
||||
{
|
||||
return collection._skillTimingInfo.IsWhenDestroy;
|
||||
@@ -402,7 +257,7 @@ public class BattleCardIconAnimations : MonoBehaviour
|
||||
return -1;
|
||||
}
|
||||
SkillOptionValue skillOptionValue = new SkillOptionValue(skillBase.SkillPrm.buildInfo._icon);
|
||||
skillOptionValue.SetupFilterVariable(BattleManagerBase.GetIns().GetBattlePlayerInfoPair(_card.IsPlayer), _card, isPrePlay: false, null);
|
||||
skillOptionValue.SetupFilterVariable(_card.SelfBattlePlayer.BattleMgr.GetBattlePlayerInfoPair(_card.IsPlayer), _card, isPrePlay: false, null);
|
||||
return skillOptionValue.GetInt(SkillFilterCreator.ContentKeyword.induction);
|
||||
}
|
||||
|
||||
@@ -464,24 +319,4 @@ public class BattleCardIconAnimations : MonoBehaviour
|
||||
DeleteSkillIcon(key);
|
||||
}
|
||||
}
|
||||
|
||||
public void DeleteSkillIcons()
|
||||
{
|
||||
if (!(cardTemplate == null))
|
||||
{
|
||||
DeleteSkillIcon("white_ritual");
|
||||
DeleteSkillIcon("stack_white_ritual");
|
||||
DeleteSkillIcon("induction");
|
||||
DeleteSkillIcon("induction_number");
|
||||
DeleteSkillIcon("destroy");
|
||||
DeleteSkillIcon("killer");
|
||||
DeleteSkillIcon("drain");
|
||||
DeleteSkillIcon("geton");
|
||||
}
|
||||
}
|
||||
|
||||
public int GetIconListCount()
|
||||
{
|
||||
return skillIconListWithoutDuplicates.Count;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user