Preview improvements. StillBug
This commit is contained in:
1 parent
f927552adc
commit
3678d039e3
161 files changed
+34009
-61541
No files matched your search
@@ -5,19 +5,29 @@ namespace Code.OfficeGame.BattleMode.Actions
|
||||
{
|
||||
public class EntityPreviewVisuals : MonoBehaviour
|
||||
{
|
||||
public const int MaxGhostStages = 5; // 0 = Commit + до 4 прерываний
|
||||
public const int MaxGhostStages = 14; // 0 = Commit + до 4 прерываний
|
||||
|
||||
[Header("Материалы MKToon")]
|
||||
[SerializeField] private Material snapshotGhostMaterial;
|
||||
[SerializeField] private Material activePreviewMaterial;
|
||||
|
||||
[Header("Цвета проекции по стадиям прерываний")]
|
||||
[SerializeField] private Color[] stageProjectionTints =
|
||||
private Color[] stageProjectionTints =
|
||||
{
|
||||
new(0.55f, 0.85f, 1.0f, 1f), // Stage 0: до первого прерывания (голубой)
|
||||
new(1.0f, 0.85f, 0.35f, 1f), // Stage 1: после 1-го прерывания (жёлтый)
|
||||
new(1.0f, 0.55f, 0.25f, 1f), // Stage 2: после 2-го прерывания (оранжевый)
|
||||
new(0.95f, 0.3f, 0.5f, 1f), // Stage 3+: 3+ прерываний (малиновый)
|
||||
new(0f, 0.25f, 0.55f, 1f), // Глубокий синий (Ocean Blue)
|
||||
new(0.15f, 0.55f, 0.9f, 1f), // Ярко-синий (Azure)
|
||||
new(0.55f, 0.85f, 1.0f, 1f), // Небесно-голубой (Sky Blue)
|
||||
new(0.1f, 0.8f, 0.75f, 1f), // Бирюзовый (Turquoise)
|
||||
new(0.1f, 0.8f, 0.5f, 1f), // Изумрудный (Emerald)
|
||||
new(0.45f, 0.85f, 0.25f, 1f), // Салатовый (Lime Green)
|
||||
new(1.0f, 0.85f, 0.35f, 1f), // Тёплый жёлтый (Warm Yellow)
|
||||
new(1.0f, 0.7f, 0.2f, 1f), // Янтарный (Amber)
|
||||
new(1.0f, 0.55f, 0.25f, 1f), // Оранжевый (Orange)
|
||||
new(0.95f, 0.3f, 0.3f, 1f), // Кораллово-красный (Coral Red)
|
||||
new(0.95f, 0.3f, 0.5f, 1f), // Малиново-розовый (Crimson Pink)
|
||||
new(0.8f, 0.35f, 0.85f, 1f), // Орхидея / Маджента (Orchid)
|
||||
new(0.5f, 0.3f, 0.9f, 1f), // Фиолетовый (Violet)
|
||||
new(1f, 1f, 1f, 1f), // Чистый белый (White)
|
||||
};
|
||||
|
||||
[Header("Цвета статичных слепков")]
|
||||
@@ -225,6 +235,7 @@ namespace Code.OfficeGame.BattleMode.Actions
|
||||
{
|
||||
Color c = stageProjectionTints[Mathf.Clamp(stage, 0, stageProjectionTints.Length - 1)];
|
||||
if (alphaOverride.HasValue) c.a = alphaOverride.Value;
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fb857a2eae284b31b2eb19ac4abfcaa7
|
||||
timeCreated: 1793141973
|
||||
@@ -1,105 +0,0 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
using Code.Game.Gameplay.Player;
|
||||
using Code.OfficeGame.BattleMode.Timeline;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using KinematicCharacterController;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
namespace Code.OfficeGame.BattleMode.Actions.HoloCopy
|
||||
{
|
||||
public class HoloCop : MonoBehaviour
|
||||
{
|
||||
private static readonly int VelocityForward = Animator.StringToHash("VelocityForward");
|
||||
|
||||
private Func<HoloCop, float, bool> _action;
|
||||
|
||||
[SerializeField] private MovementController movementController;
|
||||
[SerializeField] private KinematicCharacterMotor motor;
|
||||
[SerializeField] private KinematicCharacterMotor originMotor;
|
||||
[SerializeField] private Animator animator;
|
||||
[SerializeField] private Animator originAnimator;
|
||||
|
||||
public MovementController Controller => movementController;
|
||||
public Animator Animator => animator;
|
||||
|
||||
private Vector3 _initialMotorPosition;
|
||||
private Quaternion _initialMotorRotation;
|
||||
|
||||
private int _initialAnimationState;
|
||||
private float _initialNormalizedTime;
|
||||
|
||||
private void Snapshot()
|
||||
{
|
||||
_initialMotorPosition = originMotor.TransientPosition;
|
||||
_initialMotorRotation = originMotor.TransientRotation;
|
||||
|
||||
AnimatorStateInfo stateInfo = originAnimator.GetCurrentAnimatorStateInfo(0);
|
||||
_initialAnimationState = stateInfo.shortNameHash;
|
||||
_initialNormalizedTime = stateInfo.normalizedTime;
|
||||
|
||||
animator.SetFloat(VelocityForward, originAnimator.GetFloat(VelocityForward));
|
||||
|
||||
animator.Play(_initialAnimationState, 0, _initialNormalizedTime);
|
||||
animator.Update(0f);
|
||||
}
|
||||
|
||||
private void ReturnToSnapshot()
|
||||
{
|
||||
bool prevRootMotion = animator.applyRootMotion;
|
||||
|
||||
animator.Play(_initialAnimationState, 0, _initialNormalizedTime);
|
||||
animator.Update(0f);
|
||||
|
||||
animator.transform.localPosition = Vector3.zero;
|
||||
animator.transform.localRotation = Quaternion.identity;
|
||||
|
||||
originMotor.SetPositionAndRotation(_initialMotorPosition, _initialMotorRotation);
|
||||
|
||||
Physics.SyncTransforms();
|
||||
}
|
||||
|
||||
public async UniTask Simulate(Func<HoloCop, float, bool> action, CancellationToken ctx)
|
||||
{
|
||||
_action = action;
|
||||
float accumulator = 0f;
|
||||
|
||||
Snapshot();
|
||||
|
||||
try
|
||||
{
|
||||
gameObject.SetActive(true);
|
||||
|
||||
while (!ctx.IsCancellationRequested)
|
||||
{
|
||||
await UniTask.Yield(PlayerLoopTiming.Update, ctx);
|
||||
|
||||
accumulator += Time.unscaledDeltaTime;
|
||||
|
||||
while (accumulator >= BattleTimeline.TickDelta)
|
||||
{
|
||||
accumulator -= BattleTimeline.TickDelta;
|
||||
|
||||
if (_action == null) return;
|
||||
|
||||
bool result = _action(this, BattleTimeline.TickDelta);
|
||||
|
||||
animator.Update(BattleTimeline.TickDelta);
|
||||
|
||||
Physics.Simulate(BattleTimeline.TickDelta);
|
||||
Physics.SyncTransforms();
|
||||
|
||||
if (result) ReturnToSnapshot();
|
||||
}
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
ReturnToSnapshot();
|
||||
|
||||
gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b4067e559c4d4556a335b4c507f9702f
|
||||
timeCreated: 1793142036
|
||||
@@ -133,6 +133,8 @@ namespace Code.Game.OfficeGame.GameStates
|
||||
|
||||
builder.RegisterType(typeof(FrankAttackDecider), new[]{ typeof(EnemyDecider) } , Lifetime.Singleton, Resolution.Eager);
|
||||
|
||||
builder.RegisterType(typeof(BattleAiResolver), new[] { typeof(IBattleAiResolver) }, Lifetime.Singleton, Resolution.Eager);
|
||||
|
||||
builder.RegisterType(typeof(BattleModeCursorController), Lifetime.Singleton, Resolution.Eager);
|
||||
builder.RegisterType(typeof(BattleTimeline), Lifetime.Singleton, Resolution.Eager);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Code.OfficeGame.BattleMode.Actions.AI
|
||||
{
|
||||
public interface IBattleAiResolver
|
||||
{
|
||||
bool TryResolveNextAction(
|
||||
EntityProperties entity,
|
||||
IReadOnlyDictionary<BattleActionType, BattleAction> battleActions,
|
||||
out BattleActionDecisionResult decisionResult,
|
||||
out BattleActionData actionData);
|
||||
}
|
||||
|
||||
public sealed class BattleAiResolver : IBattleAiResolver
|
||||
{
|
||||
private readonly Dictionary<EnemyDeciderTypes, EnemyDecider> _deciders;
|
||||
|
||||
public BattleAiResolver(IEnumerable<EnemyDecider> enemyDeciders)
|
||||
{
|
||||
_deciders = enemyDeciders.ToDictionary(x => x.EnemyDeciderType);
|
||||
}
|
||||
|
||||
public bool TryResolveNextAction(
|
||||
EntityProperties entity,
|
||||
IReadOnlyDictionary<BattleActionType, BattleAction> battleActions,
|
||||
out BattleActionDecisionResult decisionResult,
|
||||
out BattleActionData actionData)
|
||||
{
|
||||
if (_deciders.TryGetValue(entity.TeamData.DeciderType, out var decider))
|
||||
{
|
||||
(decisionResult, actionData) = decider.DecideEnemy(entity, battleActions);
|
||||
|
||||
if (decisionResult != null
|
||||
&& actionData != null
|
||||
&& decisionResult.ActionType != BattleActionType.None)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
decisionResult = null;
|
||||
actionData = null;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
File renamed without changes.
@@ -1,7 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Code.Game.Entities;
|
||||
using Code.Game.OfficeGame.Entities;
|
||||
using Code.OfficeGame.BattleMode.Actions;
|
||||
using Code.OfficeGame.BattleMode.Actions.AI;
|
||||
using Code.OfficeGame.BattleMode.Effects;
|
||||
using Code.OfficeGame.BattleMode.HitBoxes;
|
||||
using KinematicCharacterController;
|
||||
@@ -14,12 +16,14 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
float TickDelta { get; }
|
||||
int CurrentSimFrame { get; }
|
||||
int GetSlotIndex(EntityId entityId);
|
||||
|
||||
void SubmitAttack(
|
||||
EntityId attackerId,
|
||||
EntityId defenderId,
|
||||
HitBoxPartType hitPart,
|
||||
Vector3 hitWorldPosition,
|
||||
EntityAttackedData attackedData);
|
||||
|
||||
void RecordHitboxVisual(BoxCollider box, Color color);
|
||||
}
|
||||
|
||||
@@ -46,9 +50,14 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
private Dictionary<EntityId, int> _idToSlot;
|
||||
private EntityActionSlotSnapshot[] _workingSlots;
|
||||
|
||||
public BattleSimulator(Dictionary<BattleActionType, BattleAction> actions)
|
||||
private readonly IBattleAiResolver _aiResolver;
|
||||
|
||||
public BattleSimulator(
|
||||
Dictionary<BattleActionType, BattleAction> actions,
|
||||
IBattleAiResolver aiResolver)
|
||||
{
|
||||
_actions = actions;
|
||||
_aiResolver = aiResolver;
|
||||
}
|
||||
|
||||
public void BindEntities(EntityProperties[] entities)
|
||||
@@ -75,6 +84,7 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
{
|
||||
if (unique.Add(t)) list.Add(t);
|
||||
}
|
||||
|
||||
return list.ToArray();
|
||||
}
|
||||
|
||||
@@ -162,6 +172,7 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
{
|
||||
EntitySnapshot.ApplyVisualOnly(_entities[i], _entityBones[i], snapshot.Entities[i].PhysicsAndVisuals);
|
||||
}
|
||||
|
||||
Physics.SyncTransforms();
|
||||
}
|
||||
|
||||
@@ -172,8 +183,10 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
{
|
||||
for (int i = 0; i < _entities.Length; i++)
|
||||
{
|
||||
EntitySnapshot.RestoreForSimulation(_entities[i], _entityBones[i], snapshot.Entities[i].PhysicsAndVisuals);
|
||||
EntitySnapshot.RestoreForSimulation(_entities[i], _entityBones[i],
|
||||
snapshot.Entities[i].PhysicsAndVisuals);
|
||||
}
|
||||
|
||||
Physics.SyncTransforms();
|
||||
}
|
||||
|
||||
@@ -240,6 +253,7 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
if (slot.ActionType != BattleActionType.None && slot.ActionData != null && !slot.ActionData.Finished)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -368,6 +382,50 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
}
|
||||
}
|
||||
|
||||
// Авто-цепочка ходов ИИ: если игрок НЕ освободился в этом кадре, но всё ещё занят действием,
|
||||
// освободившиеся враги сразу выбирают следующее действие прямо внутри запекания.
|
||||
if (_aiResolver != null && readyMask != 0UL)
|
||||
{
|
||||
bool anyPlayerReadyThisFrame = false;
|
||||
bool anyPlayerStillBusy = false;
|
||||
|
||||
for (int i = 0; i < _entities.Length; i++)
|
||||
{
|
||||
if (_entities[i].EntityHealth.IsDead) continue;
|
||||
if (_entities[i].TeamData.Team != EntityTeam.Good) continue;
|
||||
|
||||
if ((readyMask & (1UL << i)) != 0UL)
|
||||
anyPlayerReadyThisFrame = true;
|
||||
else if (_workingSlots[i].ActionType != BattleActionType.None &&
|
||||
!_workingSlots[i].ActionData.Finished)
|
||||
anyPlayerStillBusy = true;
|
||||
}
|
||||
|
||||
if (!anyPlayerReadyThisFrame && anyPlayerStillBusy)
|
||||
{
|
||||
for (int i = 0; i < _entities.Length; i++)
|
||||
{
|
||||
if ((readyMask & (1UL << i)) == 0UL) continue;
|
||||
|
||||
var entity = _entities[i];
|
||||
if (entity.TeamData.Team != EntityTeam.ChaoticEvil) continue;
|
||||
|
||||
if (_aiResolver.TryResolveNextAction(entity, _actions, out var nextDecision, out var nextData))
|
||||
{
|
||||
_workingSlots[i] = new EntityActionSlotSnapshot
|
||||
{
|
||||
ActionType = nextDecision.ActionType,
|
||||
DecisionResult = nextDecision,
|
||||
ActionData = nextData,
|
||||
LastCompletedActionType = _workingSlots[i].LastCompletedActionType,
|
||||
ActionStartFrame = frame,
|
||||
EstimatedEndFrame = frame + nextData.TotalFrames
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return CaptureCurrentFrame(
|
||||
frame,
|
||||
currentStage,
|
||||
@@ -404,10 +462,12 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
|
||||
int damage = request.Damage;
|
||||
foreach (var effect in attacker.Effects)
|
||||
if (effect is AttackEffect atk) atk.Apply(ref damage);
|
||||
if (effect is AttackEffect atk)
|
||||
atk.Apply(ref damage);
|
||||
|
||||
foreach (var effect in defender.Effects)
|
||||
if (effect is DefenseEffect def) def.Apply(ref damage);
|
||||
if (effect is DefenseEffect def)
|
||||
def.Apply(ref damage);
|
||||
|
||||
defender.EntityHealth.GetDamage(damage, request.HitBoxPartType);
|
||||
|
||||
@@ -429,7 +489,8 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
|
||||
if (defender.EntityHealth.IsDead)
|
||||
{
|
||||
_workingSlots[defenderSlot] = EntityActionSlotSnapshot.CreateNone(frame, oldSlot.LastCompletedActionType);
|
||||
_workingSlots[defenderSlot] =
|
||||
EntityActionSlotSnapshot.CreateNone(frame, oldSlot.LastCompletedActionType);
|
||||
|
||||
_frameEvents.Add(new TimelineEvent(
|
||||
frame,
|
||||
|
||||
@@ -67,8 +67,10 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
HealthPanelsHolder healthPanelsHolder,
|
||||
CameraStateMachine cameraStateMachine,
|
||||
IParticleService particleService,
|
||||
BattleModeCursorController cursorController)
|
||||
BattleModeCursorController cursorController,
|
||||
IBattleAiResolver aiResolver)
|
||||
{
|
||||
_aiResolver = aiResolver;
|
||||
_cursorController = cursorController;
|
||||
_timelinePanel = timelinePanel;
|
||||
_decisionPanel = battleActionDecisionPanel;
|
||||
@@ -80,7 +82,7 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
_battleActionDeciders = battleActionDeciders.ToDictionary(x => x.DeciderType);
|
||||
_enemyDeciders = enemyDeciders.ToDictionary(x => x.EnemyDeciderType);
|
||||
|
||||
_simulator = new BattleSimulator(_battleActions);
|
||||
_simulator = new BattleSimulator(_battleActions, aiResolver);
|
||||
foreach (var action in _battleActions.Values)
|
||||
action.SetSimulationContext(_simulator);
|
||||
}
|
||||
@@ -139,6 +141,7 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
|
||||
private CancellationToken _battleLoopCt;
|
||||
private BattleModeCursorController _cursorController;
|
||||
private IBattleAiResolver _aiResolver;
|
||||
|
||||
public async UniTask RunBattleLoopAsync(List<EntityProperties> entities, CancellationToken ctx)
|
||||
{
|
||||
@@ -182,7 +185,7 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
HideAllPreviewVisuals();
|
||||
RebakeFromCommitted(recordGhosts: false);
|
||||
|
||||
int nextPauseFrame = Track.FindNextPauseFrame(_committedFrame.Value);
|
||||
int nextPauseFrame = Track.FindNextPlayerPauseFrame(_committedFrame.Value, _entities);
|
||||
if (nextPauseFrame <= _committedFrame.Value)
|
||||
{
|
||||
await UniTask.Yield(PlayerLoopTiming.Update, ctx);
|
||||
@@ -259,18 +262,23 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
|
||||
if (entity.TeamData.Team == EntityTeam.ChaoticEvil)
|
||||
{
|
||||
var (enemyRes, enemyData) = _enemyDeciders[entity.TeamData.DeciderType]
|
||||
.DecideEnemy(entity, _battleActions);
|
||||
var lastCompleted = Track.GetFrame(_committedFrame.Value)
|
||||
.Entities[slotIndex].ActionSlot.LastCompletedActionType;
|
||||
|
||||
return new EntityActionSlotSnapshot
|
||||
if (_aiResolver.TryResolveNextAction(entity, _battleActions, out var enemyRes, out var enemyData))
|
||||
{
|
||||
ActionType = enemyRes.ActionType,
|
||||
DecisionResult = enemyRes,
|
||||
ActionData = enemyData,
|
||||
LastCompletedActionType = Track.GetFrame(_committedFrame.Value).Entities[slotIndex].ActionSlot.LastCompletedActionType,
|
||||
ActionStartFrame = _committedFrame.Value,
|
||||
EstimatedEndFrame = _committedFrame.Value + enemyData.TotalFrames
|
||||
};
|
||||
return new EntityActionSlotSnapshot
|
||||
{
|
||||
ActionType = enemyRes.ActionType,
|
||||
DecisionResult = enemyRes,
|
||||
ActionData = enemyData,
|
||||
LastCompletedActionType = lastCompleted,
|
||||
ActionStartFrame = _committedFrame.Value,
|
||||
EstimatedEndFrame = _committedFrame.Value + enemyData.TotalFrames
|
||||
};
|
||||
}
|
||||
|
||||
return EntityActionSlotSnapshot.CreateNone(_committedFrame.Value, lastCompleted);
|
||||
}
|
||||
|
||||
if (entity.TeamData.Team == EntityTeam.Good)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Code.Game.OfficeGame.Entities;
|
||||
using Code.OfficeGame.BattleMode.Actions;
|
||||
|
||||
namespace Code.OfficeGame.BattleMode.Timeline
|
||||
@@ -101,5 +102,27 @@ namespace Code.OfficeGame.BattleMode.Timeline
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Первый кадр после fromFrame, на котором завершил действие хотя бы один игрок (EntityTeam.Good).
|
||||
/// Если игроков в маске нет (например, игрок мёртв), возвращает LastFrame.
|
||||
/// </summary>
|
||||
public int FindNextPlayerPauseFrame(int fromFrame, EntityProperties[] entities)
|
||||
{
|
||||
ulong playerMask = 0UL;
|
||||
for (int i = 0; i < entities.Length; i++)
|
||||
{
|
||||
if (entities[i].TeamData.Team == EntityTeam.Good)
|
||||
playerMask |= 1UL << i;
|
||||
}
|
||||
|
||||
for (int f = fromFrame + 1; f < _frames.Count; f++)
|
||||
{
|
||||
if ((_frames[f].ReadySlotsMask & playerMask) != 0UL)
|
||||
return f;
|
||||
}
|
||||
|
||||
return LastFrame;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using Code.OfficeGame.BattleMode.Actions;
|
||||
|
||||
namespace Code.OfficeGame.BattleMode.Timeline
|
||||
{
|
||||
public interface IBattleAiResolver
|
||||
{
|
||||
bool TryResolveNextAction(
|
||||
EntityProperties entity,
|
||||
IReadOnlyDictionary<BattleActionType, BattleAction> actions,
|
||||
out BattleActionDecisionResult decision,
|
||||
out BattleActionData actionData);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user