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>
89 lines
2.7 KiB
C#
89 lines
2.7 KiB
C#
using System;
|
|
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using Cute;
|
|
using UnityEngine;
|
|
|
|
namespace Wizard;
|
|
|
|
public class ArenaCommonLobbyTreasureBoxInfo : MonoBehaviour
|
|
{
|
|
[Header("現在の宝箱")]
|
|
[SerializeField]
|
|
private GameObject _nowBoxTitleRoot;
|
|
|
|
[SerializeField]
|
|
private UISprite _nowBoxSprite;
|
|
|
|
[SerializeField]
|
|
private Transform _movePos;
|
|
|
|
[Header("次の宝箱")]
|
|
[SerializeField]
|
|
private GameObject _nextBoxRoot;
|
|
|
|
[SerializeField]
|
|
private UISprite _nextBoxSprite;
|
|
|
|
private GameObject _openEffect;
|
|
|
|
private Vector3 _backupNowBoxPos = Vector3.zero;
|
|
|
|
private bool _backupNextBoxRootActive;
|
|
|
|
public ArenaCommonLobbyLoadRequest Init(ArenaCommonLobbyInitParam initParam, List<string> unloadAssetList)
|
|
{
|
|
int battleWinNum = initParam.BattleWinNum;
|
|
_nowBoxSprite.spriteName = $"box_2pick_{battleWinNum:D2}_close";
|
|
bool flag = initParam.BattleResultList.Length < initParam.BattleMaxNum;
|
|
_nextBoxRoot.SetActive(flag);
|
|
if (flag)
|
|
{
|
|
_nextBoxSprite.spriteName = $"box_2pick_{battleWinNum + 1:D2}_close";
|
|
}
|
|
ArenaCommonLobbyLoadRequest arenaCommonLobbyLoadRequest = new ArenaCommonLobbyLoadRequest();
|
|
string effectName = $"cmn_arena_treasure_{battleWinNum + 1}";
|
|
arenaCommonLobbyLoadRequest.LoadAssetList.Add(Toolbox.ResourcesManager.GetAssetTypePath(effectName, ResourcesManager.AssetLoadPathType.Effect2D));
|
|
arenaCommonLobbyLoadRequest.LoadEndCallback = delegate
|
|
{
|
|
_openEffect = EffectUtility.CreateEffect2D(new Effect2dCreateParam
|
|
{
|
|
Parent = _nowBoxSprite.gameObject,
|
|
EffectName = effectName,
|
|
InitActive = false,
|
|
UnloadAssetList = unloadAssetList
|
|
});
|
|
};
|
|
return arenaCommonLobbyLoadRequest;
|
|
}
|
|
|
|
public void OpenBox(Action animationEndCallback = null)
|
|
{
|
|
StartCoroutine(OpenBoxCoroutine(animationEndCallback));
|
|
}
|
|
|
|
private IEnumerator OpenBoxCoroutine(Action animationEndCallback)
|
|
{
|
|
|
|
_backupNowBoxPos = _nowBoxSprite.transform.position;
|
|
_backupNextBoxRootActive = _nextBoxRoot.activeSelf;
|
|
_nowBoxTitleRoot.SetActive(value: false);
|
|
_nextBoxRoot.SetActive(value: false);
|
|
iTween.MoveTo(_nowBoxSprite.gameObject, iTween.Hash("position", _movePos.position, "time", 0.5f, "islocal", false, "easetype", iTween.EaseType.easeOutExpo));
|
|
yield return new WaitForSeconds(0.8f);
|
|
_nowBoxSprite.enabled = false;
|
|
_openEffect.SetActive(value: true);
|
|
yield return new WaitForSeconds(1.5f);
|
|
animationEndCallback.Call();
|
|
}
|
|
|
|
public void Reset()
|
|
{
|
|
_nowBoxTitleRoot.SetActive(value: true);
|
|
_nowBoxSprite.enabled = true;
|
|
_nowBoxSprite.transform.position = _backupNowBoxPos;
|
|
_nextBoxRoot.SetActive(_backupNextBoxRootActive);
|
|
_openEffect.SetActive(value: false);
|
|
}
|
|
}
|