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
@@ -4,6 +4,10 @@ using System.Linq;
|
||||
using Cute;
|
||||
using LitJson;
|
||||
using Wizard.Battle.Recovery;
|
||||
// TODO(engine-cleanup-pass2): 19 of 25 methods unrun in baseline
|
||||
// Type: Wizard.CardMaster
|
||||
// See data_dumps/reports/engine-cleanup/live-methods.baseline.txt
|
||||
|
||||
|
||||
namespace Wizard;
|
||||
|
||||
@@ -32,11 +36,7 @@ public class CardMaster
|
||||
|
||||
public enum CardMasterId
|
||||
{
|
||||
Default = 1,
|
||||
NextCardMaster
|
||||
}
|
||||
|
||||
private const int CARD_ID_CLASS_CHECK = 100;
|
||||
Default = 1 }
|
||||
|
||||
private static Dictionary<CardMasterId, CardMaster> _dictCardMaster = null;
|
||||
|
||||
@@ -80,101 +80,6 @@ public class CardMaster
|
||||
_classCardParam = new CardParameter();
|
||||
}
|
||||
|
||||
public static void InitializeCardMaster(UpdateInfo cardMasterUpdateInfo, Action onSuccess)
|
||||
{
|
||||
Dictionary<CardMasterId, string> dictCardMasterCSV = null;
|
||||
if (cardMasterUpdateInfo.NeedUpdateLocalCardMaster)
|
||||
{
|
||||
UIManager.GetInstance().createInSceneCenterLoading(notBlack: false, notCollider: false, force: false, Data.SystemText.Get("System_0053"));
|
||||
GetCardMasterTask task = new GetCardMasterTask(cardMasterUpdateInfo.NewCardMasterHash);
|
||||
UIManager.GetInstance().StartCoroutine(Toolbox.NetworkManager.Connect(task, delegate
|
||||
{
|
||||
dictCardMasterCSV = ParseJsonToCardMasterCSV(task.CardMasterJsonData);
|
||||
SaveLocalCardMasterCSV(dictCardMasterCSV, cardMasterUpdateInfo.NewCardMasterHash);
|
||||
CreateAllCardMasterByCSV(dictCardMasterCSV);
|
||||
onSuccess.Call();
|
||||
}, BaseTask.OnRequestFailed, BaseTask.OnFailedErrorCode, encrypt: true, useJson: false, showLoadingIcon: false));
|
||||
ClearSaveData();
|
||||
}
|
||||
else if (CardMasterLocalFileUtility.ReadLocalCardMasterCSV(out dictCardMasterCSV))
|
||||
{
|
||||
CreateAllCardMasterByCSV(dictCardMasterCSV);
|
||||
onSuccess.Call();
|
||||
}
|
||||
}
|
||||
|
||||
private static void ClearSaveData()
|
||||
{
|
||||
PlayerPrefsWrapper.SetBool(PlayerPrefsWrapper.DECK_INTRO_IS_MYROTATION_COPY_EQUAL_PERIOD, flag: false);
|
||||
PlayerPrefsWrapper.SetBool(PlayerPrefsWrapper.DECK_INTRO_IS_MYROTATION_COPY_NOT_EQUAL_PERIOD, flag: true);
|
||||
}
|
||||
|
||||
private static void SaveLocalCardMasterCSV(Dictionary<CardMasterId, string> dictCardMasterCSV, string cardMasterHash)
|
||||
{
|
||||
CardMasterLocalFileUtility.WriteAllCardMasterLocalFile(dictCardMasterCSV, cardMasterHash);
|
||||
RecoveryRecordManagerBase.DeleteRecoveryFile();
|
||||
}
|
||||
|
||||
private static void CreateAllCardMasterByCSV(Dictionary<CardMasterId, string> dictCardMasterCSV)
|
||||
{
|
||||
if (_dictCardMaster == null)
|
||||
{
|
||||
_dictCardMaster = new Dictionary<CardMasterId, CardMaster>();
|
||||
}
|
||||
foreach (KeyValuePair<CardMasterId, string> item in dictCardMasterCSV)
|
||||
{
|
||||
CardMaster cardMaster = CreateCardMaster(item.Key, item.Value);
|
||||
if (cardMaster != null)
|
||||
{
|
||||
_dictCardMaster[item.Key] = cardMaster;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static Dictionary<CardMasterId, string> ParseJsonToCardMasterCSV(JsonData cardMaster)
|
||||
{
|
||||
Dictionary<CardMasterId, string> dictionary = new Dictionary<CardMasterId, string>();
|
||||
foreach (CardMasterId value in Enum.GetValues(typeof(CardMasterId)))
|
||||
{
|
||||
int num = (int)value;
|
||||
string text = num.ToString();
|
||||
if (cardMaster.Keys.Contains(text))
|
||||
{
|
||||
string text2 = cardMaster[text].ToString();
|
||||
if (text2 != "")
|
||||
{
|
||||
dictionary[value] = text2;
|
||||
}
|
||||
}
|
||||
}
|
||||
return dictionary;
|
||||
}
|
||||
|
||||
private static CardMaster CreateCardMaster(CardMasterId cardMasterId, string cardMasterCSV)
|
||||
{
|
||||
if (cardMasterCSV == "")
|
||||
{
|
||||
return null;
|
||||
}
|
||||
List<string[]> list = Utility.ConvertCSV_Array(cardMasterCSV, removeTitle: false);
|
||||
int count = list.Count;
|
||||
List<CardCSVData> list2 = new List<CardCSVData>(count);
|
||||
Dictionary<string, CardCSVData> dictionary = new Dictionary<string, CardCSVData>(count);
|
||||
int num = 0;
|
||||
foreach (string[] item in list)
|
||||
{
|
||||
CardCSVData cardCSVData = new CardCSVData(item, num);
|
||||
list2.Add(cardCSVData);
|
||||
dictionary.Add(cardCSVData.card_id, cardCSVData);
|
||||
num++;
|
||||
}
|
||||
foreach (CardCSVData item2 in list2)
|
||||
{
|
||||
item2.CorrectPremiumResourceId(dictionary);
|
||||
}
|
||||
return new CardMaster(list2);
|
||||
}
|
||||
|
||||
public static bool IsClass(int cardId)
|
||||
{
|
||||
return cardId < 100;
|
||||
@@ -214,12 +119,6 @@ public class CardMaster
|
||||
return value;
|
||||
}
|
||||
|
||||
public CardParameter GetCardParamFromCardHashId(string cardHashId)
|
||||
{
|
||||
_hashIdCardId.TryGetValue(cardHashId, out var value);
|
||||
return GetCardParameterFromId(value);
|
||||
}
|
||||
|
||||
public bool CardExists(int cardId)
|
||||
{
|
||||
return m_cardParameters.Keys.Contains(cardId);
|
||||
|
||||
Reference in New Issue
Block a user