From 7812abcbd8d46b227af2f4c4ddb0dd8181f903e1 Mon Sep 17 00:00:00 2001 From: Chris Collins <29593332+christides11@users.noreply.github.com> Date: Sun, 26 Feb 2023 17:40:59 -0800 Subject: [PATCH] feat: Copy/Pasting IStateVariables BREAKING CHANGE: IStateVariables & IConditionVariables have copy methods. --- .../StateEditor/StateTimelineEditorWindow.cs | 45 +++ .../Shared/States/Base.State.Idle.asset | 290 ++---------------- .../State/Conditions/ConditionButton.cs | 11 + .../State/Conditions/ConditionFallSpeed.cs | 10 + .../State/Conditions/ConditionGroundState.cs | 8 + .../Conditions/ConditionMovementMagnitude.cs | 9 + .../Scripts/State/Conditions/ConditionNone.cs | 5 + .../Scripts/State/Variables/ChangeState.cs | 11 + .../State/Variables/VarApplyGravity.cs | 14 + .../State/Variables/VarApplyTraction.cs | 14 +- .../State/Variables/VarSetFallSpeed.cs | 10 + .../State/Conditions/IConditionVariables.cs | 2 + Assets/HnSF/State/StateTimeline.cs | 34 ++ .../HnSF/State/Variables/IStateVariables.cs | 2 + Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- UserSettings/Layouts/default-2021.dwlt | 70 ++--- 17 files changed, 232 insertions(+), 307 deletions(-) diff --git a/Assets/HnSF/Editor/StateEditor/StateTimelineEditorWindow.cs b/Assets/HnSF/Editor/StateEditor/StateTimelineEditorWindow.cs index 6820a4b8..7017787e 100644 --- a/Assets/HnSF/Editor/StateEditor/StateTimelineEditorWindow.cs +++ b/Assets/HnSF/Editor/StateEditor/StateTimelineEditorWindow.cs @@ -28,6 +28,9 @@ public class StateTimelineEditorWindow : EditorWindow }; public Color parentColor = new Color(0.05f, 0.05f, 0.05f); + + public static IStateVariables stateVariableCopy; + public static IConditionVariables conditionVariablesCopy; public static StateTimelineEditorWindow OpenWindow(StateTimeline stateTimeline) { @@ -176,6 +179,14 @@ public virtual void RefreshSideBar() RefreshAll(true); }); } + if (stateVariableCopy != null) + { + evt.menu.AppendAction("Paste", (x) => + { + stateTimeline.AddStateVariable(stateVariableCopy); + RefreshAll(true); + }); + } }); sidebarPanel.AddManipulator(sidebarPanelMenuManipulator); @@ -238,6 +249,23 @@ public virtual void SidebarSetupLabel(StateTimeline stateTimeline, int dataID, B RemoveStateVariable(index); RefreshAll(true); }); + evt.menu.AppendAction("Copy", (x) => + { + CopyStateVariable(stateTimeline, index); + }); + if (stateVariableCopy != null) + { + evt.menu.AppendAction("Paste in Place", (x) => + { + PasteInPlaceStateVariable(index); + RefreshAll(true); + }); + evt.menu.AppendAction("Paste as Child", (x) => + { + PasteAsChildStateVariable(index); + RefreshAll(true); + }); + } evt.menu.AppendAction("Move Up", (x) => { MoveStateVarUp(stateTimeline, dataID); @@ -251,6 +279,23 @@ public virtual void SidebarSetupLabel(StateTimeline stateTimeline, int dataID, B })); } + protected virtual void CopyStateVariable(StateTimeline stateTimeline, int index) + { + stateVariableCopy = stateTimeline.CopyStateVariable(index); + } + + protected virtual void PasteInPlaceStateVariable(int index) + { + if (stateVariableCopy == null) return; + stateTimeline.PasteInPlace(index, stateVariableCopy); + } + + protected virtual void PasteAsChildStateVariable(int index) + { + if (stateVariableCopy == null) return; + stateTimeline.PasteAsChild(index, stateVariableCopy); + } + protected virtual void UpdateData(StateTimeline stateTimeline1, int id) { RefreshAll(true); diff --git a/Assets/HnSF/Samples/TDAction/Fighters/Shared/States/Base.State.Idle.asset b/Assets/HnSF/Samples/TDAction/Fighters/Shared/States/Base.State.Idle.asset index 6f0137dc..e1ed1cfd 100644 --- a/Assets/HnSF/Samples/TDAction/Fighters/Shared/States/Base.State.Idle.asset +++ b/Assets/HnSF/Samples/TDAction/Fighters/Shared/States/Base.State.Idle.asset @@ -20,136 +20,37 @@ MonoBehaviour: autoLoop: 1 autoLoopFrame: 1 data: - - rid: 5282967762107891712 - - rid: 5282967762107891714 - - rid: 5282967762107891715 - - rid: 5282967762107891716 - - rid: 5282967762107891717 - - rid: 5282967762107891718 - - rid: 5282967762107891719 - - rid: 5282967762107891720 - - rid: 5282967762107891722 - - rid: 5282967762107891723 - - rid: 5282967776474693632 - - rid: 5282967776474693633 - - rid: 5282967776474693634 - - rid: 5282967776474693635 - - rid: 5282967776474693636 - - rid: 5282967776474693637 - - rid: 5282967776474693638 - - rid: 5282967776474693641 - - rid: 5282967776474693639 - - rid: 2193520680018640896 - - rid: 2193520629232959488 - - rid: 2193520680018640898 - - rid: 2193520680018640897 + - rid: 1200828937721085955 + - rid: 1200828937721085953 + - rid: 1200828937721085954 + - rid: 1200828937721085956 + - rid: 1200828937721085957 references: version: 2 RefIds: - rid: -2 type: {class: , ns: , asm: } - - rid: 2193520629232959488 - type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 21 - frameRanges: [] - condition: - rid: -2 - stateMovesetID: 0 - stateID: 0 - parent: 3 - children: - - rid: 2193520680018640896 - type: {class: VarApplyGravity, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 22 - frameRanges: [] - condition: - rid: -2 - useMaxFallSpeedStat: 0 - useGravityStat: 0 - maxFallSpeed: 0 - gravity: 0 - parent: -1 - children: 17000000 - - rid: 2193520680018640897 - type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 23 - frameRanges: [] - condition: - rid: -2 - stateMovesetID: 0 - stateID: 0 - parent: 22 - children: - - rid: 2193520680018640898 + - rid: 1200828937721085953 type: {class: VarApplyTraction, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} data: name: - id: 24 + id: 1 frameRanges: [] condition: rid: -2 useTractionStat: 0 aerialTraction: 0 traction: 0 - parent: -1 - children: - - rid: 5282967762107891712 - type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: dkqodpqjkmdqonp - id: 0 - frameRanges: - - {x: 1, y: 3} - - {x: 5, y: 10} - condition: - rid: -2 - stateMovesetID: 0 - stateID: 0 - parent: -1 - children: 01000000090000000a000000 - - rid: 5282967762107891714 - type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 1 - frameRanges: - - {x: 1, y: 5} - - {x: 9, y: 11} - condition: - rid: -2 - stateMovesetID: 0 - stateID: 0 parent: 0 - children: 02000000040000000500000006000000 - - rid: 5282967762107891715 - type: {class: VarApplyGravity, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: Grav Grav - id: 2 - frameRanges: - - {x: 0, y: 0} - - {x: 2, y: 3} - condition: - rid: -2 - useMaxFallSpeedStat: 0 - useGravityStat: 0 - maxFallSpeed: 0 - gravity: 0 - parent: 1 children: - - rid: 5282967762107891716 + - rid: 1200828937721085954 type: {class: VarApplyGravity, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} data: name: - id: 3 + id: 2 frameRanges: - - {x: 5, y: 10} + - {x: 1, y: 4} + - {x: 6, y: 8} condition: rid: -2 useMaxFallSpeedStat: 0 @@ -157,88 +58,12 @@ MonoBehaviour: maxFallSpeed: 0 gravity: 0 parent: -1 - children: 0700000015000000 - - rid: 5282967762107891717 - type: {class: VarApplyTraction, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 4 - frameRanges: [] - condition: - rid: -2 - useTractionStat: 0 - aerialTraction: 0 - traction: 0 - parent: 1 - children: - - rid: 5282967762107891718 + children: 0300000004000000 + - rid: 1200828937721085955 type: {class: VarApplyGravity, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} data: name: - id: 5 - frameRanges: [] - condition: - rid: -2 - useMaxFallSpeedStat: 0 - useGravityStat: 0 - maxFallSpeed: 0 - gravity: 0 - parent: 1 - children: - - rid: 5282967762107891719 - type: {class: VarSetFallSpeed, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 6 - frameRanges: - - {x: 0, y: 0} - - {x: 5, y: 7} - condition: - rid: -2 - value: 0 - parent: 1 - children: - - rid: 5282967762107891720 - type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 7 - frameRanges: [] - condition: - rid: -2 - stateMovesetID: 0 - stateID: 0 - parent: 3 - children: - - rid: 5282967762107891722 - type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 9 - frameRanges: [] - condition: - rid: -2 - stateMovesetID: 0 - stateID: 0 - parent: 0 - children: - - rid: 5282967762107891723 - type: {class: VarSetFallSpeed, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 10 - frameRanges: - - {x: -1, y: -2} - condition: - rid: -2 - value: 0 - parent: 0 - children: - - rid: 5282967776474693632 - type: {class: VarApplyGravity, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 11 + id: 0 frameRanges: [] condition: rid: -2 @@ -247,12 +72,12 @@ MonoBehaviour: maxFallSpeed: 0 gravity: 0 parent: -1 - children: - - rid: 5282967776474693633 + children: 01000000 + - rid: 1200828937721085956 type: {class: VarApplyGravity, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} data: name: - id: 12 + id: 3 frameRanges: [] condition: rid: -2 @@ -260,38 +85,13 @@ MonoBehaviour: useGravityStat: 0 maxFallSpeed: 0 gravity: 0 - parent: -1 - children: - - rid: 5282967776474693634 - type: {class: VarApplyTraction, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: dawdvrfwq - id: 13 - frameRanges: [] - condition: - rid: -2 - useTractionStat: 0 - aerialTraction: 0 - traction: 0 - parent: -1 - children: - - rid: 5282967776474693635 - type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 14 - frameRanges: [] - condition: - rid: -2 - stateMovesetID: 0 - stateID: 0 - parent: -1 + parent: 2 children: - - rid: 5282967776474693636 + - rid: 1200828937721085957 type: {class: VarApplyGravity, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} data: name: - id: 15 + id: 4 frameRanges: [] condition: rid: -2 @@ -299,53 +99,5 @@ MonoBehaviour: useGravityStat: 0 maxFallSpeed: 0 gravity: 0 - parent: -1 - children: - - rid: 5282967776474693637 - type: {class: VarSetFallSpeed, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 16 - frameRanges: [] - condition: - rid: -2 - value: 0 - parent: -1 - children: - - rid: 5282967776474693638 - type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 17 - frameRanges: [] - condition: - rid: -2 - stateMovesetID: 0 - stateID: 0 - parent: -1 - children: - - rid: 5282967776474693639 - type: {class: VarApplyTraction, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 18 - frameRanges: [] - condition: - rid: -2 - useTractionStat: 0 - aerialTraction: 0 - traction: 0 - parent: -1 - children: - - rid: 5282967776474693641 - type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction} - data: - name: - id: 20 - frameRanges: [] - condition: - rid: -2 - stateMovesetID: 0 - stateID: 0 - parent: -1 + parent: 2 children: diff --git a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionButton.cs b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionButton.cs index 82b83d2e..7bccc34d 100644 --- a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionButton.cs +++ b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionButton.cs @@ -15,5 +15,16 @@ public enum ButtonStateType public ButtonStateType buttonState; public int offset; public int buffer; + + public IConditionVariables Copy() + { + return new ConditionButton() + { + button = button, + buttonState = buttonState, + offset = offset, + buffer = buffer + }; + } } } \ No newline at end of file diff --git a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionFallSpeed.cs b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionFallSpeed.cs index a604f91a..18480725 100644 --- a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionFallSpeed.cs +++ b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionFallSpeed.cs @@ -7,5 +7,15 @@ public struct ConditionFallSpeed : IConditionVariables public float minValue; public float maxValue; public bool inverse; + + public IConditionVariables Copy() + { + return new ConditionFallSpeed() + { + minValue = minValue, + maxValue = maxValue, + inverse = inverse + }; + } } } \ No newline at end of file diff --git a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionGroundState.cs b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionGroundState.cs index e4055956..6d9e3683 100644 --- a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionGroundState.cs +++ b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionGroundState.cs @@ -5,5 +5,13 @@ public struct ConditionGroundState : IConditionVariables public int FunctionMap => (int)ConditionFunctionEnum.GROUND_STATE; public bool inverse; + + public IConditionVariables Copy() + { + return new ConditionGroundState() + { + inverse = inverse + }; + } } } \ No newline at end of file diff --git a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionMovementMagnitude.cs b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionMovementMagnitude.cs index 45e3376a..45943b49 100644 --- a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionMovementMagnitude.cs +++ b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionMovementMagnitude.cs @@ -10,5 +10,14 @@ public struct ConditionMovementMagnitude : IConditionVariables public float sqrMagnitude; public bool inverse; + + public IConditionVariables Copy() + { + return new ConditionMovementMagnitude() + { + sqrMagnitude = sqrMagnitude, + inverse = inverse + }; + } } } \ No newline at end of file diff --git a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionNone.cs b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionNone.cs index 07eba724..022d801d 100644 --- a/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionNone.cs +++ b/Assets/HnSF/Samples/TDAction/Scripts/State/Conditions/ConditionNone.cs @@ -7,5 +7,10 @@ namespace HnSF.Sample.TDAction.State public struct ConditionNone : IConditionVariables { public int FunctionMap => (int)ConditionFunctionEnum.NONE; + + public IConditionVariables Copy() + { + return new ConditionNone(); + } } } \ No newline at end of file diff --git a/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/ChangeState.cs b/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/ChangeState.cs index fae39452..942accca 100644 --- a/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/ChangeState.cs +++ b/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/ChangeState.cs @@ -45,5 +45,16 @@ public Vector2Int[] FrameRanges [SerializeField, HideInInspector] private int parent; [SerializeField, HideInInspector] private int[] children; + + public IStateVariables Copy() + { + return new ChangeState() + { + frameRanges = frameRanges, + condition = condition.Copy(), + stateMovesetID = stateMovesetID, + stateID = stateID + }; + } } } \ No newline at end of file diff --git a/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarApplyGravity.cs b/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarApplyGravity.cs index a7990151..8bb38e38 100644 --- a/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarApplyGravity.cs +++ b/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarApplyGravity.cs @@ -1,6 +1,7 @@ using System; using HnSF.Fighters; using UnityEngine; +using UnityEngine.Rendering; namespace HnSF.Sample.TDAction.State { @@ -39,6 +40,7 @@ public Vector2Int[] FrameRanges } [SerializeField, HideInInspector] private int id; + [SerializeField] public Vector2Int[] frameRanges; [SelectImplementation(typeof(IConditionVariables))] [SerializeField, SerializeReference] public IConditionVariables condition; @@ -50,5 +52,17 @@ public Vector2Int[] FrameRanges [SerializeField, HideInInspector] private int parent; [SerializeField, HideInInspector] private int[] children; + + public IStateVariables Copy() + { + var copy = new VarApplyGravity(); + copy.frameRanges = frameRanges; + copy.condition = condition?.Copy(); + copy.useMaxFallSpeedStat = useMaxFallSpeedStat; + copy.useGravityStat = useGravityStat; + copy.gravity = gravity; + copy.maxFallSpeed = maxFallSpeed; + return copy; + } } } \ No newline at end of file diff --git a/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarApplyTraction.cs b/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarApplyTraction.cs index 88c78938..9040972f 100644 --- a/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarApplyTraction.cs +++ b/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarApplyTraction.cs @@ -38,15 +38,27 @@ public Vector2Int[] FrameRanges } [SerializeField, HideInInspector] private int id; + [SerializeField] public Vector2Int[] frameRanges; [SelectImplementation(typeof(IConditionVariables))] [SerializeField, SerializeReference] public IConditionVariables condition; - public bool useTractionStat; public bool aerialTraction; public float traction; [SerializeField, HideInInspector] private int parent; [SerializeField, HideInInspector] private int[] children; + + public IStateVariables Copy() + { + return new VarApplyTraction() + { + frameRanges = frameRanges, + condition = condition.Copy(), + useTractionStat = useTractionStat, + aerialTraction = aerialTraction, + traction = traction, + }; + } } } \ No newline at end of file diff --git a/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarSetFallSpeed.cs b/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarSetFallSpeed.cs index 87d1864f..c2db076a 100644 --- a/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarSetFallSpeed.cs +++ b/Assets/HnSF/Samples/TDAction/Scripts/State/Variables/VarSetFallSpeed.cs @@ -46,5 +46,15 @@ public Vector2Int[] FrameRanges [SerializeField, HideInInspector] private int parent; [SerializeField, HideInInspector] private int[] children; + + public IStateVariables Copy() + { + return new VarSetFallSpeed() + { + frameRanges = frameRanges, + condition = condition.Copy(), + value = value + }; + } } } \ No newline at end of file diff --git a/Assets/HnSF/State/Conditions/IConditionVariables.cs b/Assets/HnSF/State/Conditions/IConditionVariables.cs index db9dd92e..b53393be 100644 --- a/Assets/HnSF/State/Conditions/IConditionVariables.cs +++ b/Assets/HnSF/State/Conditions/IConditionVariables.cs @@ -3,5 +3,7 @@ namespace HnSF public interface IConditionVariables { public int FunctionMap { get; } + + IConditionVariables Copy(); } } \ No newline at end of file diff --git a/Assets/HnSF/State/StateTimeline.cs b/Assets/HnSF/State/StateTimeline.cs index 74fdc36c..a6e454ac 100644 --- a/Assets/HnSF/State/StateTimeline.cs +++ b/Assets/HnSF/State/StateTimeline.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.InteropServices; +using UnityEditor; using UnityEngine; namespace HnSF @@ -175,5 +177,37 @@ public void RemoveStateVariable(int index) data = tempData.ToArray(); } + + public IStateVariables CopyStateVariable(int index) + { + return data[index].Copy(); + } + + public void PasteInPlace(int index, IStateVariables wantedData) + { +#if UNITY_EDITOR + UndoUtility.RecordObject(this, "Pasted State Variable"); +#endif + var temp = data[index]; + + var nameCopy = temp.Name; + var idCopy = temp.ID; + var parentCopy = temp.Parent; + var childrenCopy = temp.Children; + + data[index] = wantedData; + data[index].Parent = parentCopy; + data[index].Children = childrenCopy; + data[index].ID = idCopy; + data[index].Name = nameCopy; + } + + public void PasteAsChild(int parentIndex, IStateVariables wantedChildData) + { +#if UNITY_EDITOR + UndoUtility.RecordObject(this, "Pasted State Variable as Child"); +#endif + AddStateVariable(wantedChildData, parentIndex); + } } } \ No newline at end of file diff --git a/Assets/HnSF/State/Variables/IStateVariables.cs b/Assets/HnSF/State/Variables/IStateVariables.cs index b68e82cb..76922afb 100644 --- a/Assets/HnSF/State/Variables/IStateVariables.cs +++ b/Assets/HnSF/State/Variables/IStateVariables.cs @@ -12,5 +12,7 @@ public interface IStateVariables public IConditionVariables Condition { get; } public int Parent { get; set; } public int[] Children { get; set; } + + IStateVariables Copy(); } } \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index 789b1091..cc02499f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,7 +4,7 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ide.visualstudio": "2.0.17", - "com.unity.inputsystem": "1.4.3", + "com.unity.inputsystem": "1.4.4", "com.unity.render-pipelines.universal": "12.1.7", "com.unity.textmeshpro": "3.0.6", "com.unity.ugui": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 525ac136..fbe2bb52 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -45,7 +45,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.4.3", + "version": "1.4.4", "depth": 0, "source": "registry", "dependencies": { diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 24ae0644..ba955605 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 1349 m_ShowMode: 4 - m_Title: Project + m_Title: Hierarchy m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 104 + controlID: 22 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -95,8 +95,8 @@ MonoBehaviour: y: 0 width: 495 height: 792 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -224,7 +224,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 105 + controlID: 23 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -249,7 +249,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 106 + controlID: 24 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,8 +269,8 @@ MonoBehaviour: y: 0 width: 1546 height: 792 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 17} @@ -298,10 +298,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1531 + x: 2041 y: 73 - width: 388 - height: 926 + width: 518 + height: 1278 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -385,22 +385,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/HnSF/State + - Assets/HnSF/Samples/TDAction/Fighters/Shared/States m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/HnSF/State + - Assets/HnSF/Samples/TDAction/Fighters/Shared/States m_LastFoldersGridSize: 16 m_LastProjectPath: C:\Projects\Unity\hack-and-slash-framework m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: d4640000 - m_LastClickedID: 25812 - m_ExpandedIDs: 0000000090640000926400009464000096640000986400009a640000a0640000a2640000d464000000ca9a3b + scrollPos: {x: 0, y: 178} + m_SelectedIDs: 7e670000 + m_LastClickedID: 26494 + m_ExpandedIDs: 00000000986400009a6400009c6400009e640000a0640000a2640000a4640000a6640000a8640000426600004a6600002267000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -428,7 +428,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000090640000926400009464000096640000986400009a6400009c6400009e640000a0640000a2640000 + m_ExpandedIDs: 00000000986400009a6400009c6400009e640000a0640000a2640000a4640000a6640000a8640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -459,18 +459,18 @@ MonoBehaviour: m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: StateTimelineEditorWindow + m_OriginalName: StateTimelineEditorWindow m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 4154 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 5} m_CreateAssetUtility: @@ -558,23 +558,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3c140000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2cfbffff + m_ExpandedIDs: 24fbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: BootLoader + m_OriginalName: BootLoader m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 22276 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 4} m_SearchString: @@ -972,7 +972,7 @@ MonoBehaviour: m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 m_HSlider: 0 - m_VSlider: 1 + m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 @@ -985,7 +985,7 @@ MonoBehaviour: y: 21 width: 1544 height: 750 - m_Scale: {x: 0.35694444, y: 0.35694447} + m_Scale: {x: 0.3472222, y: 0.3472222} m_Translation: {x: 772, y: 375} m_MarginLeft: 0 m_MarginRight: 0 @@ -993,12 +993,12 @@ MonoBehaviour: m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -2162.8015 - y: -1050.5836 - width: 4325.603 - height: 2101.1672 + x: -2223.36 + y: -1080 + width: 4446.72 + height: 2160 m_MinimalGUI: 1 - m_defaultScale: 0.35694444 + m_defaultScale: 0.3472222 m_LastWindowPixelSize: {x: 1544, y: 771} m_ClearInEditMode: 1 m_NoCameraWarning: 1