Skip to content

Commit

Permalink
feat: Start of new input reading system.
Browse files Browse the repository at this point in the history
  • Loading branch information
christides11 committed Nov 11, 2023
1 parent ea3a87e commit 4433e49
Show file tree
Hide file tree
Showing 17 changed files with 980 additions and 889 deletions.
427 changes: 214 additions & 213 deletions Assembly-CSharp.csproj

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions Assets/HnSF/Input/EnterInputMethod.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace HnSF
{
public enum EnterInputMethod
{
Normal,
Strict,
Once,
OnceStrict,
Release
}
}
11 changes: 11 additions & 0 deletions Assets/HnSF/Input/EnterInputMethod.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions Assets/HnSF/Input/InputBitmask.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace HnSF.Input
{
[System.Serializable]
public struct InputBitmask
{
public int bitmask;
public int lenience;
public bool checkNot;
}
}
11 changes: 11 additions & 0 deletions Assets/HnSF/Input/InputBitmask.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Assets/HnSF/Input/InputCondition.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace HnSF.Input
{
[System.Serializable]
public class InputCondition
{
public InputBitmask[] sequence;
public int impreciseInputCount;
public bool inputAllowDisable;
public EnterInputMethod method;
}
}
11 changes: 11 additions & 0 deletions Assets/HnSF/Input/InputCondition.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/HnSF/Input/InputSequence.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace HnSF.Input
[System.Serializable]
public class InputSequence
{

public uint executeWindow = 3;
[SerializeField]public List<InputDefinition> executeInputs = new List<InputDefinition>();
public uint sequenceWindow = 8;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,24 @@ MonoBehaviour:
autoIncrement: 1
autoLoop: 1
autoLoopFrame: 1
data: []
data:
- rid: 1680875285544697856
references:
version: 2
RefIds: []
RefIds:
- rid: 1680875285544697856
type: {class: ChangeState, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction}
data:
name:
id: 0
frameRanges: []
condition:
rid: 1680875285544697858
runDuringHitstop: 0
stateMovesetID: 0
stateID: 0
parent: -1
children:
- rid: 1680875285544697858
type: {class: ConditionNone, ns: HnSF.Sample.TDAction.State, asm: HnSF.TDAction}
data:
433 changes: 217 additions & 216 deletions HnSF.Editor.csproj

Large diffs are not rendered by default.

431 changes: 216 additions & 215 deletions HnSF.TDAction.csproj

Large diffs are not rendered by default.

434 changes: 219 additions & 215 deletions HnSF.csproj

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"com.medvedya.select_implementation_property_drawer": "https://github.com/medvedya/Select-implementation-property-drawer.git",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ai.navigation": "1.1.4",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.ai.navigation": "1.1.5",
"com.unity.ide.visualstudio": "2.0.21",
"com.unity.inputsystem": "1.7.0",
"com.unity.render-pipelines.universal": "14.0.8",
"com.unity.render-pipelines.universal": "14.0.9",
"com.unity.textmeshpro": "3.0.6",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
Expand Down
20 changes: 10 additions & 10 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
},
"com.unity.ai.navigation": {
"version": "1.1.4",
"version": "1.1.5",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -32,7 +32,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.8.8",
"version": "1.8.9",
"depth": 1,
"source": "registry",
"dependencies": {
Expand All @@ -48,7 +48,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.18",
"version": "2.0.21",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -73,7 +73,7 @@
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "14.0.8",
"version": "14.0.9",
"depth": 1,
"source": "builtin",
"dependencies": {
Expand All @@ -84,14 +84,14 @@
}
},
"com.unity.render-pipelines.universal": {
"version": "14.0.8",
"version": "14.0.9",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.mathematics": "1.2.1",
"com.unity.burst": "1.8.4",
"com.unity.render-pipelines.core": "14.0.8",
"com.unity.shadergraph": "14.0.8"
"com.unity.burst": "1.8.9",
"com.unity.render-pipelines.core": "14.0.9",
"com.unity.shadergraph": "14.0.9"
}
},
"com.unity.searcher": {
Expand All @@ -102,11 +102,11 @@
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
"version": "14.0.8",
"version": "14.0.9",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.render-pipelines.core": "14.0.8",
"com.unity.render-pipelines.core": "14.0.9",
"com.unity.searcher": "4.9.2"
}
},
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2022.3.9f1
m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338)
m_EditorVersion: 2022.3.12f1
m_EditorVersionWithRevision: 2022.3.12f1 (4fe6e059c7ef)
1 change: 1 addition & 0 deletions ProjectSettings/ShaderGraphSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3}
m_Name:
m_EditorClassIdentifier:
shaderVariantLimit: 128
customInterpolatorErrorThreshold: 32
customInterpolatorWarningThreshold: 16
26 changes: 13 additions & 13 deletions UserSettings/Layouts/default-2022.dwlt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ MonoBehaviour:
width: 2560
height: 1349
m_ShowMode: 4
m_Title: Inspector
m_Title: Hierarchy
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
Expand Down Expand Up @@ -393,24 +393,24 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets
- Assets/HnSF/Input
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
m_FilterByTypeIntersection: 0
m_ViewMode: 1
m_StartGridSize: 16
m_LastFolders:
- Assets
- Assets/HnSF/Input
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: ca680000
m_LastClickedID: 26826
m_ExpandedIDs: 00000000ca680000ac6a00002c7b000000ca9a3b
m_SelectedIDs: d06a0000
m_LastClickedID: 27344
m_ExpandedIDs: 0000000000690000026900000469000006690000086900000a6900000c6900000e69000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -438,7 +438,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000ca680000cc680000ce680000d0680000d2680000d4680000d6680000d8680000
m_ExpandedIDs: 0000000000690000026900000469000006690000086900000a6900000c6900000e690000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand All @@ -465,22 +465,22 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c623000000000000f4170000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: StateTimeline
m_OriginalName: StateTimeline
m_Name: InputBitmask
m_OriginalName: InputBitmask
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 3880
m_UserData: 27406
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 4
m_OriginalEventType: 0
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5}
m_CreateAssetUtility:
Expand Down Expand Up @@ -582,7 +582,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 64c7ffffeac7ffff9cc9ffff12fbffff
m_ExpandedIDs: 12fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down

0 comments on commit 4433e49

Please sign in to comment.