diff --git a/BlueWater/Assets/01.Scenes/02.Main_TG2.unity b/BlueWater/Assets/01.Scenes/02.Main_TG2.unity index 6acb45079..a79eeed6e 100644 --- a/BlueWater/Assets/01.Scenes/02.Main_TG2.unity +++ b/BlueWater/Assets/01.Scenes/02.Main_TG2.unity @@ -15471,6 +15471,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0407cd1376cad7e46816e897ac9f698d, type: 3} m_Name: m_EditorClassIdentifier: + _persistent: 0 k__BackingField: serializedVersion: 2 m_Bits: 8 @@ -15545,10 +15546,10 @@ MonoBehaviour: selectedUnitController: {fileID: 0} unitLayer: serializedVersion: 2 - m_Bits: 0 + m_Bits: 1536 groundLayer: serializedVersion: 2 - m_Bits: 0 + m_Bits: 8 --- !u!1 &279690615 GameObject: m_ObjectHideFlags: 0 @@ -35046,6 +35047,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 172.56946 objectReference: {fileID: 0} + - target: {fileID: 6047348452593534959, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, + type: 3} + propertyPath: k__BackingField.penetrationResistivity + value: 100 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -54443,7 +54449,7 @@ MonoBehaviour: arrowMaxSize: 100 shootLocation: {fileID: 1395869082} arrowsPoolLocation: {fileID: 0} - inaccuracy: 1 + inaccuracy: 0 --- !u!4 &1115821942 Transform: m_ObjectHideFlags: 0 @@ -55358,7 +55364,7 @@ MonoBehaviour: arrowMaxSize: 100 shootLocation: {fileID: 704106279} arrowsPoolLocation: {fileID: 0} - inaccuracy: 1 + inaccuracy: 0 --- !u!4 &1127294349 Transform: m_ObjectHideFlags: 0 @@ -82660,7 +82666,7 @@ MonoBehaviour: arrowMaxSize: 100 shootLocation: {fileID: 99212769} arrowsPoolLocation: {fileID: 0} - inaccuracy: 1 + inaccuracy: 0 --- !u!4 &1743857003 Transform: m_ObjectHideFlags: 0 @@ -88761,7 +88767,7 @@ MonoBehaviour: arrowMaxSize: 100 shootLocation: {fileID: 1017233787} arrowsPoolLocation: {fileID: 0} - inaccuracy: 1 + inaccuracy: 0 --- !u!4 &1885122989 Transform: m_ObjectHideFlags: 0 diff --git a/BlueWater/Assets/02.Scripts/Ai/AiController.cs b/BlueWater/Assets/02.Scripts/Ai/AiController.cs index 4d9c45e91..36508cd66 100644 --- a/BlueWater/Assets/02.Scripts/Ai/AiController.cs +++ b/BlueWater/Assets/02.Scripts/Ai/AiController.cs @@ -48,6 +48,7 @@ namespace BlueWaterProject private static readonly int DamageHash = Animator.StringToHash("TakeDamage"); private static readonly int DeathTypeHash = Animator.StringToHash("DeathType"); private static readonly int DeathHash = Animator.StringToHash("Death"); + private static readonly int ShieldHash = Animator.StringToHash("Shield"); private static readonly int OutlineColorHash = Shader.PropertyToID("_OutlineColor"); private static readonly WaitForSeconds FindTargetWaitTime = new(0.5f); @@ -156,7 +157,7 @@ namespace BlueWaterProject // 방패 막기 체크 if (finalDamage == 0f) { - // TODO : 방패로 막힘 처리(애니메이션 등) + aiAnimator.SetTrigger(ShieldHash); return; } var changeHp = Mathf.Max(defender.currentHp - finalDamage, 0); diff --git a/BlueWater/Assets/02.Scripts/Ai/Unit/UnitController.cs b/BlueWater/Assets/02.Scripts/Ai/Unit/UnitController.cs index b68cd72af..5d68509d0 100644 --- a/BlueWater/Assets/02.Scripts/Ai/Unit/UnitController.cs +++ b/BlueWater/Assets/02.Scripts/Ai/Unit/UnitController.cs @@ -47,11 +47,8 @@ namespace BlueWaterProject private void OnDrawGizmosSelected() { if (unit == null || unit.soliderCount <= 0) return; - - var unitManager = Application.isPlaying ? GameManager.Inst.UnitManager : FindObjectOfType(); - if (unitManager == null) return; - var matrix = unitManager.UnitMatrices.Find(um => um.soldiers == unit.soliderCount); + var matrix = UnitManager.Inst.UnitMatrices.Find(um => um.soldiers == unit.soliderCount); if (matrix == null) return; for (var i = 0; i < unit.soliderCount; i++) @@ -64,8 +61,8 @@ namespace BlueWaterProject var spawnPosition = transform.position + new Vector3(xOffset, 0, zOffset); var ray = new Ray(spawnPosition, Vector3.down); - Gizmos.color = Physics.Raycast(ray, unitManager.MaxGroundDistance, unitManager.GroundLayer) ? Color.green : Color.red; - Gizmos.DrawRay(ray.origin, ray.direction * unitManager.MaxGroundDistance); + Gizmos.color = Physics.Raycast(ray, UnitManager.Inst.MaxGroundDistance, UnitManager.Inst.GroundLayer) ? Color.blue : Color.red; + Gizmos.DrawRay(ray.origin, ray.direction * UnitManager.Inst.MaxGroundDistance); } } #endif @@ -80,7 +77,7 @@ namespace BlueWaterProject return; } - GameManager.Inst.UnitManager.CreateUnit(this, unit); + UnitManager.Inst.CreateUnit(this, unit); } public void MoveCommand(Vector3 targetPos) diff --git a/BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs b/BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs index 5d8411759..53ee73993 100644 --- a/BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs +++ b/BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Text; using UnityEngine; -using UnityEngine.Serialization; -using UnityEngine.UIElements; // ReSharper disable once CheckNamespace namespace BlueWaterProject @@ -24,7 +22,7 @@ namespace BlueWaterProject } } - public class UnitManager : MonoBehaviour + public class UnitManager : Singleton { #region Property and variable @@ -37,7 +35,6 @@ namespace BlueWaterProject [Tooltip("병력 간의 간격")] [field: SerializeField] public float SoldierSpacing { get; private set; } = 0.5f; - [Tooltip("부대 배치 행렬")] [field: SerializeField] public List UnitMatrices { get; private set; } = new(9); @@ -48,8 +45,9 @@ namespace BlueWaterProject #region Unity built-in function - private void Awake() + protected override void Awake() { + base.Awake(); GroundLayer = LayerMask.GetMask("Ground"); InitUnitMatrices(); } diff --git a/BlueWater/Assets/02.Scripts/GameManager.cs b/BlueWater/Assets/02.Scripts/GameManager.cs index da7d0b865..af4ea1951 100644 --- a/BlueWater/Assets/02.Scripts/GameManager.cs +++ b/BlueWater/Assets/02.Scripts/GameManager.cs @@ -8,12 +8,10 @@ using UnityEngine; public class GameManager : Singleton { - [Title("Manager")] - public UnitManager UnitManager { get; private set; } - [Title("Controller")] public CameraController CameraController { get; private set; } - + public UiController UiController { get; private set; } + public Player player; public List boats = new List(10); @@ -23,9 +21,8 @@ public class GameManager : Singleton private void Init() { - UnitManager = FindObjectOfType(); - CameraController = FindObjectOfType(); + UiController = FindObjectOfType(); player = FindObjectOfType(); } diff --git a/BlueWater/Assets/07.Animation/SpearKnight.controller b/BlueWater/Assets/07.Animation/SpearKnight.controller index 72d48cbab..85c4b1a29 100644 --- a/BlueWater/Assets/07.Animation/SpearKnight.controller +++ b/BlueWater/Assets/07.Animation/SpearKnight.controller @@ -87,31 +87,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-7488432702046877422 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: TakeDamage - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -4719989283223396458} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-6677449554117134834 AnimatorState: serializedVersion: 6 @@ -164,6 +139,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-4964639486241634019 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7758239304624801405} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-4719989283223396458 AnimatorState: serializedVersion: 6 @@ -216,6 +213,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-3521956276084473473 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: shield + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4964639486241634019} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: fad532976aef0604d8da1deb159e63c5, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-3262334696151519221 AnimatorState: serializedVersion: 6 @@ -257,9 +282,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.625 + m_ExitTime: 0 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -334,37 +359,43 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: AttackType m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: DeathType m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Attack m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: TakeDamage m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Death m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Shield + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base @@ -473,9 +504,11 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -4719989283223396458} m_Position: {x: 310, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3521956276084473473} + m_Position: {x: 560, y: 10, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: - - {fileID: -7488432702046877422} + m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -484,6 +517,31 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 7758239304624801405} +--- !u!1101 &3405285449147337565 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: TakeDamage + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4719989283223396458} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &3907710630580683776 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -563,6 +621,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &6819860108047880931 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Shield + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3521956276084473473} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &7243255047482691604 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -634,6 +717,8 @@ AnimatorState: m_Transitions: - {fileID: 301483702199899037} - {fileID: 7243255047482691604} + - {fileID: 3405285449147337565} + - {fileID: 6819860108047880931} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/BlueWater/Assets/07.Animation/SwordKnight.controller b/BlueWater/Assets/07.Animation/SwordKnight.controller index d0d2b697e..bf5a82075 100644 --- a/BlueWater/Assets/07.Animation/SwordKnight.controller +++ b/BlueWater/Assets/07.Animation/SwordKnight.controller @@ -87,31 +87,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-7488432702046877422 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: TakeDamage - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -4719989283223396458} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-6677449554117134834 AnimatorState: serializedVersion: 6 @@ -138,6 +113,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-6189812939229497328 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7758239304624801405} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-5613045854842106462 AnimatorState: serializedVersion: 6 @@ -191,6 +188,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-4045453461931593296 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: TakeDamage + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4719989283223396458} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-4045398789960513325 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -257,14 +279,39 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.625 + m_ExitTime: 0 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-2518914645794723038 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Shield + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2059816866184708915} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1588768182804401634 AnimatorState: serializedVersion: 6 @@ -334,37 +381,43 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: AttackType m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: DeathType m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Attack m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: TakeDamage m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Death m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Shield + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base @@ -473,17 +526,47 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -4719989283223396458} m_Position: {x: 310, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2059816866184708915} + m_Position: {x: 550, y: 10, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: - - {fileID: -7488432702046877422} + m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 420, y: -80, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 7758239304624801405} +--- !u!1102 &2059816866184708915 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: shield + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6189812939229497328} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: fad532976aef0604d8da1deb159e63c5, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &3907710630580683776 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -634,6 +717,8 @@ AnimatorState: m_Transitions: - {fileID: 301483702199899037} - {fileID: 7243255047482691604} + - {fileID: -4045453461931593296} + - {fileID: -2518914645794723038} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/BlueWater/Assets/08.Models.meta b/BlueWater/Assets/08.Models.meta new file mode 100644 index 000000000..93f1acec3 --- /dev/null +++ b/BlueWater/Assets/08.Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea2e000ed839bae4e84db5d9bbb6c421 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/08.Models/Sword And Shield Impact.fbx b/BlueWater/Assets/08.Models/Sword And Shield Impact.fbx new file mode 100644 index 000000000..731f0ac30 Binary files /dev/null and b/BlueWater/Assets/08.Models/Sword And Shield Impact.fbx differ diff --git a/BlueWater/Assets/08.Models/Sword And Shield Impact.fbx.meta b/BlueWater/Assets/08.Models/Sword And Shield Impact.fbx.meta new file mode 100644 index 000000000..3ac2f1b87 --- /dev/null +++ b/BlueWater/Assets/08.Models/Sword And Shield Impact.fbx.meta @@ -0,0 +1,884 @@ +fileFormatVersion: 2 +guid: fad532976aef0604d8da1deb159e63c5 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 3 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: shield + takeName: mixamo.com + internalID: -203655887218126122 + firstFrame: 0 + lastFrame: 23 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: + - boneName: mixamorig:Hips + humanName: Hips + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftUpLeg + humanName: LeftUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightUpLeg + humanName: RightUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftLeg + humanName: LeftLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightLeg + humanName: RightLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftFoot + humanName: LeftFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightFoot + humanName: RightFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine + humanName: Spine + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine1 + humanName: Chest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Neck + humanName: Neck + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Head + humanName: Head + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftShoulder + humanName: LeftShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightShoulder + humanName: RightShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftArm + humanName: LeftUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightArm + humanName: RightUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftForeArm + humanName: LeftLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightForeArm + humanName: RightLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHand + humanName: LeftHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHand + humanName: RightHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftToeBase + humanName: LeftToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightToeBase + humanName: RightToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb1 + humanName: Left Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb2 + humanName: Left Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb3 + humanName: Left Thumb Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex1 + humanName: Left Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex2 + humanName: Left Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex3 + humanName: Left Index Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandMiddle1 + humanName: Left Middle Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandMiddle2 + humanName: Left Middle Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandMiddle3 + humanName: Left Middle Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandRing1 + humanName: Left Ring Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandRing2 + humanName: Left Ring Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandRing3 + humanName: Left Ring Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandPinky1 + humanName: Left Little Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandPinky2 + humanName: Left Little Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandPinky3 + humanName: Left Little Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb1 + humanName: Right Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb2 + humanName: Right Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb3 + humanName: Right Thumb Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex1 + humanName: Right Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex2 + humanName: Right Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex3 + humanName: Right Index Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandMiddle1 + humanName: Right Middle Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandMiddle2 + humanName: Right Middle Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandMiddle3 + humanName: Right Middle Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandRing1 + humanName: Right Ring Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandRing2 + humanName: Right Ring Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandRing3 + humanName: Right Ring Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandPinky1 + humanName: Right Little Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandPinky2 + humanName: Right Little Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandPinky3 + humanName: Right Little Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine2 + humanName: UpperChest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + skeleton: + - name: Sword And Shield Impact(Clone) + parentName: + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Hips + parentName: Sword And Shield Impact(Clone) + position: {x: 0.009195865, y: 0.9984519, z: 0.009432858} + rotation: {x: -0.005997938, y: -0.0021258, z: -0.050051715, w: 0.99872637} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: -0, y: 0.10182399, z: 0} + rotation: {x: -0.0225313, y: -0.13830097, z: 0.0715549, w: 0.98754495} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: -0, y: 0.100026995, z: 0} + rotation: {x: 0.06426446, y: -0.011348311, z: 0.018105185, w: 0.99770415} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: -0, y: 0.093220994, z: 0} + rotation: {x: 0.024769727, y: 0.09256949, z: -0.04186571, w: 0.9945173} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -0, y: 0.16865298, z: 0} + rotation: {x: 0.04196308, y: -0.17092223, z: -0.07316507, w: 0.98166776} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: -0, y: 0.09341899, z: 0.02841} + rotation: {x: -0.1750545, y: -0.29784498, z: 0.12780838, w: 0.92968243} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -0, y: 0.20962799, z: 0.101229} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.045700002, y: 0.111958, z: -0.0080659995} + rotation: {x: -0.5242542, y: -0.5519949, z: 0.55241525, w: -0.33955342} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: -0, y: 0.108381994, z: 0} + rotation: {x: -0.046804667, y: -0.29225433, z: 0.08345127, w: 0.95154226} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: -0, y: 0.278415, z: 0} + rotation: {x: 0.028121779, y: 0.23082039, z: 0.0066741547, w: 0.972567} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: -0, y: 0.283288, z: 0} + rotation: {x: -0.011520252, y: 0.019774538, z: 0.018907223, w: 0.9995593} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandThumb1 + parentName: mixamorig:RightHand + position: {x: -0.026819, y: 0.024647998, z: 0.01574} + rotation: {x: 0.10068647, y: -0.32155192, z: 0.3392427, w: 0.878283} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandThumb2 + parentName: mixamorig:RightHandThumb1 + position: {x: -0, y: 0.04189, z: 0} + rotation: {x: -0.03855529, y: 0.16292794, z: -0.007034364, w: 0.9858593} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandThumb3 + parentName: mixamorig:RightHandThumb2 + position: {x: -0, y: 0.034163, z: 0} + rotation: {x: -0.035175927, y: -0.14346272, z: 0.002808963, w: 0.9890265} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandThumb4 + parentName: mixamorig:RightHandThumb3 + position: {x: -0, y: 0.02575, z: 0} + rotation: {x: 0.005774398, y: 0.11750944, z: 0.048743945, w: 0.991858} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandIndex1 + parentName: mixamorig:RightHand + position: {x: -0.022597998, y: 0.091083, z: 0.0051789996} + rotation: {x: 0.060449816, y: -0.0052012145, z: -0.00087461085, w: 0.9981573} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandIndex2 + parentName: mixamorig:RightHandIndex1 + position: {x: -0, y: 0.037, z: 0} + rotation: {x: 0.014511129, y: 0.025261724, z: 0.00084514153, w: 0.9995752} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandIndex3 + parentName: mixamorig:RightHandIndex2 + position: {x: -0, y: 0.028499998, z: 0} + rotation: {x: 0.017675623, y: 0.015829688, z: -0.00050137384, w: 0.99971837} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandIndex4 + parentName: mixamorig:RightHandIndex3 + position: {x: -0, y: 0.027722001, z: 0} + rotation: {x: -0.00000008750134, y: -0.0010026915, z: -0.00008726642, w: 0.9999995} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandMiddle1 + parentName: mixamorig:RightHand + position: {x: -0, y: 0.095325, z: 0} + rotation: {x: 0.057469193, y: 0.01777199, z: 0.0016752474, w: 0.9981877} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandMiddle2 + parentName: mixamorig:RightHandMiddle1 + position: {x: -0, y: 0.037, z: 0} + rotation: {x: 0.0067450134, y: 0.03820948, z: 0.00032287088, w: 0.99924695} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandMiddle3 + parentName: mixamorig:RightHandMiddle2 + position: {x: -0, y: 0.0295, z: 0} + rotation: {x: 0.02903432, y: 0.0046239397, z: -0.0013867912, w: 0.9995668} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandMiddle4 + parentName: mixamorig:RightHandMiddle3 + position: {x: -0, y: 0.029466, z: 0} + rotation: {x: -0.00000015476391, y: -0.00092851504, z: -0.00016667887, w: 0.9999996} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandRing1 + parentName: mixamorig:RightHand + position: {x: 0.018651, y: 0.09103599, z: 0.000431} + rotation: {x: 0.052688815, y: -0.045856502, z: -0.0017482378, w: 0.9975561} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandRing2 + parentName: mixamorig:RightHandRing1 + position: {x: -0, y: 0.033793, z: 0} + rotation: {x: 0.011673146, y: 0.0013694462, z: 0.0001569348, w: 0.999931} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandRing3 + parentName: mixamorig:RightHandRing2 + position: {x: -0, y: 0.028896999, z: 0} + rotation: {x: 0.026527671, y: -0.0042569386, z: -0.0007547086, w: 0.99963874} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandRing4 + parentName: mixamorig:RightHandRing3 + position: {x: -0, y: 0.026387999, z: 0} + rotation: {x: 0.00000011649483, y: -0.00014573496, z: 0.00079936074, w: 0.9999997} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandPinky1 + parentName: mixamorig:RightHand + position: {x: 0.038062997, y: 0.080767, z: 0.004867} + rotation: {x: 0.049302727, y: -0.01284317, z: 0.002406551, w: 0.9986985} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandPinky2 + parentName: mixamorig:RightHandPinky1 + position: {x: -0, y: 0.036, z: 0} + rotation: {x: 0.01988787, y: 0.000056904726, z: 0.000023485272, w: 0.9998023} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandPinky3 + parentName: mixamorig:RightHandPinky2 + position: {x: -0, y: 0.020999998, z: 0} + rotation: {x: 0.032186978, y: 0.000044380657, z: 0.00003863259, w: 0.9994819} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandPinky4 + parentName: mixamorig:RightHandPinky3 + position: {x: -0, y: 0.021157999, z: 0} + rotation: {x: 0.00000006435498, y: -0.0015690505, z: 0.00004101519, w: 0.9999988} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.045704, y: 0.11195599, z: -0.0080659995} + rotation: {x: 0.48997393, y: -0.5646498, z: 0.42109892, w: 0.51358724} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: -0, y: 0.108376995, z: 0} + rotation: {x: 0.078493915, y: 0.04368451, z: -0.065441065, w: 0.9938048} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: -0, y: 0.278415, z: 0} + rotation: {x: -0.023197489, y: 0.32338822, z: 0.01486386, w: 0.9458652} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: -0, y: 0.283288, z: 0} + rotation: {x: 0.018063173, y: -0.010891261, z: 0.013071616, w: 0.9996921} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandThumb1 + parentName: mixamorig:LeftHand + position: {x: 0.026817, y: 0.024660999, z: 0.015762} + rotation: {x: 0.28455397, y: 0.108554035, z: -0.2628342, w: 0.91551256} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandThumb2 + parentName: mixamorig:LeftHandThumb1 + position: {x: -0, y: 0.041871, z: 0} + rotation: {x: -0.015112404, y: -0.03031344, z: 0.030136842, w: 0.9989717} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandThumb3 + parentName: mixamorig:LeftHandThumb2 + position: {x: -0, y: 0.034184, z: 0} + rotation: {x: 0.007740531, y: -0.33574054, z: 0.019303596, w: 0.9417249} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandThumb4 + parentName: mixamorig:LeftHandThumb3 + position: {x: -0, y: 0.025806, z: 0} + rotation: {x: 0.005153017, y: -0.12268283, z: -0.04165188, w: 0.99155813} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandIndex1 + parentName: mixamorig:LeftHand + position: {x: 0.022599, y: 0.091093, z: 0.00518} + rotation: {x: 0.05172906, y: -0.093770675, z: -0.004853546, w: 0.99423724} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandIndex2 + parentName: mixamorig:LeftHandIndex1 + position: {x: -0, y: 0.037, z: 0} + rotation: {x: 0.014145679, y: -0.02559155, z: -0.0008102452, w: 0.9995721} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandIndex3 + parentName: mixamorig:LeftHandIndex2 + position: {x: -0, y: 0.028499998, z: 0} + rotation: {x: 0.013270006, y: -0.012070128, z: 0.00032877683, w: 0.9998391} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandIndex4 + parentName: mixamorig:LeftHandIndex3 + position: {x: -0, y: 0.027748998, z: 0} + rotation: {x: -0.000000004946225, y: 0.00037786376, z: 0.000013089969, w: 0.99999994} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandMiddle1 + parentName: mixamorig:LeftHand + position: {x: -0, y: 0.09533399, z: 0} + rotation: {x: 0.049292915, y: 0.020909784, z: -0.0036182597, w: 0.998559} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandMiddle2 + parentName: mixamorig:LeftHandMiddle1 + position: {x: -0, y: 0.037, z: 0} + rotation: {x: 0.010168213, y: -0.03323785, z: -0.00055592885, w: 0.99939567} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandMiddle3 + parentName: mixamorig:LeftHandMiddle2 + position: {x: -0, y: 0.0295, z: 0} + rotation: {x: 0.014287139, y: -0.010172243, z: 0.000285734, w: 0.99984616} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandMiddle4 + parentName: mixamorig:LeftHandMiddle3 + position: {x: -0, y: 0.029528998, z: 0} + rotation: {x: 0.000000028609662, y: 0.001024508, z: -0.000027925253, w: 0.99999946} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandRing1 + parentName: mixamorig:LeftHand + position: {x: -0.018651, y: 0.091045, z: 0.00043000001} + rotation: {x: 0.047718417, y: 0.061453342, z: -0.001960363, w: 0.9969667} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandRing2 + parentName: mixamorig:LeftHandRing1 + position: {x: -0, y: 0.0315, z: 0} + rotation: {x: 0.016437097, y: 0.0060856245, z: -0.00031713617, w: 0.99984634} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandRing3 + parentName: mixamorig:LeftHandRing2 + position: {x: -0, y: 0.0295, z: 0} + rotation: {x: 0.011995761, y: 0.008427799, z: 0.00015920974, w: 0.99989253} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandRing4 + parentName: mixamorig:LeftHandRing3 + position: {x: -0, y: 0.026442999, z: 0} + rotation: {x: -0.000000007744897, y: -0.0004930555, z: -0.000015707961, w: 0.9999999} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandPinky1 + parentName: mixamorig:LeftHand + position: {x: -0.038062997, y: 0.080777995, z: 0.004869} + rotation: {x: 0.04952268, y: 0.12537912, z: -0.0038385785, w: 0.9908647} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandPinky2 + parentName: mixamorig:LeftHandPinky1 + position: {x: -0, y: 0.036, z: 0} + rotation: {x: 0.0112959705, y: -0.00006303934, z: -0.000012046653, w: 0.9999362} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandPinky3 + parentName: mixamorig:LeftHandPinky2 + position: {x: -0, y: 0.020999998, z: 0} + rotation: {x: 0.022443717, y: -0.00006310041, z: -0.000022961436, w: 0.9997482} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandPinky4 + parentName: mixamorig:LeftHandPinky3 + position: {x: -0, y: 0.021255, z: 0} + rotation: {x: 0.0000006415177, y: 0.000783653, z: 0.00029495993, w: 0.99999964} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.082077995, y: -0.067718, z: -0.015121999} + rotation: {x: 0.25832495, y: 0.06897165, z: 0.94819355, w: -0.17158145} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: -0, y: 0.44371498, z: 0} + rotation: {x: -0.2279604, y: 0.09639205, z: -0.0054996083, w: 0.9688717} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: -0, y: 0.44527802, z: 0} + rotation: {x: 0.61816305, y: -0.07052822, z: -0.10041125, w: 0.7764135} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: -0, y: 0.138169, z: 0} + rotation: {x: 0.3441437, y: -0.11434307, z: -0.08269721, w: 0.9282521} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: -0, y: 0.092781, z: 0} + rotation: {x: 0, y: -0.0116079245, z: -0, w: 0.99993265} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.082077995, y: -0.067718, z: -0.015121999} + rotation: {x: -0.13859253, y: 0.07811569, z: 0.9870448, w: 0.020800125} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -0, y: 0.443714, z: 0} + rotation: {x: -0.30324027, y: -0.14630982, z: 0.054316312, w: 0.9400471} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: -0, y: 0.44527802, z: 0} + rotation: {x: 0.7027792, y: 0.06435508, z: -0.08368304, w: 0.7035319} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: -0, y: 0.138169, z: 0} + rotation: {x: 0.3426738, y: -0.041508805, z: 0.015315681, w: 0.9384121} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: -0, y: 0.092781, z: 0} + rotation: {x: 0, y: 0.011868834, z: -0, w: 0.9999296} + scale: {x: 1, y: 1, z: 1} + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 3 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/ProjectSettings/TagManager.asset b/BlueWater/ProjectSettings/TagManager.asset index f1953fb9b..629220bd2 100644 --- a/BlueWater/ProjectSettings/TagManager.asset +++ b/BlueWater/ProjectSettings/TagManager.asset @@ -16,7 +16,7 @@ TagManager: - Ground - Water - UI - - + - Unit - Ship - Player - Pirate