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
6.7 KiB
C#
236 lines
6.7 KiB
C#
using System.Collections.Generic;
|
|
using Cute;
|
|
using LitJson;
|
|
|
|
namespace Wizard;
|
|
|
|
public class PackConfig
|
|
{
|
|
public List<PackChildGachaInfo> ChildGachaInfoList { get; } = new List<PackChildGachaInfo>();
|
|
|
|
public int PackId { get; set; }
|
|
|
|
public int BasePackId { get; set; }
|
|
|
|
public int GachaType { get; set; }
|
|
|
|
public string Title { get; set; }
|
|
|
|
public string Description { get; set; }
|
|
|
|
public int SleeveId { get; set; }
|
|
|
|
public int SpecialSleeveId { get; set; }
|
|
|
|
public PackCategory Category { get; set; }
|
|
|
|
public int OverrideDrawEffectPackId { get; set; }
|
|
|
|
public int OverrideUIEffectPackId { get; set; }
|
|
|
|
public bool IsHideNotEnoughBuy { get; set; }
|
|
|
|
public int OpenCount { get; set; }
|
|
|
|
public int OpenCountLimit { get; set; }
|
|
|
|
public RemainTime RemainTime { get; set; }
|
|
|
|
public int RemainStepupOpenCount { get; set; }
|
|
|
|
public int TotalStepupOpenCount { get; set; }
|
|
|
|
public bool IsNew { get; set; }
|
|
|
|
public int TsExchangePosterId { get; set; }
|
|
|
|
public List<PackBannerData> ListPackBanner { get; } = new List<PackBannerData>();
|
|
|
|
public GachaPointData GachaPointData { get; set; }
|
|
|
|
public int SelectedClassId { get; set; } = 10;
|
|
|
|
public bool IsSpecialLayout
|
|
{
|
|
get
|
|
{
|
|
if (!IsSpecialCardPack && !IsLegendCardPack && Category != PackCategory.FreePackLeaderSkin && Category != PackCategory.RotationStarterCardPack)
|
|
{
|
|
return Category == PackCategory.LegendAndLeaderSkinSinglePack;
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
|
|
public bool IsUseLongPoster => IsSpecialLayout;
|
|
|
|
public bool IsUsePackPointLayout
|
|
{
|
|
get
|
|
{
|
|
if (IsSpecialLayout)
|
|
{
|
|
return false;
|
|
}
|
|
if (IsPrerelease)
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
|
|
public bool IsSpecialCardPack
|
|
{
|
|
get
|
|
{
|
|
if (Category != PackCategory.SpecialCardPack)
|
|
{
|
|
return Category == PackCategory.LimitedSpecialCardPack;
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
|
|
public bool IsNeedRemainTime
|
|
{
|
|
get
|
|
{
|
|
if (!IsSpecialCardPack && Category != PackCategory.FreePackLeaderSkin && Category != PackCategory.LeaderSkinPack)
|
|
{
|
|
return Category == PackCategory.LegendAndLeaderSkinSinglePack;
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
|
|
public bool IsLegendCardPack => Category == PackCategory.LegendCardPack;
|
|
|
|
public bool IsRotationStarterCardPack => Category == PackCategory.RotationStarterCardPack;
|
|
|
|
public bool IsShowAppealImage => Category == PackCategory.LeaderSkinPack;
|
|
|
|
public bool IsPrerelease { get; set; }
|
|
|
|
public PrereleasePurchaseInfo PrereleasePurchaseInfo { get; set; }
|
|
|
|
public bool IsExistSpecialPackPurchaseRewards => SpecialPackRewardsList != null;
|
|
|
|
public List<PurchaseRewardInfo> SpecialPackRewardsList { get; private set; }
|
|
|
|
public ShopExpirtyInfo ExpirtyInfo { get; set; }
|
|
|
|
public int GetGachaIdForUIResource()
|
|
{
|
|
if (!IsSpecialCardPack)
|
|
{
|
|
return PackId;
|
|
}
|
|
return OverrideUIEffectPackId;
|
|
}
|
|
|
|
public void SetSpecialPackRewardsList(JsonData parentJsonData)
|
|
{
|
|
if (!parentJsonData.Keys.Contains("gacha_purchase_reward"))
|
|
{
|
|
return;
|
|
}
|
|
SpecialPackRewardsList = new List<PurchaseRewardInfo>();
|
|
JsonData jsonData = parentJsonData["gacha_purchase_reward"];
|
|
for (int i = 0; i < jsonData.Count; i++)
|
|
{
|
|
JsonData jsonData2 = jsonData[i];
|
|
PurchaseRewardInfo purchaseRewardInfo = new PurchaseRewardInfo();
|
|
JsonData jsonData3 = jsonData2["reward_list"];
|
|
for (int j = 0; j < jsonData3.Count; j++)
|
|
{
|
|
ShopCommonRewardInfo shopCommonRewardInfo = new ShopCommonRewardInfo();
|
|
shopCommonRewardInfo.Type = jsonData3[j]["reward_type"].ToInt();
|
|
shopCommonRewardInfo.UserGoodsId = jsonData3[j]["reward_detail_id"].ToLong();
|
|
shopCommonRewardInfo.Num = jsonData3[j]["reward_number"].ToInt();
|
|
purchaseRewardInfo.RewardInfoList.Add(shopCommonRewardInfo);
|
|
}
|
|
int num = jsonData2["purchase_count"].ToInt() / 10;
|
|
purchaseRewardInfo.PurchaseNthText = Data.SystemText.Get("Shop_0186", num.ToString());
|
|
purchaseRewardInfo.IsGet = jsonData2["is_received"].ToBoolean();
|
|
SpecialPackRewardsList.Add(purchaseRewardInfo);
|
|
}
|
|
}
|
|
|
|
public string GetPackPosterTexturePath(bool isFetch)
|
|
{
|
|
int gachaIdForUIResource = GetGachaIdForUIResource();
|
|
string path = (IsPrerelease ? $"card_pack_{gachaIdForUIResource}_poster_pre" : ((TsExchangePosterId <= 0) ? $"card_pack_{gachaIdForUIResource}_poster" : $"card_pack_{gachaIdForUIResource}_poster_{TsExchangePosterId}"));
|
|
return Toolbox.ResourcesManager.GetAssetTypePath(path, ResourcesManager.AssetLoadPathType.ShopCardPack, isFetch);
|
|
}
|
|
|
|
public string GetPackBounsPosterTexturePath(bool isFetch)
|
|
{
|
|
string path = $"card_pack_{GetGachaIdForUIResource()}_poster_bonus";
|
|
return Toolbox.ResourcesManager.GetAssetTypePath(path, ResourcesManager.AssetLoadPathType.ShopCardPack, isFetch);
|
|
}
|
|
|
|
public string GetPackTitleLogoTexturePath(bool isFetch)
|
|
{
|
|
int gachaIdForUIResource = GetGachaIdForUIResource();
|
|
string path = ((!IsPrerelease) ? $"card_pack_{gachaIdForUIResource}_logo_01" : $"card_pack_{gachaIdForUIResource}_logo_01_pre");
|
|
return Toolbox.ResourcesManager.GetAssetTypePath(path, ResourcesManager.AssetLoadPathType.ShopCardPack, isFetch);
|
|
}
|
|
|
|
public string GetPackIconTexturePath(bool isFetch)
|
|
{
|
|
int ticketId = GetTicketId();
|
|
string path = $"card_pack_{ticketId}_icon";
|
|
return Toolbox.ResourcesManager.GetAssetTypePath(path, ResourcesManager.AssetLoadPathType.ShopCardPack, isFetch);
|
|
}
|
|
|
|
public string GetPackDrumrollLogoTexturePath(bool isFetch)
|
|
{
|
|
int gachaIdForUIResource = GetGachaIdForUIResource();
|
|
string path = $"card_pack_{gachaIdForUIResource}_logo_02";
|
|
return Toolbox.ResourcesManager.GetAssetTypePath(path, ResourcesManager.AssetLoadPathType.ShopCardPack, isFetch);
|
|
}
|
|
|
|
public bool EnableBuyPack()
|
|
{
|
|
bool result = false;
|
|
for (int i = 0; i < ChildGachaInfoList.Count; i++)
|
|
{
|
|
if ((ChildGachaInfoList[i].PackType == GachaUI.CardPackType.FREE_PACK_WITH_SKIN || ChildGachaInfoList[i].PackType == GachaUI.CardPackType.FREE_PACKS) && ChildGachaInfoList[i].AvailableCount > 0)
|
|
{
|
|
result = true;
|
|
break;
|
|
}
|
|
if (ChildGachaInfoList[i].CostGoodsCount > 0)
|
|
{
|
|
result = true;
|
|
break;
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public int GetTicketId()
|
|
{
|
|
int result = PackId;
|
|
PackChildGachaInfo packChildGachaInfo = ChildGachaInfoList.Find((PackChildGachaInfo x) => x.PackType == GachaUI.CardPackType.TICKET_MULTI);
|
|
if (packChildGachaInfo != null)
|
|
{
|
|
result = (int)packChildGachaInfo.UserGoodsId;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public PackChildGachaInfo CanFreeBuyInfo()
|
|
{
|
|
foreach (PackChildGachaInfo childGachaInfo in ChildGachaInfoList)
|
|
{
|
|
if (childGachaInfo.PackType == GachaUI.CardPackType.FREE_PACKS)
|
|
{
|
|
return childGachaInfo;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
}
|