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>
167 lines
5.4 KiB
C#
167 lines
5.4 KiB
C#
using System;
|
|
using Cute;
|
|
using UnityEngine;
|
|
using Wizard;
|
|
using Wizard.ErrorDialog;
|
|
|
|
public class NtDataTranslateManager
|
|
{
|
|
private static NtDataTranslateManager instance;
|
|
|
|
public NtDataTranslateInfo TranslateInfo;
|
|
|
|
public bool isTranslate;
|
|
|
|
public string curBindEmail = "";
|
|
|
|
public const string FIRST_LOOK = "FIRST_LOOK";
|
|
|
|
private NtDataTranslateManager()
|
|
{
|
|
TranslateInfo = NtDataTranslateInfo.Init();
|
|
}
|
|
|
|
public static NtDataTranslateManager GetInstance()
|
|
{
|
|
if (instance == null)
|
|
{
|
|
instance = new NtDataTranslateManager();
|
|
}
|
|
return instance;
|
|
}
|
|
|
|
public string GetTranslateInfoUrl()
|
|
{
|
|
return string.Format("{0}{1}", TranslateInfo.serverUrl, "netease_data_transaction/get_email_address");
|
|
}
|
|
|
|
public string GetSetTranslateInfoUrl()
|
|
{
|
|
return string.Format("{0}{1}", TranslateInfo.serverUrl, "netease_data_transaction/set_email_address");
|
|
}
|
|
|
|
public void ShowStatement()
|
|
{
|
|
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
|
dialogBase.SetTitleLabel(TranslateInfo.titleStatement);
|
|
dialogBase.SetText(TranslateInfo.containStatement);
|
|
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.BlueBtn_CancelBtn);
|
|
dialogBase.SetSize(DialogBase.Size.XL);
|
|
dialogBase.SetButtonText(TranslateInfo.button_id1, TranslateInfo.button_id2);
|
|
dialogBase.onPushButton1 = delegate
|
|
{
|
|
ShowAddress();
|
|
};
|
|
}
|
|
|
|
public void HongKongMacaoUserConfirm()
|
|
{
|
|
SystemText systemText = Wizard.Data.SystemText;
|
|
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
|
dialogBase.SetTitleLabel(systemText.Get("Account_0142"));
|
|
dialogBase.SetText(systemText.Get("Account_0143"));
|
|
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.BlueBtn_CancelBtn);
|
|
dialogBase.SetSize(DialogBase.Size.M);
|
|
dialogBase.SetButtonText(systemText.Get("Common_0001"), systemText.Get("Common_0002"));
|
|
dialogBase.onPushButton1 = delegate
|
|
{
|
|
ConfirmAgreement();
|
|
};
|
|
}
|
|
|
|
public void ConfirmAgreement()
|
|
{
|
|
SystemText systemText = Wizard.Data.SystemText;
|
|
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
|
dialogBase.SetTitleLabel(systemText.Get("Account_0138"));
|
|
dialogBase.SetText(systemText.Get("Account_0139"));
|
|
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.BlueBtn_CancelBtn);
|
|
dialogBase.SetSize(DialogBase.Size.M);
|
|
dialogBase.SetButtonText(systemText.Get("Common_0001"), systemText.Get("Common_0002"));
|
|
dialogBase.onPushButton1 = delegate
|
|
{
|
|
TraditionalChineseOnlyAgreement();
|
|
};
|
|
}
|
|
|
|
public void TraditionalChineseOnlyAgreement()
|
|
{
|
|
SystemText systemText = Wizard.Data.SystemText;
|
|
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
|
dialogBase.SetTitleLabel(systemText.Get("Account_0140"));
|
|
dialogBase.SetText(systemText.Get("Account_0141"));
|
|
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.BlueBtn_CancelBtn);
|
|
dialogBase.SetSize(DialogBase.Size.M);
|
|
dialogBase.SetButtonText(systemText.Get("Common_0001"), systemText.Get("Common_0002"));
|
|
dialogBase.onPushButton1 = delegate
|
|
{
|
|
ShowStatement();
|
|
};
|
|
}
|
|
|
|
public void ShowAddress()
|
|
{
|
|
NtDataTranslateInput dataInput = UnityEngine.Object.Instantiate(NtDataTranslate.Instance.InputObj);
|
|
DialogBase dialog = UIManager.GetInstance().CreateDialogClose();
|
|
dialog.SetTitleLabel(TranslateInfo.titleEmail);
|
|
dialog.SetText(string.Empty);
|
|
dialog.SetButtonLayout(DialogBase.ButtonLayout.DecisionBtn);
|
|
dialog.isNotCloseWindowButton1 = true;
|
|
dialog.SetSize(DialogBase.Size.XL);
|
|
dialog.SetButtonText(TranslateInfo.button_id3);
|
|
dialog.onPushButton1 = delegate
|
|
{
|
|
dataInput.UpLoadEmail(delegate
|
|
{
|
|
SetDataTranslateTask setDataTranslateTask = new SetDataTranslateTask();
|
|
setDataTranslateTask.SetParameter(dataInput.EmailAddress);
|
|
Toolbox.NetworkManager.StartCoroutine(Toolbox.NetworkManager.Connect(setDataTranslateTask, delegate
|
|
{
|
|
ShowSuccess();
|
|
dialog.Close();
|
|
}));
|
|
});
|
|
};
|
|
dialog.SetObj(dataInput.gameObject);
|
|
}
|
|
|
|
public void ShowSuccess()
|
|
{
|
|
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
|
dialogBase.SetTitleLabel(TranslateInfo.titleSuccess);
|
|
dialogBase.SetText(TranslateInfo.containSuccess);
|
|
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.OkBtn);
|
|
dialogBase.SetSize(DialogBase.Size.XL);
|
|
dialogBase.SetButtonText(TranslateInfo.button_id4);
|
|
}
|
|
|
|
public void ShowRebind()
|
|
{
|
|
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
|
dialogBase.SetTitleLabel(TranslateInfo.titleRebind);
|
|
dialogBase.SetText(string.Format(TranslateInfo.containRebind, curBindEmail));
|
|
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.BlueBtn_CancelBtn);
|
|
dialogBase.SetSize(DialogBase.Size.XL);
|
|
dialogBase.SetButtonText(TranslateInfo.button_id5, TranslateInfo.button_id6);
|
|
dialogBase.onPushButton1 = delegate
|
|
{
|
|
ShowAddress();
|
|
};
|
|
}
|
|
|
|
public void ShowRejectLogin(Action callback = null)
|
|
{
|
|
DialogBase dialogBase = Dialog.Create(330);
|
|
dialogBase.SetTitleLabel(TranslateInfo.titleTip);
|
|
dialogBase.SetText(string.Format(TranslateInfo.containTip, curBindEmail));
|
|
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.OkBtn);
|
|
dialogBase.SetSize(DialogBase.Size.XL);
|
|
dialogBase.SetButtonText(TranslateInfo.button_id7);
|
|
dialogBase.SetVisibleContactButton(isVisible: false, 330.ToString());
|
|
dialogBase.onPushButton1 = delegate
|
|
{
|
|
callback.Call();
|
|
};
|
|
}
|
|
}
|