From 931d085429150f11a76af38bab3c0978cb650159 Mon Sep 17 00:00:00 2001 From: Nilton Constantino Date: Tue, 2 Jun 2026 10:26:15 +0100 Subject: [PATCH] replaced sentinel model and add dash --- Assets/# Prototype/{ToyTest => }/Models.meta | 2 +- Assets/# Prototype/Models/Sentinel.meta | 8 + .../Models/Sentinel/Sentinel Material.mat | 155 +++++++ .../Sentinel/Sentinel Material.mat.meta | 8 + .../# Prototype/Models/Sentinel/Textures.meta | 8 + .../Sentinel/Textures/sentinel.albedo.png | 3 + .../Textures/sentinel.albedo.png.meta | 390 ++++++++++++++++++ .../Textures/sentinel.emission-map.png | 3 + .../Textures/sentinel.emission-map.png.meta | 156 +++++++ .../Sentinel/Textures/sentinel.normal-map.png | 3 + .../Textures/sentinel.normal-map.png.meta | 156 +++++++ .../# Prototype/Models/Sentinel/sentinel.fbx | 3 + .../Models/Sentinel}/sentinel.fbx.meta | 144 ++++++- Assets/# Prototype/{ => Models}/ToyTest.meta | 0 .../{ => Models}/ToyTest/Animations.meta | 0 .../ToyTest/Animations/Idles.meta | 0 .../Animations/Idles/HumanM@Idle01-Idle02.fbx | 0 .../Idles/HumanM@Idle01-Idle02.fbx.meta | 0 .../Animations/Idles/HumanM@Idle01.fbx | 0 .../Animations/Idles/HumanM@Idle01.fbx.meta | 0 .../Animations/Idles/HumanM@Idle02-Idle01.fbx | 0 .../Idles/HumanM@Idle02-Idle01.fbx.meta | 0 .../Animations/Idles/HumanM@Idle02.fbx | 0 .../Animations/Idles/HumanM@Idle02.fbx.meta | 0 .../ToyTest/Animations/Movement.meta | 0 .../ToyTest/Animations/Movement/Jump.meta | 0 .../Movement/Jump/HumanM@Fall01.fbx | 0 .../Movement/Jump/HumanM@Fall01.fbx.meta | 0 .../Movement/Jump/HumanM@Jump01 - Begin.fbx | 0 .../Jump/HumanM@Jump01 - Begin.fbx.meta | 0 .../Movement/Jump/HumanM@Jump01 - Land.fbx | 0 .../Jump/HumanM@Jump01 - Land.fbx.meta | 0 .../Jump/HumanM@Jump01 [RM] - Begin.fbx | 0 .../Jump/HumanM@Jump01 [RM] - Begin.fbx.meta | 0 .../Jump/HumanM@Jump01 [RM] - Land.fbx | 0 .../Jump/HumanM@Jump01 [RM] - Land.fbx.meta | 0 .../Movement/Jump/HumanM@Jump01 [RM].fbx | 0 .../Movement/Jump/HumanM@Jump01 [RM].fbx.meta | 0 .../Movement/Jump/HumanM@Jump01.fbx | 0 .../Movement/Jump/HumanM@Jump01.fbx.meta | 0 .../ToyTest/Animations/Movement/Run.meta | 0 .../Movement/Run/HumanM@Run01_Backward.fbx | 0 .../Run/HumanM@Run01_Backward.fbx.meta | 0 .../Run/HumanM@Run01_BackwardLeft.fbx | 0 .../Run/HumanM@Run01_BackwardLeft.fbx.meta | 0 .../Run/HumanM@Run01_BackwardRight.fbx | 0 .../Run/HumanM@Run01_BackwardRight.fbx.meta | 0 .../Movement/Run/HumanM@Run01_Forward.fbx | 0 .../Run/HumanM@Run01_Forward.fbx.meta | 0 .../Movement/Run/HumanM@Run01_ForwardLeft.fbx | 0 .../Run/HumanM@Run01_ForwardLeft.fbx.meta | 0 .../Run/HumanM@Run01_ForwardRight.fbx | 0 .../Run/HumanM@Run01_ForwardRight.fbx.meta | 0 .../Movement/Run/HumanM@Run01_Left.fbx | 0 .../Movement/Run/HumanM@Run01_Left.fbx.meta | 0 .../Movement/Run/HumanM@Run01_Right.fbx | 0 .../Movement/Run/HumanM@Run01_Right.fbx.meta | 0 .../Animations/Movement/Run/RootMotion.meta | 0 .../RootMotion/HumanM@Run01_Backward [RM].fbx | 0 .../HumanM@Run01_Backward [RM].fbx.meta | 0 .../HumanM@Run01_BackwardLeft [RM].fbx | 0 .../HumanM@Run01_BackwardLeft [RM].fbx.meta | 0 .../HumanM@Run01_BackwardRight [RM].fbx | 0 .../HumanM@Run01_BackwardRight [RM].fbx.meta | 0 .../RootMotion/HumanM@Run01_Forward [RM].fbx | 0 .../HumanM@Run01_Forward [RM].fbx.meta | 0 .../HumanM@Run01_ForwardLeft [RM].fbx | 0 .../HumanM@Run01_ForwardLeft [RM].fbx.meta | 0 .../HumanM@Run01_ForwardRight [RM].fbx | 0 .../HumanM@Run01_ForwardRight [RM].fbx.meta | 0 .../Run/RootMotion/HumanM@Run01_Left [RM].fbx | 0 .../HumanM@Run01_Left [RM].fbx.meta | 0 .../RootMotion/HumanM@Run01_Right [RM].fbx | 0 .../HumanM@Run01_Right [RM].fbx.meta | 0 .../ToyTest/Animations/Movement/Sprint.meta | 0 .../Sprint/HumanM@Sprint01_Forward.fbx | 0 .../Sprint/HumanM@Sprint01_Forward.fbx.meta | 0 .../Sprint/HumanM@Sprint01_ForwardLeft.fbx | 0 .../HumanM@Sprint01_ForwardLeft.fbx.meta | 0 .../Sprint/HumanM@Sprint01_ForwardRight.fbx | 0 .../HumanM@Sprint01_ForwardRight.fbx.meta | 0 .../Movement/Sprint/HumanM@Sprint01_Left.fbx | 0 .../Sprint/HumanM@Sprint01_Left.fbx.meta | 0 .../Movement/Sprint/HumanM@Sprint01_Right.fbx | 0 .../Sprint/HumanM@Sprint01_Right.fbx.meta | 0 .../Movement/Sprint/RootMotion.meta | 0 .../HumanM@Sprint01_Forward [RM].fbx | 0 .../HumanM@Sprint01_Forward [RM].fbx.meta | 0 .../HumanM@Sprint01_ForwardLeft [RM].fbx | 0 .../HumanM@Sprint01_ForwardLeft [RM].fbx.meta | 0 .../HumanM@Sprint01_ForwardRight [RM].fbx | 0 ...HumanM@Sprint01_ForwardRight [RM].fbx.meta | 0 .../RootMotion/HumanM@Sprint01_Left [RM].fbx | 0 .../HumanM@Sprint01_Left [RM].fbx.meta | 0 .../RootMotion/HumanM@Sprint01_Right [RM].fbx | 0 .../HumanM@Sprint01_Right [RM].fbx.meta | 0 .../ToyTest/Animations/Movement/Turn.meta | 0 .../Movement/Turn/HumanM@Turn01_Left [RM].fbx | 0 .../Turn/HumanM@Turn01_Left [RM].fbx.meta | 0 .../Movement/Turn/HumanM@Turn01_Left.fbx | 0 .../Movement/Turn/HumanM@Turn01_Left.fbx.meta | 0 .../Turn/HumanM@Turn01_Right [RM].fbx | 0 .../Turn/HumanM@Turn01_Right [RM].fbx.meta | 0 .../Movement/Turn/HumanM@Turn01_Right.fbx | 0 .../Turn/HumanM@Turn01_Right.fbx.meta | 0 .../ToyTest/Animations/Movement/Walk.meta | 0 .../Movement/Walk/HumanM@Walk01_Backward.fbx | 0 .../Walk/HumanM@Walk01_Backward.fbx.meta | 0 .../Walk/HumanM@Walk01_BackwardLeft.fbx | 0 .../Walk/HumanM@Walk01_BackwardLeft.fbx.meta | 0 .../Walk/HumanM@Walk01_BackwardRight.fbx | 0 .../Walk/HumanM@Walk01_BackwardRight.fbx.meta | 0 .../Movement/Walk/HumanM@Walk01_Forward.fbx | 0 .../Walk/HumanM@Walk01_Forward.fbx.meta | 0 .../Walk/HumanM@Walk01_ForwardLeft.fbx | 0 .../Walk/HumanM@Walk01_ForwardLeft.fbx.meta | 0 .../Walk/HumanM@Walk01_ForwardRight.fbx | 0 .../Walk/HumanM@Walk01_ForwardRight.fbx.meta | 0 .../Movement/Walk/HumanM@Walk01_Left.fbx | 0 .../Movement/Walk/HumanM@Walk01_Left.fbx.meta | 0 .../Movement/Walk/HumanM@Walk01_Right.fbx | 0 .../Walk/HumanM@Walk01_Right.fbx.meta | 0 .../Animations/Movement/Walk/RootMotion.meta | 0 .../HumanM@Walk01_Backward [RM].fbx | 0 .../HumanM@Walk01_Backward [RM].fbx.meta | 0 .../HumanM@Walk01_BackwardLeft [RM].fbx | 0 .../HumanM@Walk01_BackwardLeft [RM].fbx.meta | 0 .../HumanM@Walk01_BackwardRight [RM].fbx | 0 .../HumanM@Walk01_BackwardRight [RM].fbx.meta | 0 .../RootMotion/HumanM@Walk01_Forward [RM].fbx | 0 .../HumanM@Walk01_Forward [RM].fbx.meta | 0 .../HumanM@Walk01_ForwardLeft [RM].fbx | 0 .../HumanM@Walk01_ForwardLeft [RM].fbx.meta | 0 .../HumanM@Walk01_ForwardRight [RM].fbx | 0 .../HumanM@Walk01_ForwardRight [RM].fbx.meta | 0 .../RootMotion/HumanM@Walk01_Left [RM].fbx | 0 .../HumanM@Walk01_Left [RM].fbx.meta | 0 .../RootMotion/HumanM@Walk01_Right [RM].fbx | 0 .../HumanM@Walk01_Right [RM].fbx.meta | 0 .../Animations/Movement/Walk/Walk.controller | 0 .../Movement/Walk/Walk.controller.meta | 0 .../ToyTest/Animations/Social.meta | 0 .../Animations/Social/Conversation.meta | 0 .../Social/Conversation/HumanM@Talk01.fbx | 0 .../Conversation/HumanM@Talk01.fbx.meta | 0 .../ToyTest}/HumanM_Model.fbx | 0 .../ToyTest}/HumanM_Model.fbx.meta | 0 Assets/# Prototype/Scripts/MeshColorSetter.cs | 39 +- Assets/Resources/Models/Sentinal/sentinel.fbx | 3 - Assets/Scenes/5. Gameplay.meta | 8 + Assets/Scenes/5. Gameplay.unity | 365 +++++++++++----- .../5. Gameplay/Global Volume Profile.asset | 66 +++ .../Global Volume Profile.asset.meta | 8 + .../Entities/Sentinel/SentinelEntity.cs | 5 +- .../Entities/Sentinel/SentinelInputs.cs | 1 + .../Entities/Sentinel/SentinelStateType.cs | 2 + .../StateMachine/States/SentinelStateDash.cs | 52 +++ .../States/SentinelStateDash.cs.meta | 3 + .../StateMachine/States/SentinelStateIdle.cs | 11 + .../StateMachine/States/SentinelStateRun.cs | 13 +- .../StateMachine/States/SentinelStateWalk.cs | 11 + .../Integration/Input/InputActions.cs | 50 +++ .../Input/InputActions.inputactions | 31 ++ .../Integration/Input/InputService.cs | 1 + 164 files changed, 1571 insertions(+), 137 deletions(-) rename Assets/# Prototype/{ToyTest => }/Models.meta (77%) create mode 100644 Assets/# Prototype/Models/Sentinel.meta create mode 100644 Assets/# Prototype/Models/Sentinel/Sentinel Material.mat create mode 100644 Assets/# Prototype/Models/Sentinel/Sentinel Material.mat.meta create mode 100644 Assets/# Prototype/Models/Sentinel/Textures.meta create mode 100644 Assets/# Prototype/Models/Sentinel/Textures/sentinel.albedo.png create mode 100644 Assets/# Prototype/Models/Sentinel/Textures/sentinel.albedo.png.meta create mode 100644 Assets/# Prototype/Models/Sentinel/Textures/sentinel.emission-map.png create mode 100644 Assets/# Prototype/Models/Sentinel/Textures/sentinel.emission-map.png.meta create mode 100644 Assets/# Prototype/Models/Sentinel/Textures/sentinel.normal-map.png create mode 100644 Assets/# Prototype/Models/Sentinel/Textures/sentinel.normal-map.png.meta create mode 100644 Assets/# Prototype/Models/Sentinel/sentinel.fbx rename Assets/{Resources/Models/Sentinal => # Prototype/Models/Sentinel}/sentinel.fbx.meta (53%) rename Assets/# Prototype/{ => Models}/ToyTest.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Idles.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Idles/HumanM@Idle01.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Idles/HumanM@Idle01.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Idles/HumanM@Idle02.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Idles/HumanM@Idle02.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Turn.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/Walk.controller (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Movement/Walk/Walk.controller.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Social.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Social/Conversation.meta (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx (100%) rename Assets/# Prototype/{ => Models}/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx.meta (100%) rename Assets/# Prototype/{ToyTest/Models => Models/ToyTest}/HumanM_Model.fbx (100%) rename Assets/# Prototype/{ToyTest/Models => Models/ToyTest}/HumanM_Model.fbx.meta (100%) delete mode 100644 Assets/Resources/Models/Sentinal/sentinel.fbx create mode 100644 Assets/Scenes/5. Gameplay.meta create mode 100644 Assets/Scenes/5. Gameplay/Global Volume Profile.asset create mode 100644 Assets/Scenes/5. Gameplay/Global Volume Profile.asset.meta create mode 100644 Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs create mode 100644 Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs.meta diff --git a/Assets/# Prototype/ToyTest/Models.meta b/Assets/# Prototype/Models.meta similarity index 77% rename from Assets/# Prototype/ToyTest/Models.meta rename to Assets/# Prototype/Models.meta index 268329b..d464234 100644 --- a/Assets/# Prototype/ToyTest/Models.meta +++ b/Assets/# Prototype/Models.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7278ad681fe961a49a8889ba9f9d45df +guid: 6d9100ceca4ad4823acdd71aee1abdd2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/# Prototype/Models/Sentinel.meta b/Assets/# Prototype/Models/Sentinel.meta new file mode 100644 index 0000000..17b5da3 --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f9ade34bbec9047b3885941270163ecb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/# Prototype/Models/Sentinel/Sentinel Material.mat b/Assets/# Prototype/Models/Sentinel/Sentinel Material.mat new file mode 100644 index 0000000..49614ec --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/Sentinel Material.mat @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7463508697044177707 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sentinel Material + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + - _NORMALMAP + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + - _SPECULAR_SETUP + m_InvalidKeywords: [] + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: a8d4198e0c4094324bc5f103d434faba, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 46a64441855154542af1fa7d718a0417, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 818dfad13c2a544c1934170bba48b804, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: a8d4198e0c4094324bc5f103d434faba, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnableExternalAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 1 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 0 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 228.1516, g: 228.1516, b: 228.1516, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/# Prototype/Models/Sentinel/Sentinel Material.mat.meta b/Assets/# Prototype/Models/Sentinel/Sentinel Material.mat.meta new file mode 100644 index 0000000..e085ddc --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/Sentinel Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c3adf965e73a4ddd82d952e7db5fd17 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/# Prototype/Models/Sentinel/Textures.meta b/Assets/# Prototype/Models/Sentinel/Textures.meta new file mode 100644 index 0000000..ce44f64 --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 715f3866fed2a4289bd7809d67092b66 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/# Prototype/Models/Sentinel/Textures/sentinel.albedo.png b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.albedo.png new file mode 100644 index 0000000..ce47b65 --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.albedo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05273a95b5d5a906b3bad97d5cc52c80ecef75ce304b84ee06e4451a916bd1e0 +size 66422 diff --git a/Assets/# Prototype/Models/Sentinel/Textures/sentinel.albedo.png.meta b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.albedo.png.meta new file mode 100644 index 0000000..642dd0b --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.albedo.png.meta @@ -0,0 +1,390 @@ +fileFormatVersion: 2 +guid: a8d4198e0c4094324bc5f103d434faba +TextureImporter: + internalIDToNameTable: + - first: + 213: 3404036065477093501 + second: sentinel.albedo_0 + - first: + 213: 1902473089941345698 + second: sentinel.albedo_1 + - first: + 213: -5049207061972991053 + second: sentinel.albedo_2 + - first: + 213: -3368639753875351411 + second: sentinel.albedo_3 + - first: + 213: -2295823435519909268 + second: sentinel.albedo_4 + - first: + 213: 1197796646736504739 + second: sentinel.albedo_5 + - first: + 213: 7287604762043607068 + second: sentinel.albedo_6 + - first: + 213: 4927806551634369239 + second: sentinel.albedo_7 + - first: + 213: 1813610643674101437 + second: sentinel.albedo_8 + - first: + 213: 8052733890449449824 + second: sentinel.albedo_9 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: sentinel.albedo_0 + rect: + serializedVersion: 2 + x: 26 + y: 700 + width: 139 + height: 299 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d78616524c09d3f20800000000000000 + internalID: 3404036065477093501 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sentinel.albedo_1 + rect: + serializedVersion: 2 + x: 167 + y: 478 + width: 845 + height: 546 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 2a591b01231f66a10800000000000000 + internalID: 1902473089941345698 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sentinel.albedo_2 + rect: + serializedVersion: 2 + x: 5 + y: 409 + width: 190 + height: 224 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 3b3c4b1ddec9de9b0800000000000000 + internalID: -5049207061972991053 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sentinel.albedo_3 + rect: + serializedVersion: 2 + x: 192 + y: 84 + width: 177 + height: 514 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d88100eddff2041d0800000000000000 + internalID: -3368639753875351411 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sentinel.albedo_4 + rect: + serializedVersion: 2 + x: 395 + y: 328 + width: 130 + height: 123 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c62a1dacfb89320e0800000000000000 + internalID: -2295823435519909268 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sentinel.albedo_5 + rect: + serializedVersion: 2 + x: 555 + y: 233 + width: 462 + height: 266 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 3a722e934bd6f9010800000000000000 + internalID: 1197796646736504739 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sentinel.albedo_6 + rect: + serializedVersion: 2 + x: 15 + y: 295 + width: 177 + height: 111 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c18ed017be5c22560800000000000000 + internalID: 7287604762043607068 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sentinel.albedo_7 + rect: + serializedVersion: 2 + x: 17 + y: 61 + width: 190 + height: 229 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 7da520833f5136440800000000000000 + internalID: 4927806551634369239 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sentinel.albedo_8 + rect: + serializedVersion: 2 + x: 360 + y: 4 + width: 422 + height: 275 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: db6ff01854d3b2910800000000000000 + internalID: 1813610643674101437 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sentinel.albedo_9 + rect: + serializedVersion: 2 + x: 822 + y: 66 + width: 135 + height: 121 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 0632df2eece01cf60800000000000000 + internalID: 8052733890449449824 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + sentinel.albedo_0: 3404036065477093501 + sentinel.albedo_1: 1902473089941345698 + sentinel.albedo_2: -5049207061972991053 + sentinel.albedo_3: -3368639753875351411 + sentinel.albedo_4: -2295823435519909268 + sentinel.albedo_5: 1197796646736504739 + sentinel.albedo_6: 7287604762043607068 + sentinel.albedo_7: 4927806551634369239 + sentinel.albedo_8: 1813610643674101437 + sentinel.albedo_9: 8052733890449449824 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/# Prototype/Models/Sentinel/Textures/sentinel.emission-map.png b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.emission-map.png new file mode 100644 index 0000000..1804e2e --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.emission-map.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f32aaee5ee7e7180aa5ecaf70fbc591adc260097356f234da9c20748e4d4d4e +size 21100 diff --git a/Assets/# Prototype/Models/Sentinel/Textures/sentinel.emission-map.png.meta b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.emission-map.png.meta new file mode 100644 index 0000000..a9d077a --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.emission-map.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 818dfad13c2a544c1934170bba48b804 +TextureImporter: + internalIDToNameTable: + - first: + 213: 3625434913059636154 + second: sentinel.emission-map_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: sentinel.emission-map_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ab3083558d1205230800000000000000 + internalID: 3625434913059636154 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + sentinel.emission-map_0: 3625434913059636154 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/# Prototype/Models/Sentinel/Textures/sentinel.normal-map.png b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.normal-map.png new file mode 100644 index 0000000..67a7f2a --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.normal-map.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16348b71567c95bbb8192ccfc7ea3fdf19d8aaa2f38fa2a89768b1217c98e07e +size 29901 diff --git a/Assets/# Prototype/Models/Sentinel/Textures/sentinel.normal-map.png.meta b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.normal-map.png.meta new file mode 100644 index 0000000..9eb1e3e --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/Textures/sentinel.normal-map.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 46a64441855154542af1fa7d718a0417 +TextureImporter: + internalIDToNameTable: + - first: + 213: -5776943164143343765 + second: sentinel.normal-map_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: sentinel.normal-map_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b676d9dbccc24dfa0800000000000000 + internalID: -5776943164143343765 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + sentinel.normal-map_0: -5776943164143343765 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/# Prototype/Models/Sentinel/sentinel.fbx b/Assets/# Prototype/Models/Sentinel/sentinel.fbx new file mode 100644 index 0000000..906d2ef --- /dev/null +++ b/Assets/# Prototype/Models/Sentinel/sentinel.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa74f990ab544ca96f4a2b187baadeb98193314cbfad240fa104ddb1d4d4c25e +size 630828 diff --git a/Assets/Resources/Models/Sentinal/sentinel.fbx.meta b/Assets/# Prototype/Models/Sentinel/sentinel.fbx.meta similarity index 53% rename from Assets/Resources/Models/Sentinal/sentinel.fbx.meta rename to Assets/# Prototype/Models/Sentinel/sentinel.fbx.meta index 64d1259..dd18c2c 100644 --- a/Assets/Resources/Models/Sentinal/sentinel.fbx.meta +++ b/Assets/# Prototype/Models/Sentinel/sentinel.fbx.meta @@ -1,11 +1,11 @@ fileFormatVersion: 2 -guid: 06b5bdbcaa7aa4dc0a67835f715c26d2 +guid: 208cb7d0ce6444ed7b55f4c4b4e632aa ModelImporter: serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: - materialImportMode: 2 + materialImportMode: 0 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -22,7 +22,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 0 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 @@ -31,7 +31,7 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: Armature|Idle + name: Idle takeName: Armature|Idle internalID: -8945691123924629249 firstFrame: 0 @@ -60,7 +60,7 @@ ModelImporter: maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 - serializedVersion: 16 - name: Armature|Walk + name: Walk takeName: Armature|Walk internalID: 8349542763059015795 firstFrame: 0 @@ -71,6 +71,122 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Run + takeName: Armature|Main + internalID: -8499704790666796489 + firstFrame: 101 + lastFrame: 137 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Dash + takeName: Armature|Main + internalID: 3938472908730161291 + firstFrame: 158 + lastFrame: 159 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Dash Landing + takeName: Armature|Main + internalID: 9206814923105168154 + firstFrame: 159 + lastFrame: 164 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Dash Breaking + takeName: Armature|Main + internalID: 44099723154497190 + firstFrame: 171 + lastFrame: 181 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 loopTime: 0 loopBlend: 0 loopBlendOrientation: 0 @@ -97,10 +213,10 @@ ModelImporter: useSRGBMaterialColor: 1 sortHierarchyByName: 1 importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 @@ -110,7 +226,7 @@ ModelImporter: weldVertices: 1 bakeAxisConversion: 0 preserveHierarchy: 0 - skinWeightsMode: 0 + skinWeightsMode: 1 maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 1 @@ -135,7 +251,7 @@ ModelImporter: normalCalculationMode: 4 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 + normalSmoothingSource: 3 referencedClips: [] importAnimation: 1 humanDescription: @@ -150,15 +266,15 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 globalScale: 1 - rootMotionBoneName: + rootMotionBoneName: Root hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Assets/# Prototype/ToyTest.meta b/Assets/# Prototype/Models/ToyTest.meta similarity index 100% rename from Assets/# Prototype/ToyTest.meta rename to Assets/# Prototype/Models/ToyTest.meta diff --git a/Assets/# Prototype/ToyTest/Animations.meta b/Assets/# Prototype/Models/ToyTest/Animations.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations.meta rename to Assets/# Prototype/Models/ToyTest/Animations.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Idles.meta b/Assets/# Prototype/Models/ToyTest/Animations/Idles.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Idles.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Idles.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle01-Idle02.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle01.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle01.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle01.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle01.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle01.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle01.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle01.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle01.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle02-Idle01.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle02.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle02.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle02.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle02.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle02.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle02.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Idles/HumanM@Idle02.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Idles/HumanM@Idle02.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Fall01.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Begin.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 - Land.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Begin.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM] - Land.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01 [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Jump/HumanM@Jump01.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Backward.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardLeft.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_BackwardRight.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Forward.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardLeft.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_ForwardRight.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Left.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/HumanM@Run01_Right.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Backward [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardLeft [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_BackwardRight [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Forward [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardLeft [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_ForwardRight [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Left [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Run/RootMotion/HumanM@Run01_Right [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Forward.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardLeft.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_ForwardRight.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Left.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/HumanM@Sprint01_Right.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Forward [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardLeft [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_ForwardRight [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Left [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Sprint/RootMotion/HumanM@Sprint01_Right [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Turn.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Turn.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Left.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Turn/HumanM@Turn01_Right.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Backward.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardLeft.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_BackwardRight.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Forward.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardLeft.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_ForwardRight.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Left.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/HumanM@Walk01_Right.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Backward [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardLeft [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_BackwardRight [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Forward [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardLeft [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_ForwardRight [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Left [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/RootMotion/HumanM@Walk01_Right [RM].fbx.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/Walk.controller b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/Walk.controller similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/Walk.controller rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/Walk.controller diff --git a/Assets/# Prototype/ToyTest/Animations/Movement/Walk/Walk.controller.meta b/Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/Walk.controller.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Movement/Walk/Walk.controller.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Movement/Walk/Walk.controller.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Social.meta b/Assets/# Prototype/Models/ToyTest/Animations/Social.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Social.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Social.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Social/Conversation.meta b/Assets/# Prototype/Models/ToyTest/Animations/Social/Conversation.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Social/Conversation.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Social/Conversation.meta diff --git a/Assets/# Prototype/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx b/Assets/# Prototype/Models/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx rename to Assets/# Prototype/Models/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx diff --git a/Assets/# Prototype/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx.meta b/Assets/# Prototype/Models/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx.meta rename to Assets/# Prototype/Models/ToyTest/Animations/Social/Conversation/HumanM@Talk01.fbx.meta diff --git a/Assets/# Prototype/ToyTest/Models/HumanM_Model.fbx b/Assets/# Prototype/Models/ToyTest/HumanM_Model.fbx similarity index 100% rename from Assets/# Prototype/ToyTest/Models/HumanM_Model.fbx rename to Assets/# Prototype/Models/ToyTest/HumanM_Model.fbx diff --git a/Assets/# Prototype/ToyTest/Models/HumanM_Model.fbx.meta b/Assets/# Prototype/Models/ToyTest/HumanM_Model.fbx.meta similarity index 100% rename from Assets/# Prototype/ToyTest/Models/HumanM_Model.fbx.meta rename to Assets/# Prototype/Models/ToyTest/HumanM_Model.fbx.meta diff --git a/Assets/# Prototype/Scripts/MeshColorSetter.cs b/Assets/# Prototype/Scripts/MeshColorSetter.cs index da843a6..d384a1f 100644 --- a/Assets/# Prototype/Scripts/MeshColorSetter.cs +++ b/Assets/# Prototype/Scripts/MeshColorSetter.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using Intrepid.Utilities; using Sirenix.OdinInspector; using UnityEngine; @@ -6,36 +7,36 @@ namespace __Prototype.Scripts { public sealed class MeshColorSetter : MonoBehaviour { - [GroupInjections, SerializeField] private Renderer meshRenderer; + [GroupInjections, SerializeField] private List meshRenderers; [GroupConfigurations, SerializeField] private Color color = Color.orange; private static readonly int BaseColor = Shader.PropertyToID("_BaseColor"); - - private MaterialPropertyBlock block; - - private void OnValidate() - { - meshRenderer ??= GetComponent(); - Paint(); - } - + private void Awake() - { - meshRenderer ??= GetComponent(); - } - - private void Start() { Paint(); } + [GroupDebug, Button(ButtonSizes.Medium)] + private void Detect() + { + var meshRendererArray = GetComponentsInChildren(); + if (meshRendererArray.Length > 0) + { + meshRenderers.AddRange(meshRendererArray); + } + } + [GroupDebug, Button(ButtonSizes.Medium)] private void Paint() { - block = new MaterialPropertyBlock(); - meshRenderer.GetPropertyBlock(block); - block.SetColor(BaseColor, color); - meshRenderer.SetPropertyBlock(block); + foreach (var meshRenderer in meshRenderers) + { + var block = new MaterialPropertyBlock(); + meshRenderer.GetPropertyBlock(block); + block.SetColor(BaseColor, color); + meshRenderer.SetPropertyBlock(block); + } } } } \ No newline at end of file diff --git a/Assets/Resources/Models/Sentinal/sentinel.fbx b/Assets/Resources/Models/Sentinal/sentinel.fbx deleted file mode 100644 index 6a33829..0000000 --- a/Assets/Resources/Models/Sentinal/sentinel.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98fb159be46985513045f8ce690660514e3c74ea1e737874a2cad9da3967371d -size 331116 diff --git a/Assets/Scenes/5. Gameplay.meta b/Assets/Scenes/5. Gameplay.meta new file mode 100644 index 0000000..ddc6601 --- /dev/null +++ b/Assets/Scenes/5. Gameplay.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e9f2b1997b394ba28e0f5ae853e9dc1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/5. Gameplay.unity b/Assets/Scenes/5. Gameplay.unity index 71cea92..c0253dd 100644 --- a/Assets/Scenes/5. Gameplay.unity +++ b/Assets/Scenes/5. Gameplay.unity @@ -356,7 +356,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 218819662} + meshRenderers: + - {fileID: 218819662} + - {fileID: 218819662} + - {fileID: 218819662} color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &237773309 GameObject: @@ -686,6 +689,142 @@ Transform: - {fileID: 744497484} m_Father: {fileID: 1187971236} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &347886466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 347886467} + - component: {fileID: 347886468} + m_Layer: 0 + m_Name: Dash + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &347886467 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 347886466} + 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: 1809909214} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &347886468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 347886466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 171f8caa3582448ba28b9d41709dba34, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Entities.Sentinel.StateMachine.States.SentinelStateDash + id: 8d7466b425f94746a40aabd3dda8c785 + startState: 0 + dash: {fileID: 3938472908730161291, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + speed: 30 + targetTime: 0.25 +--- !u!1001 &367797782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1532299329} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5361454489214488913, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 7c3adf965e73a4ddd82d952e7db5fd17, type: 2} + - target: {fileID: 35775663134194331, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 7c3adf965e73a4ddd82d952e7db5fd17, type: 2} + - target: {fileID: 685635198097692847, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 7c3adf965e73a4ddd82d952e7db5fd17, type: 2} + - target: {fileID: 919132149155446097, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: m_Name + value: sentinel + objectReference: {fileID: 0} + - target: {fileID: 1304202997708942189, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 7c3adf965e73a4ddd82d952e7db5fd17, type: 2} + - target: {fileID: 8128965180776884966, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 7c3adf965e73a4ddd82d952e7db5fd17, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} +--- !u!4 &367797783 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + m_PrefabInstance: {fileID: 367797782} + m_PrefabAsset: {fileID: 0} +--- !u!137 &367797784 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 685635198097692847, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + m_PrefabInstance: {fileID: 367797782} + m_PrefabAsset: {fileID: 0} --- !u!1 &381551037 GameObject: m_ObjectHideFlags: 0 @@ -1259,7 +1398,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 531468621} + meshRenderers: + - {fileID: 531468621} + - {fileID: 531468621} + - {fileID: 531468621} color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &539500807 GameObject: @@ -1456,7 +1598,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 570631795} + meshRenderers: + - {fileID: 570631795} + - {fileID: 570631795} + - {fileID: 570631795} color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &619394800 GameObject: @@ -1542,6 +1687,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &620445065 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -5361454489214488913, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + m_PrefabInstance: {fileID: 367797782} + m_PrefabAsset: {fileID: 0} --- !u!1 &744497483 GameObject: m_ObjectHideFlags: 0 @@ -1667,8 +1817,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 744497486} + meshRenderers: + - {fileID: 744497486} + - {fileID: 744497486} + - {fileID: 744497486} color: {r: 0.6156997, g: 0.2946778, b: 0.8113208, a: 1} +--- !u!137 &764913377 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 35775663134194331, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + m_PrefabInstance: {fileID: 367797782} + m_PrefabAsset: {fileID: 0} --- !u!1 &783026646 GameObject: m_ObjectHideFlags: 0 @@ -1907,7 +2065,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 810748575} + meshRenderers: + - {fileID: 810748575} + - {fileID: 810748575} + - {fileID: 810748575} color: {r: 0.9433962, g: 0.22694907, b: 0.30825463, a: 1} --- !u!1 &848110827 GameObject: @@ -2146,7 +2307,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 866608687} + meshRenderers: + - {fileID: 866608687} + - {fileID: 866608687} + - {fileID: 866608687} color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &873481847 GameObject: @@ -2237,10 +2401,10 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 + m_RenderPostProcessing: 1 + m_Antialiasing: 1 m_AntialiasingQuality: 2 - m_StopNaN: 0 + m_StopNaN: 1 m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 @@ -3092,7 +3256,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Entities.Sentinel.StateMachine.States.SentinelStateWalk id: b1e43e2bb9454a1e8ab9cfe2ee91294d startState: 0 - walk: {fileID: 3094330708855449807, guid: c133e3c197c12e04a9dd23bd0966910f, type: 3} + walk: {fileID: 8349542763059015795, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} speed: 5 --- !u!1 &1286810257 GameObject: @@ -3219,8 +3383,60 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 1286810260} + meshRenderers: + - {fileID: 1286810260} + - {fileID: 1286810260} + - {fileID: 1286810260} color: {r: 0.2801565, g: 1, b: 0, a: 1} +--- !u!1 &1365739463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1365739465} + - component: {fileID: 1365739464} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1365739464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1365739463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.Volume + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 2e1579fd5ab0247628cf5c3792c820cf, type: 2} +--- !u!4 &1365739465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1365739463} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1372692861 GameObject: m_ObjectHideFlags: 0 @@ -3682,7 +3898,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1549846660} + - {fileID: 367797783} m_Father: {fileID: 1478155984} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1532299330 @@ -3697,7 +3913,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9a35a5a99bdc4f769eb8145984b0aae9, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Entities.EntityModelAnimation - animator: {fileID: 1549846661} + animator: {fileID: 2042901331} --- !u!114 &1532299332 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3705,84 +3921,18 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532299328} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::MeshColorSetter - meshRenderer: {fileID: 1750149050} - color: {r: 1, g: 0.6470588, b: 0, a: 1} ---- !u!1001 &1549846659 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1532299329} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -2717395650310496025, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - - target: {fileID: 919132149155446097, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - propertyPath: m_Name - value: HumanM_Model - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} ---- !u!4 &1549846660 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - m_PrefabInstance: {fileID: 1549846659} - m_PrefabAsset: {fileID: 0} ---- !u!95 &1549846661 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - m_PrefabInstance: {fileID: 1549846659} - m_PrefabAsset: {fileID: 0} + meshRenderers: + - {fileID: 367797784} + - {fileID: 2033526841} + - {fileID: 764913377} + - {fileID: 620445065} + - {fileID: 2131542160} + color: {r: 1, g: 0.67031866, b: 0, a: 1} --- !u!1 &1552570364 GameObject: m_ObjectHideFlags: 0 @@ -4020,7 +4170,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 1655424716} + meshRenderers: + - {fileID: 1655424716} + - {fileID: 1655424716} + - {fileID: 1655424716} color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1001 &1663952117 PrefabInstance: @@ -4115,11 +4268,6 @@ Transform: - {fileID: 1223120087} m_Father: {fileID: 2054429927} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &1750149050 stripped -SkinnedMeshRenderer: - m_CorrespondingSourceObject: {fileID: -2717395650310496025, guid: 2faa610713d3b3c439473daa55e8c60a, type: 3} - m_PrefabInstance: {fileID: 1549846659} - m_PrefabAsset: {fileID: 0} --- !u!1 &1761661291 GameObject: m_ObjectHideFlags: 0 @@ -4295,7 +4443,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 1777983742} + meshRenderers: + - {fileID: 1777983742} + - {fileID: 1777983742} + - {fileID: 1777983742} color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &1809909213 GameObject: @@ -4330,6 +4481,7 @@ Transform: - {fileID: 2005349878} - {fileID: 1265844809} - {fileID: 1869388370} + - {fileID: 347886467} m_Father: {fileID: 1179841130} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1809909215 @@ -4392,7 +4544,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Entities.Sentinel.StateMachine.States.SentinelStateRun id: afbc9e2e2e9d4c548e79258241997736 startState: 0 - run: {fileID: 3094330708855449807, guid: 6deac83e30d8acd4cbb8c7d8a11545bd, type: 3} + run: {fileID: -8499704790666796489, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} speed: 10 --- !u!1 &1892732480 GameObject: @@ -4810,7 +4962,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Entities.Sentinel.StateMachine.States.SentinelStateIdle id: f047d3f87a024d16b34928df9710f80e startState: 1 - idle: {fileID: -2576967968662016515, guid: 56fd86b76fc74d24d83522069f5deb9b, type: 3} + idle: {fileID: -8945691123924629249, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} --- !u!1 &2017826518 GameObject: m_ObjectHideFlags: 0 @@ -5035,6 +5187,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2025587384} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!137 &2033526841 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 8128965180776884966, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + m_PrefabInstance: {fileID: 367797782} + m_PrefabAsset: {fileID: 0} --- !u!1 &2037572775 GameObject: m_ObjectHideFlags: 0 @@ -5160,8 +5317,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter - meshRenderer: {fileID: 2037572778} + meshRenderers: + - {fileID: 2037572778} + - {fileID: 2037572778} + - {fileID: 2037572778} color: {r: 0.2801565, g: 1, b: 0, a: 1} +--- !u!95 &2042901331 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + m_PrefabInstance: {fileID: 367797782} + m_PrefabAsset: {fileID: 0} --- !u!1 &2054429925 GameObject: m_ObjectHideFlags: 0 @@ -5320,6 +5485,11 @@ MonoBehaviour: zoomLevel: 1 enterZoomVelocity: 0.5 exitZoomVelocity: 0.5 +--- !u!137 &2131542160 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 1304202997708942189, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} + m_PrefabInstance: {fileID: 367797782} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -5330,3 +5500,4 @@ SceneRoots: - {fileID: 619394802} - {fileID: 2054429927} - {fileID: 1943926653} + - {fileID: 1365739465} diff --git a/Assets/Scenes/5. Gameplay/Global Volume Profile.asset b/Assets/Scenes/5. Gameplay/Global Volume Profile.asset new file mode 100644 index 0000000..647f5f6 --- /dev/null +++ b/Assets/Scenes/5. Gameplay/Global Volume Profile.asset @@ -0,0 +1,66 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1717348154791255713 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.Bloom + active: 1 + skipIterations: + m_OverrideState: 0 + m_Value: 1 + threshold: + m_OverrideState: 1 + m_Value: 0.9 + intensity: + m_OverrideState: 1 + m_Value: 1 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + clamp: + m_OverrideState: 0 + m_Value: 65472 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + filter: + m_OverrideState: 0 + m_Value: 0 + downscale: + m_OverrideState: 0 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dimension: 1 + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.VolumeProfile + components: + - {fileID: -1717348154791255713} diff --git a/Assets/Scenes/5. Gameplay/Global Volume Profile.asset.meta b/Assets/Scenes/5. Gameplay/Global Volume Profile.asset.meta new file mode 100644 index 0000000..48cce9b --- /dev/null +++ b/Assets/Scenes/5. Gameplay/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e1579fd5ab0247628cf5c3792c820cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelEntity.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelEntity.cs index 32d53a0..24339ce 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelEntity.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelEntity.cs @@ -22,7 +22,8 @@ namespace Intrepid.Gameplay.Entities.Sentinel public EntityModelAnimation ModelAnimation => modelAnimation; public Vector2 DesiredVelocity { get; set; } - + public Vector2 Forward => new(_desiredForward.x, _desiredForward.z); + public override void DeployEntity(Vector2 position) { } @@ -41,7 +42,7 @@ namespace Intrepid.Gameplay.Entities.Sentinel { return; } - + _desiredForward.x = direction.x; _desiredForward.y = 0; _desiredForward.z = direction.y; diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelInputs.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelInputs.cs index bfb5baa..efeee68 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelInputs.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelInputs.cs @@ -6,5 +6,6 @@ namespace Intrepid.Gameplay.Entities.Sentinel public class SentinelInputs { public Func Movement { get; set; } + public Func Dash { get; set; } } } \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelStateType.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelStateType.cs index 7f9e230..a2b99a1 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelStateType.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelStateType.cs @@ -9,5 +9,7 @@ namespace Intrepid.Gameplay.Entities.Sentinel Walk = 20, Run = 30, + + Dash = 40, } } \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs new file mode 100644 index 0000000..a67756b --- /dev/null +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs @@ -0,0 +1,52 @@ +using Intrepid.Structures; +using Intrepid.Utilities; +using UnityEngine; + +namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +{ + public class SentinelStateDash : SentinelState + { + [GroupConfigurations, SerializeField] private AnimationClip dash; + [GroupConfigurations, SerializeField, Range(0, 100)] private float speed = 30; + [GroupConfigurations, SerializeField, Range(0, 10)] private float targetTime = 1.5f; + + private Timer Timer { get; } = new(); + + public override SentinelStateType GetStateKey() + { + return SentinelStateType.Dash; + } + + protected override void Subscriptions() + { + } + + protected override void RunOnEnter(ParameterStore parameterStore) + { + Brain.Entity.ModelAnimation.CrossFade(dash, 0.01f); + Brain.Entity.ChangeModelAnimation(SentinelStateType.Dash); + Timer.Start(); + } + + protected override void RunOnExit() + { + Timer.Stop(); + } + + public override void RunOnUpdate() + { + if (Timer.IsNotRunning) + { + Brain.ChangeState(SentinelStateType.Idle); + return; + } + Timer.Update(Time.deltaTime); + if (Timer.Check(targetTime)) + { + Timer.Stop(); + return; + } + Brain.Entity.DesiredVelocity = Brain.Entity.Forward * speed; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs.meta new file mode 100644 index 0000000..c367b14 --- /dev/null +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 171f8caa3582448ba28b9d41709dba34 +timeCreated: 1780388891 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateIdle.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateIdle.cs index dd8c405..5ee0f31 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateIdle.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateIdle.cs @@ -28,9 +28,20 @@ namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States public override void RunOnUpdate() { Movement = Brain.Inputs.Movement(); + if (CheckDash()) return; if (CheckMovement()) return; } + private bool CheckDash() + { + if (Brain.Inputs.Dash()) + { + Brain.ChangeState(SentinelStateType.Dash); + return true; + } + return false; + } + private bool CheckMovement() { switch (Movement.sqrMagnitude) diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateRun.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateRun.cs index dfbecd4..19c0de7 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateRun.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateRun.cs @@ -34,10 +34,21 @@ namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States { Movement = Brain.Inputs.Movement(); Brain.Entity.ChangeOrientation(Movement); + if (CheckDash()) return; if (CheckMovement()) return; Brain.Entity.DesiredVelocity = Movement * speed; } - + + private bool CheckDash() + { + if (Brain.Inputs.Dash()) + { + Brain.ChangeState(SentinelStateType.Dash); + return true; + } + return false; + } + private bool CheckMovement() { switch (Movement.sqrMagnitude) diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateWalk.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateWalk.cs index edecc35..009c9e9 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateWalk.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateWalk.cs @@ -34,10 +34,21 @@ namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States { Movement = Brain.Inputs.Movement(); Brain.Entity.ChangeOrientation(Movement); + if (CheckDash()) return; if (CheckMovement()) return; Brain.Entity.DesiredVelocity = Movement * speed; } + private bool CheckDash() + { + if (Brain.Inputs.Dash()) + { + Brain.ChangeState(SentinelStateType.Dash); + return true; + } + return false; + } + private bool CheckMovement() { switch (Movement.sqrMagnitude) diff --git a/Assets/Scripts/Intrepid/Integration/Input/InputActions.cs b/Assets/Scripts/Intrepid/Integration/Input/InputActions.cs index 6a775cd..df8327d 100644 --- a/Assets/Scripts/Intrepid/Integration/Input/InputActions.cs +++ b/Assets/Scripts/Intrepid/Integration/Input/InputActions.cs @@ -100,6 +100,15 @@ public partial class @InputActions: IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": true + }, + { + ""name"": ""Dash"", + ""type"": ""Button"", + ""id"": ""21d860b9-b58e-4f23-b7cf-b5c68c7f8e1a"", + ""expectedControlType"": """", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -168,6 +177,28 @@ public partial class @InputActions: IInputActionCollection2, IDisposable ""action"": ""Movement"", ""isComposite"": false, ""isPartOfComposite"": true + }, + { + ""name"": """", + ""id"": ""7a719c84-80f2-43d7-b290-bec38a256d05"", + ""path"": ""/buttonSouth"", + ""interactions"": """", + ""processors"": """", + ""groups"": "";Gamepad"", + ""action"": ""Dash"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""9fd85047-ae6f-4f4e-a572-e0095a35ca06"", + ""path"": ""/space"", + ""interactions"": """", + ""processors"": """", + ""groups"": "";Keyboard & Mouse"", + ""action"": ""Dash"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -205,6 +236,7 @@ public partial class @InputActions: IInputActionCollection2, IDisposable // sentinel m_sentinel = asset.FindActionMap("sentinel", throwIfNotFound: true); m_sentinel_Movement = m_sentinel.FindAction("Movement", throwIfNotFound: true); + m_sentinel_Dash = m_sentinel.FindAction("Dash", throwIfNotFound: true); } ~@InputActions() @@ -286,6 +318,7 @@ public partial class @InputActions: IInputActionCollection2, IDisposable private readonly InputActionMap m_sentinel; private List m_SentinelActionsCallbackInterfaces = new List(); private readonly InputAction m_sentinel_Movement; + private readonly InputAction m_sentinel_Dash; /// /// Provides access to input actions defined in input action map "sentinel". /// @@ -302,6 +335,10 @@ public partial class @InputActions: IInputActionCollection2, IDisposable /// public InputAction @Movement => m_Wrapper.m_sentinel_Movement; /// + /// Provides access to the underlying input action "sentinel/Dash". + /// + public InputAction @Dash => m_Wrapper.m_sentinel_Dash; + /// /// Provides access to the underlying input action map instance. /// public InputActionMap Get() { return m_Wrapper.m_sentinel; } @@ -330,6 +367,9 @@ public partial class @InputActions: IInputActionCollection2, IDisposable @Movement.started += instance.OnMovement; @Movement.performed += instance.OnMovement; @Movement.canceled += instance.OnMovement; + @Dash.started += instance.OnDash; + @Dash.performed += instance.OnDash; + @Dash.canceled += instance.OnDash; } /// @@ -344,6 +384,9 @@ public partial class @InputActions: IInputActionCollection2, IDisposable @Movement.started -= instance.OnMovement; @Movement.performed -= instance.OnMovement; @Movement.canceled -= instance.OnMovement; + @Dash.started -= instance.OnDash; + @Dash.performed -= instance.OnDash; + @Dash.canceled -= instance.OnDash; } /// @@ -417,5 +460,12 @@ public partial class @InputActions: IInputActionCollection2, IDisposable /// /// void OnMovement(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Dash" is either , or . + /// + /// + /// + /// + void OnDash(InputAction.CallbackContext context); } } diff --git a/Assets/Scripts/Intrepid/Integration/Input/InputActions.inputactions b/Assets/Scripts/Intrepid/Integration/Input/InputActions.inputactions index 6a12f69..7eb4f3f 100644 --- a/Assets/Scripts/Intrepid/Integration/Input/InputActions.inputactions +++ b/Assets/Scripts/Intrepid/Integration/Input/InputActions.inputactions @@ -14,6 +14,15 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "Dash", + "type": "Button", + "id": "21d860b9-b58e-4f23-b7cf-b5c68c7f8e1a", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -82,6 +91,28 @@ "action": "Movement", "isComposite": false, "isPartOfComposite": true + }, + { + "name": "", + "id": "7a719c84-80f2-43d7-b290-bec38a256d05", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Dash", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9fd85047-ae6f-4f4e-a572-e0095a35ca06", + "path": "/space", + "interactions": "", + "processors": "", + "groups": ";Keyboard & Mouse", + "action": "Dash", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/Scripts/Intrepid/Integration/Input/InputService.cs b/Assets/Scripts/Intrepid/Integration/Input/InputService.cs index 75b5f59..e3dc117 100644 --- a/Assets/Scripts/Intrepid/Integration/Input/InputService.cs +++ b/Assets/Scripts/Intrepid/Integration/Input/InputService.cs @@ -61,6 +61,7 @@ namespace Intrepid.Integration.Input Movement = () => Locking.IsNotLocked ? InputActions.sentinel.Movement.ReadValue().normalized : Vector2.zero, + Dash = () => Locking.IsNotLocked && InputActions.sentinel.Dash.WasPressedThisFrame(), }; } }