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>
236 lines
7.1 KiB
C#
236 lines
7.1 KiB
C#
using System.Collections;
|
|
using UnityEngine;
|
|
using Wizard.Battle.View.Vfx;
|
|
|
|
public class TurnPanelControl : MonoBehaviour, ITurnPanelControl
|
|
{
|
|
[SerializeField]
|
|
private UIPanel TurnPanel;
|
|
|
|
[SerializeField]
|
|
private UISprite TurnTitle;
|
|
|
|
[SerializeField]
|
|
private UISprite SubTurnTitle;
|
|
|
|
[SerializeField]
|
|
private UILabel SubTurnLabel;
|
|
|
|
[SerializeField]
|
|
private UITable SubEvoTable;
|
|
|
|
[SerializeField]
|
|
private UISprite SubEvoTitle;
|
|
|
|
[SerializeField]
|
|
private UISprite SubEvoTurn;
|
|
|
|
[SerializeField]
|
|
private UILabel SubEvoLabel;
|
|
|
|
[SerializeField]
|
|
private UIPanel EvoPanel;
|
|
|
|
[SerializeField]
|
|
private UIPanel ArcanePanel;
|
|
|
|
[SerializeField]
|
|
private UISprite ArcaneOut;
|
|
|
|
[SerializeField]
|
|
private UISprite ArcaneIn;
|
|
|
|
[SerializeField]
|
|
private UISprite Bg;
|
|
|
|
private int evoCnt;
|
|
|
|
private bool isPlayer;
|
|
|
|
[HideInInspector]
|
|
public bool isEvoEnableP;
|
|
|
|
[HideInInspector]
|
|
public bool isEvoEnableE;
|
|
|
|
private IEnumerator _turnStartSequenceEnumerator;
|
|
|
|
public GameObject GameObject => base.gameObject;
|
|
|
|
public void Initialize(bool isEvoEnableP = true, bool isEvoEnableE = true)
|
|
{
|
|
this.isEvoEnableP = isEvoEnableP;
|
|
this.isEvoEnableE = isEvoEnableE;
|
|
TurnPanel.alpha = 0f;
|
|
EvoPanel.alpha = 0f;
|
|
ArcanePanel.alpha = 0f;
|
|
Bg.alpha = 0f;
|
|
_turnStartSequenceEnumerator = RunUI();
|
|
}
|
|
|
|
public VfxBase LoadResource()
|
|
{
|
|
return NullVfx.GetInstance();
|
|
}
|
|
|
|
public void StartUI(int turn, int evo, bool isP)
|
|
{
|
|
base.gameObject.SetActive(value: true);
|
|
evoCnt = evo;
|
|
isPlayer = isP;
|
|
if (isPlayer)
|
|
{
|
|
TurnTitle.spriteName = "img_your_turn_panel_01";
|
|
SubTurnTitle.spriteName = "img_your_turn_count_panel_01";
|
|
SubEvoTitle.spriteName = "text_battle_evo_left_01";
|
|
if (evoCnt + 1 == 1)
|
|
{
|
|
SubEvoTurn.spriteName = "text_battle_evo_right_01_1";
|
|
}
|
|
else
|
|
{
|
|
SubEvoTurn.spriteName = "text_battle_evo_right_01_2";
|
|
}
|
|
ArcaneIn.spriteName = "arcane_01_ring";
|
|
ArcaneOut.spriteName = "arcane_01_ring";
|
|
SubTurnLabel.effectColor = new Color(0f, 0.5f, 0.9f, 0.5f);
|
|
SubEvoLabel.effectColor = new Color(0f, 0.5f, 0.9f, 0.5f);
|
|
if (isEvoEnableP)
|
|
{
|
|
SubTurnTitle.gameObject.SetActive(value: false);
|
|
SubEvoTable.gameObject.SetActive(value: true);
|
|
SubEvoLabel.text = (evoCnt + 1).ToString();
|
|
}
|
|
else
|
|
{
|
|
SubTurnTitle.gameObject.SetActive(value: true);
|
|
SubEvoTable.gameObject.SetActive(value: false);
|
|
SubTurnLabel.text = turn.ToString();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
TurnTitle.spriteName = "img_your_turn_panel_02";
|
|
SubTurnTitle.spriteName = "img_your_turn_count_panel_02";
|
|
SubEvoTitle.spriteName = "text_battle_evo_left_02";
|
|
if (evoCnt + 1 == 1)
|
|
{
|
|
SubEvoTurn.spriteName = "text_battle_evo_right_02_1";
|
|
}
|
|
else
|
|
{
|
|
SubEvoTurn.spriteName = "text_battle_evo_right_02_2";
|
|
}
|
|
ArcaneIn.spriteName = "arcane_02_ring";
|
|
ArcaneOut.spriteName = "arcane_02_ring";
|
|
SubTurnLabel.effectColor = new Color(0.75f, 0f, 0.25f, 0.5f);
|
|
SubEvoLabel.effectColor = new Color(0.75f, 0f, 0.25f, 0.5f);
|
|
if (isEvoEnableE)
|
|
{
|
|
SubTurnTitle.gameObject.SetActive(value: false);
|
|
SubEvoTable.gameObject.SetActive(value: true);
|
|
SubEvoLabel.text = (evoCnt + 1).ToString();
|
|
}
|
|
else
|
|
{
|
|
SubTurnTitle.gameObject.SetActive(value: true);
|
|
SubEvoTable.gameObject.SetActive(value: false);
|
|
SubTurnLabel.text = turn.ToString();
|
|
}
|
|
}
|
|
SnapSprites();
|
|
TurnPanel.alpha = 0f;
|
|
EvoPanel.alpha = 0f;
|
|
ArcanePanel.alpha = 0f;
|
|
Bg.alpha = 0f;
|
|
StopCoroutine(_turnStartSequenceEnumerator);
|
|
_turnStartSequenceEnumerator = RunUI();
|
|
StartCoroutine(_turnStartSequenceEnumerator);
|
|
}
|
|
|
|
private IEnumerator RunUI()
|
|
{
|
|
TweenAlpha.Begin(Bg.gameObject, 0.2f, 0.5f);
|
|
TweenAlpha.Begin(TurnPanel.gameObject, 0.2f, 1f);
|
|
TurnPanel.transform.localScale = Vector3.one * 0.01f;
|
|
iTween.ScaleTo(TurnPanel.gameObject, iTween.Hash("scale", Vector3.one * 0.95f, "time", 0.2f, "islocal", true, "easetype", iTween.EaseType.easeOutQuad));
|
|
TweenAlpha.Begin(ArcanePanel.gameObject, 0.2f, 1f);
|
|
ArcanePanel.transform.localScale = Vector3.one * 10f;
|
|
iTween.ScaleTo(ArcanePanel.gameObject, iTween.Hash("scale", Vector3.one * 1.05f, "time", 0.2f, "islocal", true, "easetype", iTween.EaseType.easeOutQuad));
|
|
yield return new WaitForSeconds(0.2f);
|
|
TurnPanel.transform.localScale = Vector3.one * 0.95f;
|
|
iTween.ScaleTo(TurnPanel.gameObject, iTween.Hash("scale", Vector3.one, "time", 1f, "islocal", true, "easetype", iTween.EaseType.easeOutQuad));
|
|
ArcanePanel.transform.localScale = Vector3.one * 1.05f;
|
|
iTween.ScaleTo(ArcanePanel.gameObject, iTween.Hash("scale", Vector3.one, "time", 1f, "islocal", true, "easetype", iTween.EaseType.easeOutQuad));
|
|
yield return new WaitForSeconds(0.5f);
|
|
if ((isPlayer && isEvoEnableP) || (!isPlayer && isEvoEnableE))
|
|
{
|
|
SubEvoLabel.transform.localScale = Vector3.one;
|
|
if (isPlayer)
|
|
{
|
|
if (evoCnt == 1)
|
|
{
|
|
SubEvoTurn.spriteName = "text_battle_evo_right_01_1";
|
|
}
|
|
else
|
|
{
|
|
SubEvoTurn.spriteName = "text_battle_evo_right_01_2";
|
|
}
|
|
}
|
|
else if (evoCnt == 1)
|
|
{
|
|
SubEvoTurn.spriteName = "text_battle_evo_right_02_1";
|
|
}
|
|
else
|
|
{
|
|
SubEvoTurn.spriteName = "text_battle_evo_right_02_2";
|
|
}
|
|
SnapSprites();
|
|
yield return new WaitForSeconds(0.05f);
|
|
SubEvoLabel.text = evoCnt.ToString();
|
|
SubEvoLabel.transform.localScale = Vector3.one * 1.5f;
|
|
iTween.ScaleTo(SubEvoLabel.gameObject, iTween.Hash("scale", Vector3.one, "time", 0.2f, "islocal", true, "easetype", iTween.EaseType.easeOutQuad));
|
|
yield return new WaitForSeconds(0.45f);
|
|
}
|
|
else
|
|
{
|
|
yield return new WaitForSeconds(0.5f);
|
|
}
|
|
iTween.ScaleTo(TurnPanel.gameObject, iTween.Hash("scale", Vector3.one * 0.01f, "time", 0.4f, "islocal", true, "easetype", iTween.EaseType.easeInQuad));
|
|
iTween.ScaleTo(ArcanePanel.gameObject, iTween.Hash("scale", Vector3.one * 10f, "time", 0.4f, "islocal", true, "easetype", iTween.EaseType.easeInExpo));
|
|
TweenAlpha.Begin(TurnPanel.gameObject, 0.4f, 0f);
|
|
TweenAlpha.Begin(ArcanePanel.gameObject, 0.4f, 0f);
|
|
if (evoCnt == 0 && ((isPlayer && isEvoEnableP) || (!isPlayer && isEvoEnableE)))
|
|
{
|
|
yield return new WaitForSeconds(0.2f);
|
|
// Pre-Phase-5b: registered a NullVfx on the mgr's VfxMgr — a no-op VFX slot.
|
|
// Dropping the ambient reach; the yield-based pacing above/below is preserved.
|
|
yield return new WaitForSeconds(0.2f);
|
|
EvoPanel.alpha = 1f;
|
|
EvoPanel.transform.localScale = Vector3.one * 1.05f;
|
|
iTween.ScaleTo(EvoPanel.gameObject, iTween.Hash("scale", Vector3.one, "time", 1.5f, "islocal", true, "easetype", iTween.EaseType.linear));
|
|
yield return new WaitForSeconds(1.2f);
|
|
TweenAlpha.Begin(EvoPanel.gameObject, 0.3f, 0f);
|
|
if (isPlayer)
|
|
{
|
|
isEvoEnableP = false;
|
|
}
|
|
else
|
|
{
|
|
isEvoEnableE = false;
|
|
}
|
|
}
|
|
TweenAlpha.Begin(Bg.gameObject, 0.2f, 0f);
|
|
yield return new WaitForSeconds(0.3f);
|
|
base.gameObject.SetActive(value: false);
|
|
}
|
|
|
|
private void SnapSprites()
|
|
{
|
|
TurnTitle.MakePixelPerfect();
|
|
SubEvoTitle.MakePixelPerfect();
|
|
SubEvoTurn.MakePixelPerfect();
|
|
SubEvoTable.Reposition();
|
|
}
|
|
}
|