commit 43abf50870b1fbfb569a5099ea8f70b8ec723cad parent 308fe6285c74f44886741a5e867040329d671740 Author: PlutoTank <qwolkensperg@gmail.com> Date: Sat, 8 Feb 2020 23:36:58 -0500 Added state changer conditions Diffstat:
19 files changed, 460 insertions(+), 46 deletions(-)
diff --git a/Assets/Prefabs/Slimes/Slime.prefab b/Assets/Prefabs/Slimes/Slime.prefab @@ -48,6 +48,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: startingState: {fileID: 1346574271} + stateMachineTarget: {fileID: 1531394410883810673} --- !u!1 &1310556697 GameObject: m_ObjectHideFlags: 0 @@ -91,6 +92,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} m_Name: m_EditorClassIdentifier: + changes: [] --- !u!1 &1346574269 GameObject: m_ObjectHideFlags: 0 @@ -101,6 +103,7 @@ GameObject: m_Component: - component: {fileID: 1346574270} - component: {fileID: 1346574271} + - component: {fileID: 1400936338} m_Layer: 9 m_Name: Idle m_TagString: Untagged @@ -134,6 +137,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} m_Name: m_EditorClassIdentifier: + changes: + - nextState: {fileID: 2105505491} + conditions: + - {fileID: 1400936338} +--- !u!114 &1400936338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1346574269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0e148d062a4d084c81d1832033e7e45, type: 3} + m_Name: + m_EditorClassIdentifier: + characterMovementController: {fileID: 1533019556350475861} --- !u!1 &1833990615 GameObject: m_ObjectHideFlags: 0 @@ -177,6 +197,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} m_Name: m_EditorClassIdentifier: + changes: [] --- !u!1 &2105505489 GameObject: m_ObjectHideFlags: 0 @@ -220,6 +241,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} m_Name: m_EditorClassIdentifier: + changes: [] --- !u!1 &449381425311164905 GameObject: m_ObjectHideFlags: 0 @@ -874,7 +896,7 @@ Rigidbody: m_AngularDrag: 0.5 m_UseGravity: 1 m_IsKinematic: 0 - m_Interpolate: 1 + m_Interpolate: 0 m_Constraints: 80 m_CollisionDetection: 1 --- !u!65 &1562335568724729083 @@ -1025,7 +1047,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: m_EditorClassIdentifier: - m_Actions: {fileID: 0} + m_Actions: {fileID: -944628639613478452, guid: e5353b3c2a300ce458b25d1e62215e9c, + type: 3} m_NotificationBehavior: 2 m_UIInputModule: {fileID: 0} m_DeviceLostEvent: diff --git a/Assets/Scripts/Slimecing/Characters/AbilityUser.cs b/Assets/Scripts/Slimecing/Characters/AbilityUser.cs @@ -12,7 +12,7 @@ namespace Slimecing.Character { [SerializeField] private List<AbilityPackage> useableAbilities = new List<AbilityPackage>(); - private List<TimedAbilityEffect> currentTimedAbilityEffects = new List<TimedAbilityEffect>(); + List<TimedAbilityEffect> currentTimedAbilityEffects = new List<TimedAbilityEffect>(); private List<CooldownData> abilitiesOnCooldown = new List<CooldownData>(); private List<AbilityEffect> currentAbilityEffects = new List<AbilityEffect>(); @@ -44,6 +44,11 @@ namespace Slimecing.Character CheckTimedAbilityEffects(); } + public bool CheckForEffects() + { + return currentAbilityEffects.Count != 0 || currentTimedAbilityEffects.Count != 0; + } + //USE INPUT MANAGER private void GetAbilityInput() @@ -66,7 +71,7 @@ namespace Slimecing.Character currentTimedAbilityEffects[i].Tick(Time.deltaTime); if (currentTimedAbilityEffects[i].IsDone) { - currentTimedAbilityEffects.RemoveAt(i); + RemoveTimedAbilityEffect(currentTimedAbilityEffects[i]); } } } @@ -104,14 +109,25 @@ namespace Slimecing.Character public void AddTimedAbilityEffect(TimedAbilityEffect abilityEffect) { currentTimedAbilityEffects.Add(abilityEffect); + Debug.Log(currentTimedAbilityEffects.Count); abilityEffect.Activate(); } + public void RemoveTimedAbilityEffect(TimedAbilityEffect abilityEffect) + { + currentTimedAbilityEffects.Remove(abilityEffect); + } + public void AddAbilityEffect(AbilityEffect abilityEffect) { currentAbilityEffects.Add(abilityEffect); abilityEffect.Activate(); } + + public void RemoveAbilityEffect(AbilityEffect abilityEffect) + { + currentAbilityEffects.Remove(abilityEffect); + } public void AddAbilityOnCooldown(CooldownData cooldownData) { diff --git a/Assets/Scripts/Slimecing/Characters/CharacterMovementController.cs b/Assets/Scripts/Slimecing/Characters/CharacterMovementController.cs @@ -8,9 +8,9 @@ namespace Slimecing.Character [SerializeField] protected float movementSpeed; protected Rigidbody rb; - protected Vector2 _move; + protected Vector2 move; - public Vector2 MoveInput => _move; + public Vector2 MoveInput => move; protected virtual void Awake() { @@ -32,7 +32,7 @@ namespace Slimecing.Character public void SetBackToNormalForces() { - rb.velocity = new Vector3(_move.x, rb.velocity.y, _move.y); + rb.velocity = new Vector3(move.x, rb.velocity.y, move.y); } } } diff --git a/Assets/Scripts/Slimecing/Characters/SlimeMovementController.cs b/Assets/Scripts/Slimecing/Characters/SlimeMovementController.cs @@ -18,24 +18,24 @@ namespace Slimecing.Characters { Move(); - if (_move != Vector2.zero) + if (move != Vector2.zero) { - _rotatable.RotateToVector(new Vector3(_move.x, 0, _move.y)); + _rotatable.RotateToVector(new Vector3(move.x, 0, move.y)); } } private void Move() { - rb.MovePosition(rb.position + movementSpeed * Time.fixedDeltaTime * new Vector3(_move.x, 0f, _move.y)); + rb.MovePosition(rb.position + movementSpeed * Time.fixedDeltaTime * new Vector3(move.x, 0f, move.y)); } public override void GetMoveInputH(float h) { - _move.x = h; + move.x = h; } public override void GetMoveInputV(float v) { - _move.y = v; + move.y = v; } } } \ No newline at end of file diff --git a/Assets/Scripts/Slimecing/InputSystem/PlayerInput.cs b/Assets/Scripts/Slimecing/InputSystem/PlayerInput.cs @@ -10,13 +10,13 @@ namespace Slimecing.InputSystem { [SerializeField] private SlimeControls playerControls; - private CharacterMovementController characterMovementController; + private CharacterMovementController _characterMovementController; private void Awake() { playerControls = new SlimeControls(); playerControls.VSGameplay.SetCallbacks(this); - characterMovementController = GetComponent<CharacterMovementController>(); + _characterMovementController = GetComponent<CharacterMovementController>(); } private void OnEnable() @@ -31,12 +31,12 @@ namespace Slimecing.InputSystem public void OnHorizontal(InputAction.CallbackContext context) { - characterMovementController.GetMoveInputH(context.ReadValue<float>()); + _characterMovementController.GetMoveInputH(context.ReadValue<float>()); } public void OnVertical(InputAction.CallbackContext context) { - characterMovementController.GetMoveInputV(context.ReadValue<float>()); + _characterMovementController.GetMoveInputV(context.ReadValue<float>()); } } } diff --git a/Assets/Scripts/Slimecing/StateMachine/State.cs b/Assets/Scripts/Slimecing/StateMachine/State.cs @@ -19,7 +19,6 @@ namespace Slimecing.StateMachine return null; } - public void Enter() => gameObject.SetActive(true); public void Exit() => gameObject.SetActive(false); diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChanger.cs b/Assets/Scripts/Slimecing/StateMachine/StateChanger.cs @@ -4,6 +4,7 @@ using UnityEngine; namespace Slimecing.StateMachine { + [Serializable] public class StateChanger { [SerializeField] private State nextState = null; diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChangers.meta b/Assets/Scripts/Slimecing/StateMachine/StateChangers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0dc37f23822df3b47b6a587630eeee63 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChangers/InputCondition.cs b/Assets/Scripts/Slimecing/StateMachine/StateChangers/InputCondition.cs @@ -0,0 +1,16 @@ +using Slimecing.Character; +using UnityEngine; +using UnityEngine.Serialization; + +namespace Slimecing.StateMachine.StateChangers +{ + public class InputCondition : StateChangerCondition + { + [SerializeField] private CharacterMovementController characterMovementController; + [SerializeField] private bool isTakingInput; + public override bool IsMet() + { + return (characterMovementController.MoveInput != Vector2.zero) == isTakingInput; + } + } +} diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChangers/InputCondition.cs.meta b/Assets/Scripts/Slimecing/StateMachine/StateChangers/InputCondition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e0e148d062a4d084c81d1832033e7e45 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChangers/UsingAbilityCondition.cs b/Assets/Scripts/Slimecing/StateMachine/StateChangers/UsingAbilityCondition.cs @@ -0,0 +1,16 @@ +using Slimecing.Character; +using UnityEngine; + +namespace Slimecing.StateMachine.StateChangers +{ + public class UsingAbilityCondition : StateChangerCondition + { + [SerializeField] private AbilityUser abilityUser; + [SerializeField] private bool isUsingAbility; + + public override bool IsMet() + { + return abilityUser.CheckForEffects() == isUsingAbility; + } + } +} diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChangers/UsingAbilityCondition.cs.meta b/Assets/Scripts/Slimecing/StateMachine/StateChangers/UsingAbilityCondition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eb78fb6112ed64b46a6a99ffabc4e964 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine/StateMachine.cs b/Assets/Scripts/Slimecing/StateMachine/StateMachine.cs @@ -1,4 +1,6 @@ -namespace Slimecing.StateMachine +using UnityEngine; + +namespace Slimecing.StateMachine { public class StateMachine { @@ -6,6 +8,8 @@ public IState CurrState { get; private set; } + private GameObject _stateMachineTarget; + public void ChangeState(IState state) { CurrState?.Exit(); diff --git a/Assets/Scripts/Slimecing/StateMachine/StateMachineComponent.cs b/Assets/Scripts/Slimecing/StateMachine/StateMachineComponent.cs @@ -4,7 +4,8 @@ namespace Slimecing.StateMachine { public class StateMachineComponent : MonoBehaviour { - [SerializeField] private State startingState = null; + [SerializeField] private State startingState; + [SerializeField] private GameObject stateMachineTarget; private StateMachine _stateMachine; diff --git a/Assets/_Scenes/TestScene.unity b/Assets/_Scenes/TestScene.unity @@ -139,7 +139,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &28711378 MonoBehaviour: m_ObjectHideFlags: 0 @@ -220,6 +220,76 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 0 +--- !u!114 &31864231 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2105505491, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + m_PrefabInstance: {fileID: 165370663} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 43592992} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &43592992 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2105505489, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + m_PrefabInstance: {fileID: 165370663} + m_PrefabAsset: {fileID: 0} +--- !u!114 &43592994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 43592992} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0e148d062a4d084c81d1832033e7e45, type: 3} + m_Name: + m_EditorClassIdentifier: + characterMovementController: {fileID: 51065743} + isTakingInput: 0 +--- !u!114 &43592995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 43592992} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb78fb6112ed64b46a6a99ffabc4e964, type: 3} + m_Name: + m_EditorClassIdentifier: + abilityUser: {fileID: 51065740} + isUsingAbility: 1 +--- !u!114 &51065740 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8860697156266351435, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + m_PrefabInstance: {fileID: 165370663} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c8d201134b014947891e6e6aa1d4cac, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &51065743 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1533019556350475861, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + m_PrefabInstance: {fileID: 165370663} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ccd8232d0c288f46b989ad9148a12bb, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &165370663 PrefabInstance: m_ObjectHideFlags: 0 @@ -227,19 +297,99 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1310556699, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1310556699, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[0].conditions.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1310556699, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].conditions.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1310556699, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[0].nextState + value: + objectReference: {fileID: 1400936339} + - target: {fileID: 1310556699, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].nextState + value: + objectReference: {fileID: 31864231} + - target: {fileID: 1310556699, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].conditions.Array.data[1] + value: + objectReference: {fileID: 954595855} + - target: {fileID: 1310556699, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].conditions.Array.data[0] + value: + objectReference: {fileID: 954595854} + - target: {fileID: 1310556699, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[0].conditions.Array.data[0] + value: + objectReference: {fileID: 954595854} + - target: {fileID: 1346574271, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1346574271, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].conditions.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1346574271, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].nextState + value: + objectReference: {fileID: 562759580} + - target: {fileID: 1346574271, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].conditions.Array.data[0] + value: + objectReference: {fileID: 1400936341} + - target: {fileID: 1400936338, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: isTakingInput + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1450437300, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} propertyPath: m_Camera value: objectReference: {fileID: 619456896} + - target: {fileID: 2105505491, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2105505491, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[0].conditions.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2105505491, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].conditions.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2105505491, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[0].nextState + value: + objectReference: {fileID: 1400936339} + - target: {fileID: 2105505491, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[0].conditions.Array.data[0] + value: + objectReference: {fileID: 43592994} + - target: {fileID: 2105505491, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].nextState + value: + objectReference: {fileID: 562759580} + - target: {fileID: 2105505491, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: changes.Array.data[1].conditions.Array.data[0] + value: + objectReference: {fileID: 43592995} - target: {fileID: 1531394410883810673, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} propertyPath: m_Name - value: Slime (1) + value: Slime objectReference: {fileID: 0} - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} @@ -249,7 +399,7 @@ PrefabInstance: - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} propertyPath: m_LocalPosition.z - value: -0 + value: -0.3 objectReference: {fileID: 0} - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} @@ -320,7 +470,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 364079739} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -23.33, y: 2.5, z: -13.7} + m_LocalPosition: {x: -23.33, y: 2.26, z: -13.7} m_LocalScale: {x: 4, y: 4, z: 4} m_Children: [] m_Father: {fileID: 697181799} @@ -572,6 +722,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479781847} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &562759580 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1310556699, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + m_PrefabInstance: {fileID: 165370663} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954595852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &613119393 GameObject: m_ObjectHideFlags: 0 @@ -997,7 +1159,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 733502429} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -18.07, y: 1.5, z: -18.45} + m_LocalPosition: {x: -17.54, y: 1.5, z: -18.45} m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} m_Children: [] m_Father: {fileID: 697181799} @@ -1063,6 +1225,40 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 733502429} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &954595852 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1310556697, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + m_PrefabInstance: {fileID: 165370663} + m_PrefabAsset: {fileID: 0} +--- !u!114 &954595854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954595852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb78fb6112ed64b46a6a99ffabc4e964, type: 3} + m_Name: + m_EditorClassIdentifier: + abilityUser: {fileID: 51065740} + isUsingAbility: 0 +--- !u!114 &954595855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954595852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0e148d062a4d084c81d1832033e7e45, type: 3} + m_Name: + m_EditorClassIdentifier: + characterMovementController: {fileID: 51065743} + isTakingInput: 1 --- !u!1 &1285390734 GameObject: m_ObjectHideFlags: 0 @@ -1489,6 +1685,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1387618669} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1400936337 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1346574269, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + m_PrefabInstance: {fileID: 165370663} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1400936339 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1346574271, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + m_PrefabInstance: {fileID: 165370663} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400936337} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1400936341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400936337} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb78fb6112ed64b46a6a99ffabc4e964, type: 3} + m_Name: + m_EditorClassIdentifier: + abilityUser: {fileID: 51065740} + isUsingAbility: 1 --- !u!1 &1420198633 GameObject: m_ObjectHideFlags: 0 @@ -1704,10 +1932,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 621567455fd1c4ceb811cc8a00b6a1a5, type: 3} m_Name: m_EditorClassIdentifier: - m_NotificationBehavior: 0 + m_NotificationBehavior: 2 m_MaxPlayerCount: -1 m_AllowJoining: 1 - m_JoinBehavior: 2 + m_JoinBehavior: 1 m_PlayerJoinedEvent: m_PersistentCalls: m_Calls: diff --git a/Packages/manifest.json b/Packages/manifest.json @@ -12,6 +12,8 @@ "com.unity.ide.vscode": "1.1.4", "com.unity.inputsystem": "1.0.0-preview.4", "com.unity.multiplayer-hlapi": "1.0.4", + "com.unity.postprocessing": "2.3.0", + "com.unity.probuilder": "4.2.3", "com.unity.purchasing": "2.0.6", "com.unity.test-framework": "1.1.9", "com.unity.textmeshpro": "2.0.1", diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -0,0 +1,38 @@ +{ + "m_Name": "Settings", + "m_Path": "ProjectSettings/Packages/com.unity.probuilder/Settings.json", + "m_Dictionary": { + "m_DictionaryValues": [ + { + "type": "UnityEngine.ProBuilder.LogLevel, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "log.level", + "value": "{\"m_Value\":3}" + }, + { + "type": "UnityEngine.ProBuilder.LogOutput, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "log.output", + "value": "{\"m_Value\":1}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "log.path", + "value": "{\"m_Value\":\"ProBuilderLog.txt\"}" + }, + { + "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "about.identifier", + "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":2,\"m_Patch\":3,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" + }, + { + "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "preferences.version", + "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":2,\"m_Patch\":3,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "lightmapping.autoUnwrapLightmapUV", + "value": "{\"m_Value\":true}" + } + ] + } +}+ \ No newline at end of file diff --git a/ProjectSettings/Packages/com.unity.settings-manager/Settings.json b/ProjectSettings/Packages/com.unity.settings-manager/Settings.json @@ -0,0 +1,7 @@ +{ + "m_Name": "Settings", + "m_Path": "ProjectSettings/Packages/com.unity.settings-manager/Settings.json", + "m_Dictionary": { + "m_DictionaryValues": [] + } +}+ \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 18 + serializedVersion: 20 productGUID: bd4cd3811ef85fd45a50b729e993ecd9 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -52,7 +52,6 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - displayResolutionDialog: 0 iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 @@ -85,7 +84,6 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -93,7 +91,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -113,6 +110,7 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 1 @@ -155,9 +153,9 @@ PlayerSettings: v2Signing: 0 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 - protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 + D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -166,7 +164,7 @@ PlayerSettings: applicationIdentifier: {} buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -181,10 +179,10 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 9.0 + iOSTargetOSVersionString: 10.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 10.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -274,16 +272,46 @@ PlayerSettings: androidGamepadSupportLevel: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 - vuforiaEnabled: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -399,6 +427,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -498,6 +527,7 @@ PlayerSettings: ps4contentSearchFeaturesUsed: 0 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} @@ -517,7 +547,16 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLWasmStreaming: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + 1: UNITY_POST_PROCESSING_STACK_V2 + 7: UNITY_POST_PROCESSING_STACK_V2 + 13: UNITY_POST_PROCESSING_STACK_V2 + 19: UNITY_POST_PROCESSING_STACK_V2 + 21: UNITY_POST_PROCESSING_STACK_V2 + 25: UNITY_POST_PROCESSING_STACK_V2 + 27: UNITY_POST_PROCESSING_STACK_V2 + 28: UNITY_POST_PROCESSING_STACK_V2 + 29: UNITY_POST_PROCESSING_STACK_V2 platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} @@ -583,7 +622,6 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: vrEditorSettings: daydream: @@ -602,13 +640,6 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 apiCompatibilityLevel: 6 cloudProjectId: 9065f837-ea6c-4b59-a7b6-7cff282ce513 framebufferDepthMemorylessMode: 0