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>
224 lines
8.3 KiB
C#
224 lines
8.3 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using UnityEngine;
|
|
using Wizard;
|
|
using Wizard.Battle;
|
|
|
|
public class OperateReceiveChecker
|
|
{
|
|
private NetworkBattleData networkBattleData;
|
|
|
|
private BattleManagerBase _battleMgr;
|
|
|
|
public OperateReceiveChecker(BattleManagerBase mgr, NetworkBattleData networkData)
|
|
{
|
|
_battleMgr = mgr;
|
|
networkBattleData = networkData;
|
|
}
|
|
|
|
public bool IsOperateReceive()
|
|
{
|
|
try
|
|
{
|
|
NetworkBattleReceiver.ReceiveData receiveData = networkBattleData.GetReceiveData();
|
|
if (receiveData.dataUri == NetworkBattleDefine.NetworkBattleURI.PlayActions)
|
|
{
|
|
int playCardIndex = receiveData.playCardIndex;
|
|
BattleCardBase battleCardIdx = _battleMgr.GetBattleCardIdx(_battleMgr.BattleEnemy.ClassAndInPlayCardList, playCardIndex);
|
|
switch (receiveData.actionType)
|
|
{
|
|
case NetworkBattleDefine.PlayActionType.ATTACK:
|
|
{
|
|
if (battleCardIdx == null)
|
|
{
|
|
LocalLog.AccumulateTraceLog("IsOperateReceive actionCard null");
|
|
return false;
|
|
}
|
|
List<BattleCardBase> opposingCardObjTarget = NetworkBattleGenericTool.GetOpposingCardObjTarget(_battleMgr, receiveData.OpponentTargetDataList);
|
|
if (!AttackSelectControl.CanCardAttackTarget(battleCardIdx, opposingCardObjTarget.First(), _battleMgr.BattlePlayer.InPlayCards))
|
|
{
|
|
LocalLog.AccumulateTraceLog("IsOperateReceive CanCardAttackTarget");
|
|
return false;
|
|
}
|
|
break;
|
|
}
|
|
case NetworkBattleDefine.PlayActionType.EVOLUTION:
|
|
case NetworkBattleDefine.PlayActionType.EVOLUTION_SELECT:
|
|
if (battleCardIdx == null)
|
|
{
|
|
LocalLog.AccumulateTraceLog("IsOperateReceive actionCard null");
|
|
return false;
|
|
}
|
|
if (!battleCardIdx.CanEvolution(isSkill: false, isSelfBattlePlayer: true) || !battleCardIdx.IsInplay)
|
|
{
|
|
LocalLog.AccumulateTraceLog("IsOperateReceive CanEvolution");
|
|
return false;
|
|
}
|
|
if (!IsSelectSkillCheck(receiveData, battleCardIdx, isEvol: true))
|
|
{
|
|
LocalLog.AccumulateTraceLog("IsOperateReceive IsSelectSkillCheck");
|
|
return false;
|
|
}
|
|
if (!IsChoiceSkillActivate(receiveData, battleCardIdx))
|
|
{
|
|
LocalLog.AccumulateTraceLog("NotEvolChoiceActivate");
|
|
return false;
|
|
}
|
|
break;
|
|
case NetworkBattleDefine.PlayActionType.PLAY_HAND:
|
|
case NetworkBattleDefine.PlayActionType.PLAY_HAND_SELECT:
|
|
{
|
|
if (receiveData.keyActionType.Contains(SendKeyActionDataManager.KeyActionType.ChoiceBrave))
|
|
{
|
|
break;
|
|
}
|
|
CardDataModel playCard = networkBattleData.GetPlayCard();
|
|
if (playCard == null)
|
|
{
|
|
LocalLog.AccumulateTraceLog("IsOperateReceive cardData null");
|
|
return false;
|
|
}
|
|
BattleCardBase indexToCardBase = NetworkBattleGenericTool.GetIndexToCardBase(_battleMgr, _battleMgr.BattleEnemy, playCard.Index);
|
|
if (indexToCardBase == null)
|
|
{
|
|
LocalLog.AccumulateTraceLog("IsOperateReceive playCard null");
|
|
return false;
|
|
}
|
|
if (NetworkBattleGenericTool.GetCardPlaceState(_battleMgr.BattleEnemy, playCard.Index) != NetworkBattleDefine.NetworkCardPlaceState.Hand)
|
|
{
|
|
LocalLog.AccumulateTraceLog(string.Concat("CardID" + indexToCardBase.CardId + "Idx" + indexToCardBase.Index + " ", "IsOperateReceive notHandCard"));
|
|
return false;
|
|
}
|
|
if (receiveData.IsAcceleratedOrCrystallize)
|
|
{
|
|
int cardId = CardMaster.GetInstanceForBattle().GetCardParameterFromId(receiveData.transformBeforeCardId).CardId;
|
|
int num = (CardMaster.GetInstanceForBattle().GetCardParameterFromId(cardId).IsFoil ? 1 : 0);
|
|
string[] array = SkillCreator.SplitBothSkillText(CardMaster.GetInstanceForBattle().GetCardParameterFromId(cardId).SkillOption)[0].Split(',');
|
|
for (int i = 0; i < array.Length; i++)
|
|
{
|
|
string elementAtString = SkillCreator.GetElementAtString(array, i);
|
|
if (elementAtString.Contains("card_id="))
|
|
{
|
|
elementAtString = elementAtString.Replace("card_id=", "");
|
|
if (receiveData.mutationAfterCardId == int.Parse(elementAtString) + num)
|
|
{
|
|
break;
|
|
}
|
|
if (i == array.Length - 1)
|
|
{
|
|
LocalLog.AccumulateTraceLog("Operate Receive Mutation MistakeID");
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
if (!indexToCardBase.CheckConditionFixedUseCost(isPrePlay: true) || indexToCardBase.CalcFixedUseCost(indexToCardBase.SelfBattlePlayer.Pp) >= indexToCardBase.Cost)
|
|
{
|
|
LocalLog.AccumulateTraceLog("accelerated CostError");
|
|
return false;
|
|
}
|
|
}
|
|
else if (!TouchControl.IsPlayCard(_battleMgr.BattleEnemy, indexToCardBase, isDebugLog: true))
|
|
{
|
|
LocalLog.AccumulateTraceLog("NotPlayCard");
|
|
return false;
|
|
}
|
|
if (!IsSelectSkillCheck(receiveData, indexToCardBase, isEvol: false))
|
|
{
|
|
LocalLog.AccumulateTraceLog("IsOperateReceive IsSelectSkillCheck");
|
|
return false;
|
|
}
|
|
if (!IsChoiceSkillActivate(receiveData, indexToCardBase))
|
|
{
|
|
LocalLog.AccumulateTraceLog("NotPlayChoiceActivate");
|
|
return false;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
catch
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
private bool IsSelectSkillCheck(NetworkBattleReceiver.ReceiveData receiveData, BattleCardBase playCard, bool isEvol)
|
|
{
|
|
if (receiveData.OpponentTargetDataList.Count() == 0)
|
|
{
|
|
return true;
|
|
}
|
|
SkillCollectionBase skillCollectionBase = null;
|
|
skillCollectionBase = (isEvol ? playCard.EvolutionSkills : playCard.Skills);
|
|
BattlePlayerPair battlePlayerPair = _battleMgr.GetBattlePlayerPair(isPlayer: false);
|
|
if (receiveData.OpponentTargetDataList.Count() == 0 && skillCollectionBase.Any())
|
|
{
|
|
IEnumerable<SkillBase> enumerable = skillCollectionBase.Where(delegate(SkillBase s)
|
|
{
|
|
bool flag = s.ApplyingTargetFilter is SkillTargetInPlayFilter || s.ApplyingTargetFilter is SkillTargetInPlayOtherSelfFilter || s.ApplyingTargetFilter is SkillTargetInplaySelfAndClassFilter;
|
|
return s.IsUserSelectType && flag && ActionProcessor.GetSkillUserSelectableTargets(s, battlePlayerPair) != null && s.CheckCondition(battlePlayerPair, new SkillConditionCheckerOption(), isPrePlay: true);
|
|
});
|
|
if (enumerable != null && enumerable.Any())
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
IEnumerable<SkillBase> source = skillCollectionBase.Where((SkillBase s) => s.IsUserSelectType && !(s is Skill_fusion) && s.CheckCondition(battlePlayerPair, new SkillConditionCheckerOption(), isPrePlay: true));
|
|
SkillBase skillBase = null;
|
|
if (source.Count() > 0)
|
|
{
|
|
skillBase = ((source.Count() > 1) ? source.ToList().Last() : source.ToList().First());
|
|
}
|
|
if (skillBase == null)
|
|
{
|
|
return true;
|
|
}
|
|
IEnumerable<BattleCardBase> skillUserSelectableTargets = ActionProcessor.GetSkillUserSelectableTargets(skillBase, battlePlayerPair);
|
|
if (skillUserSelectableTargets == null)
|
|
{
|
|
LocalLog.AccumulateTraceLog("IsSelectSkillCheck selectableTargets null");
|
|
return false;
|
|
}
|
|
foreach (BattleCardBase item in NetworkBattleGenericTool.GetOpposingCardObjTarget(_battleMgr, receiveData.OpponentTargetDataList))
|
|
{
|
|
if (skillUserSelectableTargets.Contains(item))
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
LocalLog.AccumulateTraceLog("IsSelectSkillCheck false");
|
|
return false;
|
|
}
|
|
|
|
private bool IsChoiceSkillActivate(NetworkBattleReceiver.ReceiveData receiveData, BattleCardBase cardBase)
|
|
{
|
|
if (receiveData.IsChoice)
|
|
{
|
|
CardParameter cardParameterFromId = CardMaster.GetInstanceForBattle().GetCardParameterFromId(receiveData.transformBeforeCardId);
|
|
BattleCardBase battleCardBase = _battleMgr.CreateBattleCard(cardParameterFromId.BaseCardId, cardBase.IsPlayer, null, cardParameterFromId, cardBase.SelfBattlePlayer, 0);
|
|
foreach (CardDataModel item in receiveData.SkillConditionCheckList.FindAll((CardDataModel x) => x.publishedActiveSkillCount != 0))
|
|
{
|
|
if (item.publishedActiveSkillCount == -1)
|
|
{
|
|
continue;
|
|
}
|
|
foreach (SkillBase skill in battleCardBase.Skills)
|
|
{
|
|
if (skill.ApplyingTargetFilter is SkillTargetChosenCardsFilter)
|
|
{
|
|
Object.DestroyImmediate(battleCardBase.BattleCardView.GameObject);
|
|
battleCardBase = null;
|
|
return item.activate == 1;
|
|
}
|
|
}
|
|
}
|
|
Object.DestroyImmediate(battleCardBase.BattleCardView.GameObject);
|
|
battleCardBase = null;
|
|
}
|
|
return true;
|
|
}
|
|
}
|