Multiple entities

This commit is contained in:
ThomasCharester committed 2026-10-23 20:09:32 +03:00
1 parent ccc4c04234
commit 1de0e93ae0
5677 files changed
+364912 -919855

No files matched your search

+37 -25
View File
@@ -1,3 +1,4 @@
using System.Linq;
using Code.Game.Cleaning.Player;
using Code.Game.Gameplay.Player;
using Code.Game.Gameplay.Player.Factory;
@@ -8,6 +9,7 @@ using Code.Infrastructure.Input;
using Code.Infrastructure.SceneLoader;
using Code.Infrastructure.UI;
using Code.Infrastructure.Utils;
using Code.OfficeGame.BattleMode.Actions;
using Code.OfficeGame.BattleMode.Actions.Player;
using Code.OfficeGame.BattleMode.UI;
using Code.OfficeGame.Player;
@@ -16,6 +18,7 @@ using KinematicCharacterController;
using ObservableCollections;
using R3;
using Reflex.Core;
using Reflex.Injectors;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
@@ -35,21 +38,22 @@ namespace Code.Game.TestingLevel
{
Cursor.lockState = CursorLockMode.Locked;
#if UNITY_EDITOR
#if UNITY_EDITOR
Context.InputService.EnableMap(ActionMappings.Debug);
Context.InputService.BindActionPerformed((int)ActionMappings.Debug, (int)DebugActions.ToggleBattleMode, ToggleBattleMode);
#endif
Context.InputService.BindActionPerformed((int)ActionMappings.Debug, (int)DebugActions.ToggleBattleMode,
ToggleBattleMode);
#endif
Context.InputService.EnableMap(ActionMappings.OpenMovement);
Context.InputService.EnableMap(ActionMappings.UI); //
await Context.Camera.SwitchState(CameraMode.OpenMovement);
if (Context.StateMachine.CurrentState == AppStates.BattleState) return;
Context.AudioService.SetAudioListener(Context.Camera.Camera.GetComponent<AudioListener>());
var waitForContainer =
Context.SceneContainerManager.ScenesContainers
.ObserveDictionaryAdd()
@@ -65,44 +69,44 @@ namespace Code.Game.TestingLevel
var factory = new PlayerFactory(factoryConfig);
var player = await factory.CreatePlayer();
var playerKinematicCharacterMotor = player.GetComponent<KinematicCharacterMotor>();
var playerMovementController = player.GetComponent<PlayerMovementController>();
var playerMovementController = player.GetComponent<MovementController>();
var playerControlsProvider = player.GetComponent<PlayerControlsProvider>();
var playerAnimatorProvider = player.GetComponent<PlayerAnimator>();
var playerTimelineActor = player.GetComponent<PlayerTimelineActor>();
var playerTimelineActor = player.GetComponent<PlayerControlledTimelineActor>();
playerMovementController.Freeze = true;
BattleActionDecisionPanel battleActionDecisionPanel =
(BattleActionDecisionPanel) await Context.UIFactory
.LoadPanel(UIPanelType.BattleActionDecision,false);
BattleActionDecisionPanel battleActionDecisionPanel =
(BattleActionDecisionPanel)await Context.UIFactory
.LoadPanel(UIPanelType.BattleActionDecision, false);
// ((OpenMovementCameraState)Context.Camera.CurrentBaseState).SetTarget(player.transform);
void InstallExtra(Scene scene, ContainerBuilder builder)
{
builder.RegisterValue(factoryConfig);
builder.RegisterValue(factory, new []{typeof(IPlayerFactory)});
builder.RegisterValue(factory, new[] { typeof(IPlayerFactory) });
builder.RegisterValue(playerKinematicCharacterMotor);
builder.RegisterValue(playerMovementController);
builder.RegisterValue(playerControlsProvider);
builder.RegisterValue(playerAnimatorProvider);
builder.RegisterValue(playerTimelineActor);
builder.RegisterValue(battleActionDecisionPanel);
}
await UniTask.WhenAll(
Context.SceneLoader
.LoadSceneAsync(
SceneId.Testing,
LoadSceneMode.Single,
true,
InstallExtra),
InstallExtra),
Context.SceneLoader
.LoadSceneAsync(
SceneId.FirstTestingSegment,
LoadSceneMode.Additive,
false),
false),
Context.SceneLoader
.LoadSceneAsync(
SceneId.SecondTestingSegment,
@@ -110,14 +114,21 @@ namespace Code.Game.TestingLevel
false),
waitForContainer
);
var container = Context.SceneContainerManager.ScenesContainers[SceneId.Testing];
container.Resolve<KinematicCharacterMotor>()
.SetPositionAndRotation(
container.Resolve<TestingLevelData>().playerSpawnPoint.position,
container.Resolve<TestingLevelData>().playerSpawnPoint.rotation);
var entities =
Object.FindObjectsByType<EntityTimelineActor>()
.Select(x => x.gameObject)
.ToList();
GameObjectInjector.InjectRecursiveMany(entities, container);
playerMovementController.Freeze = false;
}
@@ -130,12 +141,13 @@ namespace Code.Game.TestingLevel
{
#if UNITY_EDITOR
Context.InputService.DisableMap(ActionMappings.Debug);
Context.InputService.UnbindActionPerformed((int)ActionMappings.Debug, (int)DebugActions.ToggleBattleMode, ToggleBattleMode);
Context.InputService.UnbindActionPerformed((int)ActionMappings.Debug, (int)DebugActions.ToggleBattleMode,
ToggleBattleMode);
#endif
Context.InputService.DisableMap(ActionMappings.OpenMovement);
if (Context.StateMachine.NextState == AppStates.BattleState) return;
await Context.SceneLoader.UnloadSceneAsync(SceneId.Testing);
await Context.SceneLoader.UnloadSceneAsync(SceneId.FirstTestingSegment);
await Context.SceneLoader.UnloadSceneAsync(SceneId.SecondTestingSegment);
@@ -1,11 +1,13 @@
using Cysharp.Threading.Tasks;
using UnityEngine;
namespace Code.OfficeGame.BattleMode.Actions
{
public abstract class BattleAction
public abstract class BattleAction : MonoBehaviour
{
public bool Finished { get; protected set; }
public abstract void Tick(float tickDelta);
public abstract UniTask<BattleActionDecisionResultCode> DecideAction();
public abstract BattleActionType ActionType { get; }
}
}
@@ -4,6 +4,7 @@ using Code.Infrastructure.Camera;
using Code.Infrastructure.Input;
using Cysharp.Threading.Tasks;
using KinematicCharacterController;
using Reflex.Attributes;
using UnityEngine;
using UnityEngine.AI;
using UnityEngine.InputSystem;
@@ -14,9 +15,9 @@ namespace Code.OfficeGame.BattleMode.Actions
{
private CameraStateMachine _cameraStateMachine;
private IInputService _inputService;
private PlayerMovementController _playerMovementController;
private MovementController _movementController;
private readonly NavMeshPath _path = new();
private NavMeshPath _path;
private Vector3[] _corners;
private int _currentCornerIndex;
@@ -25,14 +26,14 @@ namespace Code.OfficeGame.BattleMode.Actions
private const float StoppingDistance = 0.15f;
public BattleActionMove(
[Inject]
public void Construct(
CameraStateMachine cameraStateMachine,
IInputService inputService,
PlayerMovementController playerMovementController)
IInputService inputService)
{
_cameraStateMachine = cameraStateMachine;
_inputService = inputService;
_playerMovementController = playerMovementController;
_movementController = GetComponent<MovementController>();
_navMeshMask = LayerMask.GetMask("Environment");
}
@@ -46,7 +47,7 @@ namespace Code.OfficeGame.BattleMode.Actions
return;
}
Vector3 currentPos = _playerMovementController.Motor.TransientPosition;
Vector3 currentPos = _movementController.Motor.TransientPosition;
while (_currentCornerIndex < _corners.Length)
{
@@ -81,7 +82,7 @@ namespace Code.OfficeGame.BattleMode.Actions
float distance = moveDirection.magnitude;
Vector3 moveNormal = distance > 0.0001f ? moveDirection / distance : Vector3.zero;
float maxStep = _playerMovementController.MaxStableMoveSpeed * tickDelta;
float maxStep = _movementController.MaxStableMoveSpeed * tickDelta;
float inputMagnitude = (_currentCornerIndex == _corners.Length - 1 && distance < maxStep && maxStep > 0f)
? distance / maxStep
: 1f;
@@ -90,11 +91,11 @@ namespace Code.OfficeGame.BattleMode.Actions
{
MoveVector = moveNormal * inputMagnitude,
Look = moveNormal.sqrMagnitude > 0.0001f
? Quaternion.LookRotation(moveNormal, _playerMovementController.Motor.CharacterUp)
: _playerMovementController.Motor.TransientRotation
? Quaternion.LookRotation(moveNormal, _movementController.Motor.CharacterUp)
: _movementController.Motor.TransientRotation
};
_playerMovementController.SetInputs(ref aiInputs);
_movementController.SetInputs(ref aiInputs);
KinematicCharacterSystem.Simulate(
tickDelta,
@@ -102,7 +103,7 @@ namespace Code.OfficeGame.BattleMode.Actions
KinematicCharacterSystem.PhysicsMovers
);
Vector3 postMovePos = _playerMovementController.Motor.TransientPosition;
Vector3 postMovePos = _movementController.Motor.TransientPosition;
Vector3 toFinal = _corners[^1] - postMovePos;
toFinal.y = 0f;
@@ -117,10 +118,10 @@ namespace Code.OfficeGame.BattleMode.Actions
var emptyInputs = new AICharacterInputs
{
MoveVector = Vector3.zero,
Look = _playerMovementController.Motor.TransientRotation
Look = _movementController.Motor.TransientRotation
};
_playerMovementController.SetInputs(ref emptyInputs);
_playerMovementController.Motor.BaseVelocity = Vector3.zero;
_movementController.SetInputs(ref emptyInputs);
_movementController.Motor.BaseVelocity = Vector3.zero;
Finished = true;
}
@@ -132,7 +133,7 @@ namespace Code.OfficeGame.BattleMode.Actions
{
_waitForEnterTokenSource = new CancellationTokenSource();
_decisionResultCode = BattleActionDecisionResultCode.CancelDecision;
_targetPosition = _playerMovementController.transform.position;
_targetPosition = _movementController.transform.position;
_inputService.BindActionPerformed((int)ActionMappings.BattleMode, (int)BattleModeActions.Select,
SelectPosition);
@@ -158,6 +159,8 @@ namespace Code.OfficeGame.BattleMode.Actions
return _decisionResultCode;
}
public override BattleActionType ActionType => BattleActionType.Move;
private void CancelPosition(InputAction.CallbackContext obj)
{
_decisionResultCode = BattleActionDecisionResultCode.CancelDecision;
@@ -166,8 +169,10 @@ namespace Code.OfficeGame.BattleMode.Actions
private void ConfirmPosition(InputAction.CallbackContext input)
{
Vector3 startPos = _playerMovementController.Motor.TransientPosition;
Vector3 startPos = _movementController.Motor.TransientPosition;
_path = new();
if ((_targetPosition - startPos).sqrMagnitude > StoppingDistance * StoppingDistance
&& NavMesh.CalculatePath(startPos, _targetPosition, NavMesh.AllAreas, _path)
&& _path.corners.Length > 0)
@@ -19,5 +19,7 @@ namespace Code.OfficeGame.BattleMode.Actions
return BattleActionDecisionResultCode.Decided;
}
public override BattleActionType ActionType => BattleActionType.Wait;
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 8a301d248b3d4b3b8218e5e6d0bcb10a
timeCreated: 1792768701
@@ -0,0 +1,11 @@
using TinyGoose.Tremble;
using UnityEngine;
namespace Code.OfficeGame.BattleMode.Actions.Companions
{
[PrefabEntity()]
public class OnMapCompanion : MonoBehaviour
{
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 86667e70b64146cda8e1a79a88fb8d6d
timeCreated: 1792774265
@@ -15,5 +15,13 @@ namespace Code.OfficeGame.BattleMode.Actions
public Animator animator;
protected readonly Dictionary<BattleActionType, BattleAction> BattleActions = new();
private void Awake()
{
foreach (var action in GetComponents<BattleAction>())
{
BattleActions.Add(action.ActionType, action);
}
}
}
}
@@ -1,7 +1,4 @@
using System.Threading;
using Code.Game.Gameplay.Player;
using Code.Infrastructure.Camera;
using Code.Infrastructure.Input;
using Code.OfficeGame.BattleMode.UI;
using Cysharp.Threading.Tasks;
using Reflex.Attributes;
@@ -9,21 +6,10 @@ using UnityEngine;
namespace Code.OfficeGame.BattleMode.Actions.Player
{
public class PlayerTimelineActor : EntityTimelineActor
public class PlayerControlledTimelineActor : EntityTimelineActor
{
[Inject] private BattleActionDecisionPanel _battleActionDecisionPanel;
[Inject]
private void Construct(
CameraStateMachine cameraStateMachine,
IInputService inputService,
PlayerMovementController playerMovementController)
{
BattleActions.Add(BattleActionType.Wait, new BattleActionWait());
BattleActions.Add(BattleActionType.Move,
new BattleActionMove(cameraStateMachine, inputService, playerMovementController));
}
public override async UniTask DecideAction(CancellationToken ctx)
{
BattleActionDecisionResultCode decision = BattleActionDecisionResultCode.Deciding;
@@ -35,7 +21,7 @@ namespace Code.OfficeGame.BattleMode.Actions.Player
while (decidedAction == BattleActionType.None || ctx.IsCancellationRequested)
{
Cursor.lockState = CursorLockMode.Confined;
await _battleActionDecisionPanel.Open(ctx);
decidedAction = await _battleActionDecisionPanel.GetDecision(ctx);
@@ -45,10 +31,8 @@ namespace Code.OfficeGame.BattleMode.Actions.Player
&& !ctx.IsCancellationRequested)
{
Cursor.lockState = CursorLockMode.Locked;
await _battleActionDecisionPanel.Close(ctx);
// Панель UI здесь
await _battleActionDecisionPanel.Close(ctx);
decision = await BattleActions[decidedAction].DecideAction();
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Code.Game.Cleaning.Player;
using Code.Infrastructure.App;
@@ -43,6 +44,10 @@ namespace Code.Game.OfficeGame.GameStates
var container = Context.SceneContainerManager.ScenesContainers[SceneId.Testing];
// T
var entities =
Object.FindObjectsByType<EntityTimelineActor>().ToList();
if (Context.StateMachine.CurrentState == AppStates.Testing)
{
_battleTokenSource = new();
@@ -53,11 +58,14 @@ namespace Code.Game.OfficeGame.GameStates
KinematicCharacterSystem.Settings.Interpolate = false;
TogglePlayerBattleMode(container, false);
await Context.Camera.SwitchState(CameraMode.BattleMode);
}
List<EntityTimelineActor> entities = new List<EntityTimelineActor>(){container.Resolve<PlayerTimelineActor>()};
await Context.Camera.SwitchState(CameraMode.BattleMode);
foreach (var entity in entities)
{
entity.animator.enabled = false;
}
}
_battleTimeline.RunBattleLoopAsync(entities,_battleTokenSource.Token).Forget();
}
@@ -87,6 +95,15 @@ namespace Code.Game.OfficeGame.GameStates
var container = Context.SceneContainerManager.ScenesContainers[SceneId.Testing];
TogglePlayerBattleMode(container, true);
// T
var entities =
Object.FindObjectsByType<EntityTimelineActor>().ToList();
foreach (var entity in entities)
{
entity.animator.enabled = false;
}
}
#if UNITY_EDITOR
@@ -1,7 +1,10 @@
namespace Code.OfficeGame.BattleMode.Souls
{
/// <summary>
/// Идея такая, ты делаешь отдельные классы скиллов и накидываешь их на сущность в фабрике. Параметры скиллов можно прочитать из jsona, ActionMaker проходится по каждому компоненту скилла и читает для него параметры из конфига сущности.
/// Идея такая,
/// ты делаешь отдельные классы скиллов и накидываешь их на сущность в фабрике.
/// Параметры скиллов можно прочитать из jsona,
/// ActionMaker проходится по каждому компоненту скилла и читает для него параметры из конфига сущности.
/// </summary>
public interface IBattleActionCharacteristics
{
@@ -0,0 +1,12 @@
using TMPro;
using UnityEngine;
using UnityEngine.UI;
namespace Code.OfficeGame.BattleMode.UI
{
public class BattleActionDecisionButton : MonoBehaviour
{
public TMP_Text text;
public Button button;
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 9bf452c1274f4e78b36e619ddd26f0ae
timeCreated: 1792771940
@@ -14,9 +14,9 @@ namespace Code.OfficeGame.BattleMode.UI
public class BattleActionDecisionPanel : UIPanel
{
[SerializeField] private float duration = 0.35f;
[SerializeField] private Button actionButtonPrefab;
[SerializeField] private BattleActionDecisionButton actionButtonPrefab;
private List<Button> _actionButtons = new();
private List<BattleActionDecisionButton> _actionButtons = new();
private UniTaskCompletionSource<BattleActionType> _decisionCompletionSource;
private MotionHandle _motionHandle;
@@ -35,9 +35,9 @@ namespace Code.OfficeGame.BattleMode.UI
_actionButtons.Add(button);
button.onClick.AddListener(() => _decisionCompletionSource.TrySetResult(action));
button.button.onClick.AddListener(() => _decisionCompletionSource.TrySetResult(action));
//button.GetComponentInChildren<Text>().text = action.ToString();
button.text.text = action.ToString();
}
}
@@ -35,7 +35,7 @@ namespace Code.Game.Gameplay.Player
TowardsGroundSlopeAndGravity,
}
public class PlayerMovementController : MonoBehaviour, ICharacterController
public class MovementController : MonoBehaviour, ICharacterController
{
public KinematicCharacterMotor Motor;
@@ -9,7 +9,7 @@ namespace Code.Game.Cleaning.Player
{
public class PlayerControlsProvider : MonoBehaviour
{
[SerializeField] private PlayerMovementController playerMovementController;
[SerializeField] private MovementController movementController;
private IInputService _inputService;
@@ -43,7 +43,7 @@ namespace Code.Game.Cleaning.Player
CameraRotation = _cameraTransform.rotation
};
playerMovementController.SetInputs(ref inputs);
movementController.SetInputs(ref inputs);
}
private void OnDestroy()
@@ -76,4 +76,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.UI.BattleActionDecisionPanel
duration: 0.35
actionButtonPrefab: {fileID: 64152694776880282, guid: e819eb05998424f7fadfa8f2476b90d0, type: 3}
actionButtonPrefab: {fileID: -4413437300264931409, guid: e819eb05998424f7fadfa8f2476b90d0, type: 3}
@@ -149,6 +149,7 @@ GameObject:
- component: {fileID: 2951637714767654530}
- component: {fileID: 8983840756193511695}
- component: {fileID: 64152694776880282}
- component: {fileID: -4413437300264931409}
m_Layer: 5
m_Name: BattleActionVariant
m_TagString: Untagged
@@ -258,3 +259,17 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &-4413437300264931409
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7036087560756440366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9bf452c1274f4e78b36e619ddd26f0ae, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.UI.BattleActionDecisionButton
text: {fileID: 7136588327828071454}
button: {fileID: 64152694776880282}
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d7e5f06265f4e4ced837802f77750add
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,382 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2803727271692642277
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5593362814798891677}
- component: {fileID: 4307639055612455415}
- component: {fileID: 4837177428485194405}
- component: {fileID: 2436605912128236406}
m_Layer: 9
m_Name: Trigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5593362814798891677
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2803727271692642277}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7181020033174296370}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &4307639055612455415
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2803727271692642277}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.4
m_Height: 1
m_Direction: 1
m_Center: {x: 0, y: 0.5, z: 0}
--- !u!54 &4837177428485194405
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2803727271692642277}
serializedVersion: 5
m_Mass: 1
m_LinearDamping: 0
m_AngularDamping: 0
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 0
m_ImplicitTensor: 0
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &2436605912128236406
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2803727271692642277}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 630e34c01f57474894fcdb9490d516d9, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Game.OfficeGame.Location.LocationSegmentTrigger
segment: {fileID: 0}
--- !u!1 &4619667822637681491
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7181020033174296370}
- component: {fileID: 5202930854218025421}
- component: {fileID: 1099954219580652693}
- component: {fileID: 1169814968730905922}
- component: {fileID: 1804673105121893182}
- component: {fileID: 2855045673540557579}
- component: {fileID: 1642146228553031303}
- component: {fileID: 2915538842514811766}
m_Layer: 3
m_Name: Companion
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7181020033174296370
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4619667822637681491}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 45.766, y: 43.58717, z: -35.27224}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5593362814798891677}
- {fileID: 4247823100033486908}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &5202930854218025421
CapsuleCollider:
m_ObjectHideFlags: 8
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4619667822637681491}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.2
m_Height: 1.35
m_Direction: 1
m_Center: {x: 0, y: 0.675, z: 0}
--- !u!114 &1099954219580652693
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4619667822637681491}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d1bc5515e3ab954e80599c538834774, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::KinematicCharacterController.KinematicCharacterMotor
Capsule: {fileID: 5202930854218025421}
CapsuleRadius: 0.2
CapsuleHeight: 1.35
CapsuleYOffset: 0.675
CapsulePhysicsMaterial: {fileID: 0}
GroundDetectionExtraDistance: 0
MaxStableSlopeAngle: 60
StableGroundLayers:
serializedVersion: 2
m_Bits: 4294967295
DiscreteCollisionEvents: 0
StepHandling: 1
MaxStepHeight: 0.5
AllowSteppingWithoutStableGrounding: 0
MinRequiredStepDepth: 0
LedgeAndDenivelationHandling: 1
MaxStableDistanceFromLedge: 0
MaxVelocityForLedgeSnap: 0
MaxStableDenivelationAngle: 180
InteractiveRigidbodyHandling: 1
RigidbodyInteractionType: 0
SimulatedCharacterMass: 1
PreserveAttachedRigidbodyMomentum: 1
HasPlanarConstraint: 0
PlanarConstraintAxis: {x: 0, y: 0, z: 1}
MaxMovementIterations: 5
MaxDecollisionIterations: 1
CheckMovementInitialOverlaps: 1
KillVelocityWhenExceedMaxMovementIterations: 1
KillRemainingMovementWhenExceedMaxMovementIterations: 1
--- !u!114 &1169814968730905922
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4619667822637681491}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45d9830d22b54832ade96a92f599643a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Game.Gameplay.Player.PlayerMovementController
Motor: {fileID: 1099954219580652693}
Freeze: 0
MaxStableMoveSpeed: 3
StableMovementSharpness: 15
OrientationSharpness: 10
OrientationMethod: 0
MaxAirMoveSpeed: 15
AirAccelerationSpeed: 15
Drag: 0.1
BonusOrientationMethod: 0
BonusOrientationSharpness: 1
BonusOrientationGravitySharpness: 0
Gravity: {x: 0, y: -30, z: 0}
IgnoredColliders: []
--- !u!114 &1804673105121893182
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4619667822637681491}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 05290340b907438c8fcb9d5f0e75624f, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.Player.PlayerAnimator
--- !u!114 &2855045673540557579
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4619667822637681491}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f9f637cef8714ef1b5ec779d21630ebd, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.Actions.Player.PlayerTimelineActor
animator: {fileID: 7898434453111998107}
--- !u!114 &1642146228553031303
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4619667822637681491}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00995677816949ec99d2bd3546ec6597, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.Actions.BattleActionMove
--- !u!114 &2915538842514811766
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4619667822637681491}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3770c55e1e67e4805bcf322ae01885f3, type: 3}
m_Name:
m_EditorClassIdentifier: TinyGoose.Tremble::TinyGoose.Tremble.TrembleSpawnablePrefab
m_Category:
m_OverrideSprite: {fileID: 0}
m_OnlyVariants: 0
--- !u!1001 &7605556160149852300
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7181020033174296370}
m_Modifications:
- target: {fileID: 2089146250408781706, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3085754432330177036, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6850228883905936934, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_Name
value: 'Player '
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 6850228883905936934, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
insertIndex: -1
addedObject: {fileID: 7898434453111998107}
m_SourcePrefab: {fileID: 100100000, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
--- !u!1 &3935226780231757482 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6850228883905936934, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
m_PrefabInstance: {fileID: 7605556160149852300}
m_PrefabAsset: {fileID: 0}
--- !u!95 &7898434453111998107
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3935226780231757482}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 0a88085cbabf38ae084dd83fcdd5e566, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!4 &4247823100033486908 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
m_PrefabInstance: {fileID: 7605556160149852300}
m_PrefabAsset: {fileID: 0}
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 03ba714c851c038b3a144978275a6032
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+40 -14
View File
@@ -152,11 +152,13 @@ GameObject:
- component: {fileID: 4102848286648065809}
- component: {fileID: 6939642111494274883}
- component: {fileID: 2650801570508942627}
- component: {fileID: 382175622288203694}
- component: {fileID: 6013242802768923917}
- component: {fileID: 382175622288203694}
- component: {fileID: 3159895984765548440}
- component: {fileID: 4790439060519472847}
- component: {fileID: 7637701434054888247}
- component: {fileID: 9173176013943361802}
- component: {fileID: 2987723389966541299}
m_Layer: 3
m_Name: Player
m_TagString: Player
@@ -246,6 +248,19 @@ MonoBehaviour:
CheckMovementInitialOverlaps: 1
KillVelocityWhenExceedMaxMovementIterations: 1
KillRemainingMovementWhenExceedMaxMovementIterations: 1
--- !u!114 &6013242802768923917
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8373156178643037624}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 75c0d109df244d6ebf8c0eb976553c6a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Game.Cleaning.Player.PlayerControlsProvider
movementController: {fileID: 382175622288203694}
--- !u!114 &382175622288203694
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -272,19 +287,6 @@ MonoBehaviour:
BonusOrientationGravitySharpness: 0
Gravity: {x: 0, y: -30, z: 0}
IgnoredColliders: []
--- !u!114 &6013242802768923917
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8373156178643037624}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 75c0d109df244d6ebf8c0eb976553c6a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Game.Cleaning.Player.PlayerControlsProvider
playerMovementController: {fileID: 382175622288203694}
--- !u!114 &3159895984765548440
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -323,6 +325,30 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.Actions.Player.PlayerTimelineActor
animator: {fileID: 4090455171902986455}
--- !u!114 &9173176013943361802
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8373156178643037624}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00995677816949ec99d2bd3546ec6597, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.Actions.BattleActionMove
--- !u!114 &2987723389966541299
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8373156178643037624}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5af678ef30f04b7093df4488ed133bff, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.Actions.BattleActionWait
--- !u!1001 &3260788586600530971
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2687,26 +2687,17 @@
}
// entity 3
{
"classname" "prefab_Companion"
"origin" "8 -18 -11.5"
}
// entity 4
{
"classname" "func_group"
"_tb_type" "_tb_layer"
"_tb_name" "TriggersAndSuch"
"_tb_id" "2"
"_tb_layer_sort_index" "1"
}
// entity 4
{
"classname" "func_LocationSegmentTrigger"
"_tb_layer" "2"
// brush 0
{
( -768 0 -48 ) ( -768 1 -48 ) ( -768 0 -47 ) __TB_empty [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
( -768 -176 -48 ) ( -768 -176 -47 ) ( -767 -176 -48 ) __TB_empty [ 1 0 0 0 ] [ 0 0 -1 0 ] 270 1 1
( -768 0 -48 ) ( -767 0 -48 ) ( -768 1 -48 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 272 288 96 ) ( 272 289 96 ) ( 273 288 96 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 0 ] 180 1 1
( 272 288 -32 ) ( 273 288 -32 ) ( 272 288 -31 ) __TB_empty [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 432 288 -32 ) ( 432 288 -31 ) ( 432 289 -32 ) __TB_empty [ 0 1 0 0 ] [ 0 0 -1 0 ] 270 1 1
}
}
// entity 5
{
"classname" "func_InvisibleWall"
@@ -2721,3 +2712,17 @@
( 432 96 -64 ) ( 432 96 -63 ) ( 432 97 -64 ) Testing/TriggerInvis [ 0 1 0 64 ] [ 0 0 -1 0 ] 270 0.5 0.5
}
}
// entity 6
{
"classname" "func_LocationSegmentTrigger"
"_tb_layer" "2"
// brush 0
{
( -768 0 -48 ) ( -768 1 -48 ) ( -768 0 -47 ) __TB_empty [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
( -768 -176 -48 ) ( -768 -176 -47 ) ( -767 -176 -48 ) __TB_empty [ 1 0 0 0 ] [ 0 0 -1 0 ] 270 1 1
( -768 0 -48 ) ( -767 0 -48 ) ( -768 1 -48 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 272 288 96 ) ( 272 289 96 ) ( 273 288 96 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 0 ] 180 1 1
( 272 288 -32 ) ( 273 288 -32 ) ( 272 288 -31 ) __TB_empty [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 432 288 -32 ) ( 432 288 -31 ) ( 432 289 -32 ) __TB_empty [ 0 1 0 0 ] [ 0 0 -1 0 ] 270 1 1
}
}
+27
View File
@@ -109,6 +109,18 @@ MonoBehaviour:
m_ResolutionX: 2
m_ResolutionY: 2
m_Dirty: 0
- m_Material: {fileID: 2100000, guid: 210dbeeba7272c262a4e0f4c6f6bccc8, type: 2}
m_ExportMode: 0
m_IsResolutionOverridden: 0
m_ResolutionX: 2
m_ResolutionY: 2
m_Dirty: 0
- m_Material: {fileID: 2100000, guid: e490157c3bcaf6a0396958e21736c905, type: 2}
m_ExportMode: 0
m_IsResolutionOverridden: 0
m_ResolutionX: 2
m_ResolutionY: 2
m_Dirty: 0
m_PipelineSplitMesh: 1
m_PipelineSmoothMeshNormals: 1
m_PipelineSimplifyCollisionMeshes: 1
@@ -142,6 +154,11 @@ MonoBehaviour:
m_ExportClipSkipTextures: 1
m_ImportScale: 0.015625
m_AssetMetadatas:
- MapName: prefab_Companion
Path: Assets/OfficeGame/Companions/Companion.prefab
FullTypeName: UnityEngine.GameObject
AddressableName: Companion
SpawnOffset: {x: -0, y: -0.567395, z: -0.07391583}
- MapName: prefab_TestInteractable
Path: Assets/OfficeGame/Testing/TestInteractable.prefab
FullTypeName: UnityEngine.GameObject
@@ -187,6 +204,16 @@ MonoBehaviour:
FullTypeName: UnityEngine.Material
AddressableName: TriggerInvis
SpawnOffset: {x: 0, y: 0, z: 0}
- MapName: PlayerArms
Path: Assets/OfficeGame/Testing/TestPlayer/Materials/PlayerArms.mat
FullTypeName: UnityEngine.Material
AddressableName: PlayerArms
SpawnOffset: {x: 0, y: 0, z: 0}
- MapName: PlayerClothes
Path: Assets/OfficeGame/Testing/TestPlayer/Materials/PlayerClothes.mat
FullTypeName: UnityEngine.Material
AddressableName: PlayerClothes
SpawnOffset: {x: 0, y: 0, z: 0}
- MapName: Lit
Path: Packages/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat
FullTypeName: UnityEngine.Material