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>
207 lines
3.9 KiB
C#
207 lines
3.9 KiB
C#
using System;
|
|
using UnityEngine;
|
|
|
|
namespace Wizard;
|
|
|
|
public class SelectBuyNumPopupBase : UIBase
|
|
{
|
|
|
|
[SerializeField]
|
|
protected UITexture _PackLogo;
|
|
|
|
[SerializeField]
|
|
protected UILabel _buyPackLabel;
|
|
|
|
[SerializeField]
|
|
protected UITexture _iconTicket;
|
|
|
|
[SerializeField]
|
|
protected UISprite _iconCrystal;
|
|
|
|
[SerializeField]
|
|
protected UISprite _iconRupy;
|
|
|
|
[SerializeField]
|
|
protected UIButton _buttonPlus;
|
|
|
|
[SerializeField]
|
|
protected UIButton _buttonMinus;
|
|
|
|
[SerializeField]
|
|
protected UIButton _buttonMax;
|
|
|
|
[SerializeField]
|
|
protected UIButton _buttonPurchase;
|
|
|
|
[SerializeField]
|
|
protected UILabel _labelHaveItemName;
|
|
|
|
[SerializeField]
|
|
protected UILabel _labelHaveNumItems;
|
|
|
|
[SerializeField]
|
|
protected UILabel _labelCostPerPack;
|
|
|
|
[SerializeField]
|
|
protected UILabel _labelBuyNum;
|
|
|
|
[SerializeField]
|
|
protected UILabel _labelBuyNumPurchaseBtn;
|
|
|
|
[SerializeField]
|
|
protected UILabel _labelCostNamePurchaseBtn;
|
|
|
|
[SerializeField]
|
|
protected UILabel _labelCostNumPurchaseBtn;
|
|
|
|
[SerializeField]
|
|
protected UILabel _labelBtnMax;
|
|
|
|
[SerializeField]
|
|
private bool _isOverrideDisableMaxLabelColor;
|
|
|
|
[SerializeField]
|
|
private Color32 _maxLabelOverrideColor;
|
|
|
|
protected DialogBase _dialog;
|
|
|
|
protected int _gachaCostPerPack;
|
|
|
|
protected int _buyNum = 1;
|
|
|
|
protected int _ableBuyNum;
|
|
|
|
protected bool _isChangedNum;
|
|
|
|
protected bool _isPressingPlusBtn;
|
|
|
|
protected bool _isPressingMinusBtn;
|
|
|
|
protected float _timePressingPlusBtn;
|
|
|
|
protected float _timePressingMinusBtn;
|
|
|
|
protected virtual string _labelBuyNumPurchaseBtnTextId => "Shop_0046";
|
|
|
|
protected void OnPressToPlusBtn(GameObject go, bool state)
|
|
{
|
|
_isPressingPlusBtn = state;
|
|
if (!state)
|
|
{
|
|
if (!_isChangedNum && !_isPressingMinusBtn)
|
|
{
|
|
PlusBuyNum();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
|
|
}
|
|
_timePressingPlusBtn = 0f;
|
|
_isChangedNum = false;
|
|
}
|
|
|
|
protected void OnPressToMinusBtn(GameObject go, bool state)
|
|
{
|
|
_isPressingMinusBtn = state;
|
|
if (!state)
|
|
{
|
|
if (!_isChangedNum && !_isPressingPlusBtn)
|
|
{
|
|
MinusBuyNum();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
|
|
}
|
|
_timePressingMinusBtn = 0f;
|
|
_isChangedNum = false;
|
|
}
|
|
|
|
protected void PlusBuyNum()
|
|
{
|
|
if (_buyNum < _ableBuyNum)
|
|
{
|
|
_buyNum++;
|
|
UpdateBuyNumDisplays();
|
|
}
|
|
}
|
|
|
|
protected void MinusBuyNum()
|
|
{
|
|
if (_buyNum > 1)
|
|
{
|
|
_buyNum--;
|
|
UpdateBuyNumDisplays();
|
|
}
|
|
}
|
|
|
|
protected void SetEnablePlusBtn(bool _isEnable)
|
|
{
|
|
_buttonPlus.isEnabled = _isEnable;
|
|
if (!_isEnable)
|
|
{
|
|
_isPressingPlusBtn = false;
|
|
_timePressingPlusBtn = 0f;
|
|
_isChangedNum = false;
|
|
}
|
|
}
|
|
|
|
protected void SetEnableMinusBtn(bool _isEnable)
|
|
{
|
|
_buttonMinus.isEnabled = _isEnable;
|
|
if (!_isEnable)
|
|
{
|
|
_isPressingMinusBtn = false;
|
|
_timePressingMinusBtn = 0f;
|
|
_isChangedNum = false;
|
|
}
|
|
}
|
|
|
|
protected void OnBtnPurchase(Action<PackConfig, PackChildGachaInfo, int> OnClickPurchase, PackConfig packConfig, PackChildGachaInfo gachaInfo)
|
|
{
|
|
|
|
OnClickPurchase(packConfig, gachaInfo, _buyNum);
|
|
_dialog.CloseWithoutSelect();
|
|
}
|
|
|
|
protected void OnBtnMax()
|
|
{
|
|
|
|
_buyNum = _ableBuyNum;
|
|
UpdateBuyNumDisplays();
|
|
}
|
|
|
|
protected void UpdateBuyNumDisplays()
|
|
{
|
|
int num = _buyNum * _gachaCostPerPack;
|
|
_labelBuyNum.text = _buyNum.ToString();
|
|
_labelBuyNumPurchaseBtn.text = Data.SystemText.Get(_labelBuyNumPurchaseBtnTextId, _buyNum.ToString());
|
|
_labelCostNumPurchaseBtn.text = num.ToString();
|
|
if (_buyNum >= _ableBuyNum)
|
|
{
|
|
SetEnablePlusBtn(_isEnable: false);
|
|
_buttonMax.isEnabled = false;
|
|
}
|
|
else
|
|
{
|
|
SetEnablePlusBtn(_isEnable: true);
|
|
_buttonMax.isEnabled = true;
|
|
}
|
|
if (_buyNum <= 1)
|
|
{
|
|
SetEnableMinusBtn(_isEnable: false);
|
|
}
|
|
else
|
|
{
|
|
SetEnableMinusBtn(_isEnable: true);
|
|
}
|
|
ShopCommonUtility.SetButtonLabelStyle(_buttonMax, _labelBtnMax);
|
|
if (_isOverrideDisableMaxLabelColor && !_buttonMax.isEnabled)
|
|
{
|
|
_labelBtnMax.color = _maxLabelOverrideColor;
|
|
}
|
|
}
|
|
}
|