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
@@ -19,9 +19,7 @@ public class ClassCharaPrm
|
||||
positive_2,
|
||||
negative_2,
|
||||
extra_2,
|
||||
extra_3,
|
||||
negative_2_a,
|
||||
damege_a,
|
||||
extra_1_a,
|
||||
extra_1_b,
|
||||
extra_1_c,
|
||||
@@ -43,17 +41,7 @@ public class ClassCharaPrm
|
||||
|
||||
public enum FaceType
|
||||
{
|
||||
skin_01 = 1,
|
||||
skin_02,
|
||||
skin_03,
|
||||
skin_04,
|
||||
skin_05,
|
||||
skin_06,
|
||||
skin_07,
|
||||
skin_08,
|
||||
skin_09,
|
||||
skin_10
|
||||
}
|
||||
skin_01 = 1 }
|
||||
|
||||
public enum EmotionType
|
||||
{
|
||||
@@ -64,30 +52,10 @@ public class ClassCharaPrm
|
||||
PRAISE,
|
||||
SURPRISE,
|
||||
CONFUSE,
|
||||
WORRY,
|
||||
PROVOCATION,
|
||||
EXTRA1,
|
||||
EXTRA2,
|
||||
EXTRA3,
|
||||
BATTLESTART_DIFF,
|
||||
BATTLESTART_SAME,
|
||||
WIN,
|
||||
LOSE,
|
||||
SURRENDER_LOSE,
|
||||
EVOLUTION_1,
|
||||
EVOLUTION_2,
|
||||
EVOLUTION_3,
|
||||
DAMAGE_S_1,
|
||||
DAMAGE_S_2,
|
||||
DAMAGE_S_3,
|
||||
DAMAGE_L_1,
|
||||
DAMAGE_L_2,
|
||||
IDLE_1,
|
||||
IDLE_2,
|
||||
IDLE_3,
|
||||
SELECT,
|
||||
STORY_LOSE,
|
||||
LEADER_SELECT,
|
||||
NEGOTIATION_1,
|
||||
NEGOTIATION_2,
|
||||
NEGOTIATION_3,
|
||||
@@ -140,19 +108,13 @@ public class ClassCharaPrm
|
||||
|
||||
private int ClassCharaLv;
|
||||
|
||||
private int ClassCharaExp;
|
||||
|
||||
private int ClassCharaBattleCount;
|
||||
|
||||
private int ClassCharaWin;
|
||||
|
||||
public ClassCharacterMasterData DefaultCharaData => GameMgr.GetIns().GetDataMgr().GetCharaPrmByCharaId(_defaultCharaId);
|
||||
public ClassCharacterMasterData DefaultCharaData => null /* Pre-Phase-5b: headless has no chara master; DefaultCharaData surface preserved for typing */;
|
||||
|
||||
public ClassCharacterMasterData CurrentCharaData
|
||||
{
|
||||
get
|
||||
{
|
||||
ClassCharacterMasterData classCharacterMasterData = GameMgr.GetIns().GetDataMgr().GetCharaPrmByCharaId(_currentCharaId);
|
||||
ClassCharacterMasterData classCharacterMasterData = null; // Pre-Phase-5b: headless has no chara master
|
||||
if (classCharacterMasterData == null)
|
||||
{
|
||||
classCharacterMasterData = DefaultCharaData;
|
||||
@@ -165,94 +127,11 @@ public class ClassCharaPrm
|
||||
|
||||
public List<int> LeaderSkinIdList { get; private set; } = new List<int>();
|
||||
|
||||
public string EmoteNameGreet { get; set; }
|
||||
|
||||
public string TextIdGreet { get; set; }
|
||||
|
||||
public string VoiceIdGreet { get; set; }
|
||||
|
||||
public string EmoteNameThank { get; set; }
|
||||
|
||||
public string TextIdThank { get; set; }
|
||||
|
||||
public string VoiceIdThank { get; set; }
|
||||
|
||||
public string EmoteNameApology { get; set; }
|
||||
|
||||
public string TextIdApology { get; set; }
|
||||
|
||||
public string VoiceIdApology { get; set; }
|
||||
|
||||
public string EmoteNamePraise { get; set; }
|
||||
|
||||
public string TextIdPraise { get; set; }
|
||||
|
||||
public string VoiceIdPraise { get; set; }
|
||||
|
||||
public string EmoteNameSurprise { get; set; }
|
||||
|
||||
public string TextIdSurprise { get; set; }
|
||||
|
||||
public string VoiceIdSurprise { get; set; }
|
||||
|
||||
public string EmoteNameConfuse { get; set; }
|
||||
|
||||
public string TextIdConfuse { get; set; }
|
||||
|
||||
public string VoiceIdConfuse { get; set; }
|
||||
|
||||
public string EmoteNameWorry { get; set; }
|
||||
|
||||
public string TextIdWorry { get; set; }
|
||||
|
||||
public string VoiceIdWorry { get; set; }
|
||||
|
||||
public string EmoteNameProvocation { get; set; }
|
||||
|
||||
public string TextIdProvocation { get; set; }
|
||||
|
||||
public string VoiceIdProvocation { get; set; }
|
||||
|
||||
public void SetDefaultCharaId(int charaId)
|
||||
{
|
||||
_defaultCharaId = charaId;
|
||||
}
|
||||
|
||||
public void SetCurrentCharaId(int charaId)
|
||||
{
|
||||
_currentCharaId = charaId;
|
||||
}
|
||||
|
||||
public void SetClassCharaLv(int classlv)
|
||||
{
|
||||
ClassCharaLv = classlv;
|
||||
}
|
||||
|
||||
public void SetClassCharaExp(int classexp)
|
||||
{
|
||||
ClassCharaExp = classexp;
|
||||
}
|
||||
|
||||
public void SetClassCharaBattleCount(int classbattlecnt)
|
||||
{
|
||||
ClassCharaBattleCount = classbattlecnt;
|
||||
}
|
||||
|
||||
public void AddClassCharaBattleCount()
|
||||
{
|
||||
ClassCharaBattleCount++;
|
||||
}
|
||||
|
||||
public void SetClassCharaWin(int classwin)
|
||||
{
|
||||
ClassCharaWin = classwin;
|
||||
}
|
||||
|
||||
public void AddClassCharaWin()
|
||||
{
|
||||
ClassCharaWin++;
|
||||
}
|
||||
|
||||
public void SetLeaderRandomSkinIdList(JsonData skinIdList)
|
||||
{
|
||||
LeaderSkinIdList.Clear();
|
||||
@@ -267,21 +146,6 @@ public class ClassCharaPrm
|
||||
return ClassCharaLv;
|
||||
}
|
||||
|
||||
public int GetClassCharaExp()
|
||||
{
|
||||
return ClassCharaExp;
|
||||
}
|
||||
|
||||
public int GetClassCharaBattleCount()
|
||||
{
|
||||
return ClassCharaBattleCount;
|
||||
}
|
||||
|
||||
public int GetClassCharaWin()
|
||||
{
|
||||
return ClassCharaWin;
|
||||
}
|
||||
|
||||
public static Texture GetClassIconTexture(int clan_id)
|
||||
{
|
||||
return Toolbox.ResourcesManager.LoadObject(Toolbox.ResourcesManager.GetAssetTypePath("class_card_" + clan_id.ToString("00"), ResourcesManager.AssetLoadPathType.CardFrameClassIcon, isfetch: true)) as Texture;
|
||||
@@ -302,12 +166,6 @@ public class ClassCharaPrm
|
||||
return "icon_class_color_" + num.ToString("00");
|
||||
}
|
||||
|
||||
public static string GetLargeIconSpriteName(CardBasePrm.ClanType inClassId)
|
||||
{
|
||||
int num = (int)inClassId;
|
||||
return "icon_class_color_large_" + num.ToString("00");
|
||||
}
|
||||
|
||||
public static string GetNameText(CardBasePrm.ClanType inClassId)
|
||||
{
|
||||
return Data.SystemText.Get("Common_" + ((int)(104 + inClassId)).ToString("0000"));
|
||||
@@ -319,14 +177,4 @@ public class ClassCharaPrm
|
||||
inLabel.effectDistance = LabelDefine.OUTLINE_DISTANCE_CLASS_NAME;
|
||||
inLabel.effectColor = ColorCode.Get(OUTLINE_COLOR[inClassId]);
|
||||
}
|
||||
|
||||
public void SetParamWithUserClassJson(JsonData classJson)
|
||||
{
|
||||
IsRandomLeaderSkin = classJson["is_random_leader_skin"].ToBoolean();
|
||||
SetClassCharaLv(classJson["level"].ToInt());
|
||||
SetClassCharaExp(classJson["exp"].ToInt());
|
||||
SetCurrentCharaId(classJson["leader_skin_id"].ToInt());
|
||||
SetDefaultCharaId(classJson["default_leader_skin_id"].ToInt());
|
||||
SetLeaderRandomSkinIdList(classJson["leader_skin_id_list"]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user