izzy/Darklings-FightingGame
0
0
Fork 0
mirror of https://github.com/izzy2lost/Darklings-FightingGame.git synced 2026-03-10 11:35:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor bugs with combo and blocking

Browse Source
This commit is contained in:
David Kalatzis
2023-02-27 16:15:20 +02:00
parent f9e236480e
commit 50a38d38df
6 changed files with 102 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/_Project/Scripts/PlayerScripts/PlayerComboSystem.cs
View File

@@ -63,14 +63,16 @@ public class PlayerComboSystem : MonoBehaviour
{
return playerStats.m2M;
}
else
else if (inputEnum == InputEnum.Heavy)
{
return playerStats.m2H;
}
return null;
}
private static AttackSO GetStandingAttackType(PlayerStatsSO playerStats, InputEnum inputEnum)
{
Debug.Log(inputEnum);
if (inputEnum == InputEnum.Light)
{
return playerStats.m5L;
@@ -79,10 +81,11 @@ public class PlayerComboSystem : MonoBehaviour
{
return playerStats.m5M;
}
else
else if (inputEnum == InputEnum.Heavy)
{
return playerStats.m5H;
}
return null;
}
public static AttackSO GetThrow(PlayerStatsSO playerStats)

8
Assets/_Project/Scripts/SimulationScripts/StateScripts/State.cs
View File

@@ -26,6 +26,7 @@ public class State
}
public bool IsBlocking(PlayerNetwork player)
{
player.gotHit = false;
if (player.attackHurtNetwork.attackType == AttackTypeEnum.Break)
{
return false;
@@ -78,8 +79,11 @@ public class State
player.isCrouch = false;
}
AttackSO attack = PlayerComboSystem.GetComboAttack(player.playerStats, player.attackInput, player.isCrouch, player.isAir);
player.attackNetwork = SetAttack(player.attackInput, attack);
EnterState(player, "Attack");
if (attack != null)
{
player.attackNetwork = SetAttack(player.attackInput, attack);
EnterState(player, "Attack");
}
}
}
protected void Arcana(PlayerNetwork player, bool air = false)

864
Assets/_Project/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long

10
UserSettings/EditorUserSettings.asset
View File

@@ -33,17 +33,17 @@ EditorUserSettings:
value: 0154025755510f5d5d0d592641720e444f4f407d7b2971697e704b60e7e36760
flags: 0
RecentlyUsedSceneGuid-5:
value: 56000c5550020f095b56557541730a44134e4a7a287a23627e7d4d36e3e5303d
flags: 0
RecentlyUsedSceneGuid-6:
value: 5b52045e5606085d555c5474142508441416487c7d7b20632b781b32e1b4306a
flags: 0
RecentlyUsedSceneGuid-7:
RecentlyUsedSceneGuid-6:
value: 530102525653510b0e5b0e7149255c44444f497b7d7f2466787f4e6ab6e4666b
flags: 0
RecentlyUsedSceneGuid-8:
RecentlyUsedSceneGuid-7:
value: 020951565c57500c0b08082611700a4446154179747f246428784860e0b3363a
flags: 0
RecentlyUsedSceneGuid-8:
value: 56000c5550020f095b56557541730a44134e4a7a287a23627e7d4d36e3e5303d
flags: 0
RecentlyUsedSceneGuid-9:
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
flags: 0

61
UserSettings/Layouts/CurrentMaximizeLayout.dwlt
View File

@@ -25,7 +25,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 17279
controlID: 1187
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -87,7 +87,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -142,7 +142,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 17113
controlID: 1188
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -429,9 +429,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 732.6565, y: 418.7066, z: -0.73573995}
m_Target: {x: 234.22185, y: 873.42706, z: 1.359273}
speed: 2
m_Value: {x: 732.6565, y: 418.7066, z: -0.73573995}
m_Value: {x: 234.22185, y: 873.42706, z: 1.359273}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -482,9 +482,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 470.6515
m_Target: 261.1524
speed: 2
m_Value: 470.6515
m_Value: 261.1524
m_Ortho:
m_Target: 1
speed: 2
@@ -539,7 +539,7 @@ MonoBehaviour:
m_SaveData: []
m_LockTracker:
m_IsLocked: 0
m_LastSelectedObjectID: 699962
m_LastSelectedObjectID: 0
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -664,7 +664,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 17280
controlID: 1134
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -684,8 +684,8 @@ MonoBehaviour:
y: 0
width: 263
height: 474
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 12}
@@ -722,7 +722,7 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_SelectedIDs: 280a0000
m_LastClickedID: 0
m_ExpandedIDs: 7c88feff3495feff
m_RenameOverlay:
@@ -758,7 +758,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ConsoleWindow
m_Name: ProjectBrowser
m_EditorClassIdentifier:
m_Children: []
m_Position:
@@ -767,14 +767,14 @@ MonoBehaviour:
y: 474
width: 263
height: 465
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 15}
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
- {fileID: 15}
m_Selected: 1
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 1
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -815,7 +815,8 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SkipHidden: 1
m_SearchArea: 1
m_Folders: []
m_Folders:
- Assets/_Project/Scripts/UIScripts
m_Globs: []
m_OriginalText:
m_ViewMode: 0
@@ -829,7 +830,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 4a720200
m_LastClickedID: 160330
m_ExpandedIDs: ffffffff00000000f66800001484000016840000188400001a8400001c8400001e84000020840000228400002484000026840000288400002a8400002c8400002e84000030840000328400003484000036840000388400003a8400003c8400003e84000040840000428400004484000046840000488400004a8400004c8400004e84000050840000528400005484000056840000588400005a8400005c8400005e84000060840000628400006484000066840000688400006a8400006c8400006e840000aa840000dc840000
m_ExpandedIDs: ffffffff00000000227600008c8c00008e8c0000908c0000928c0000948c0000968c0000988c00009a8c00009c8c00009e8c0000a08c0000a28c0000a48c0000a68c0000a88c0000aa8c0000ac8c0000ae8c0000b08c0000b28c0000b48c0000b68c0000b88c0000ba8c0000bc8c0000be8c0000c08c0000c28c0000c48c0000c68c0000c88c0000ca8c0000cc8c0000ce8c0000d08c0000d28c0000d48c0000d68c0000d88c0000da8c0000dc8c0000de8c0000e08c0000e28c0000e48c0000e68c0000e88c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -854,10 +855,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 3aae0a00
m_LastClickedID: 0
m_ExpandedIDs: ffffffff00000000f66800001484000016840000188400001a8400001c8400001e84000020840000228400002484000026840000288400002a8400002c8400002e84000030840000328400003484000036840000388400003a8400003c8400003e84000040840000428400004484000046840000488400004a8400004c8400004e84000050840000528400005484000056840000588400005a8400005c8400005e84000060840000628400006484000066840000688400006a8400006c8400006e840000aa840000dc840000
scrollPos: {x: 0, y: 1200}
m_SelectedIDs: 280a0000
m_LastClickedID: 2600
m_ExpandedIDs: ffffffff00000000227600008c8c00008e8c0000908c0000928c0000948c0000968c0000988c00009a8c00009c8c00009e8c0000a08c0000a28c0000a48c0000a68c0000a88c0000aa8c0000ac8c0000ae8c0000b08c0000b28c0000b48c0000b68c0000b88c0000ba8c0000bc8c0000be8c0000c08c0000c28c0000c48c0000c68c0000c88c0000ca8c0000cc8c0000ce8c0000d08c0000d28c0000d48c0000d68c0000d88c0000da8c0000dc8c0000de8c0000e08c0000e28c0000e48c0000e68c0000e88c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -882,8 +883,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: 3aae0a00
m_LastClickedInstanceID: 699962
m_SelectedInstanceIDs: 280a0000
m_LastClickedInstanceID: 2600
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
@@ -933,10 +934,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1183
x: 1097
y: 547
width: 261
height: 444
width: 363
height: 436
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -1001,7 +1002,7 @@ MonoBehaviour:
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: 699962
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0

88
UserSettings/Layouts/default-2021.dwlt
View File

@@ -120,7 +120,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 98
controlID: 2447
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -145,7 +145,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 99
controlID: 2448
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -164,7 +164,7 @@ MonoBehaviour:
x: 0
y: 0
width: 1188
height: 303
height: 313
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 14}
@@ -190,9 +190,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 303
y: 313
width: 1188
height: 636
height: 626
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
@@ -225,7 +225,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 71
controlID: 2417
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -245,8 +245,8 @@ MonoBehaviour:
y: 0
width: 258
height: 474
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 18}
@@ -262,7 +262,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser
m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
@@ -271,14 +271,14 @@ MonoBehaviour:
y: 474
width: 258
height: 465
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
m_ActualView: {fileID: 19}
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 20}
m_Panes:
- {fileID: 19}
- {fileID: 20}
m_Selected: 0
m_LastSelected: 1
m_Selected: 1
m_LastSelected: 0
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -325,10 +325,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 376
x: -32000
y: -31657
width: 1187
height: 615
height: 605
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -343,7 +343,7 @@ MonoBehaviour:
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
m_EnterPlayModeBehavior: 0
m_EnterPlayModeBehavior: 1
m_UseMipMap: 0
m_VSyncEnabled: 0
m_Gizmos: 0
@@ -376,22 +376,22 @@ MonoBehaviour:
x: 0
y: 21
width: 1187
height: 594
m_Scale: {x: 0.55, y: 0.55}
m_Translation: {x: 593.50006, y: 297}
height: 584
m_Scale: {x: 0.5407407, y: 0.5407407}
m_Translation: {x: 593.5, y: 292}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -1079.091
x: -1097.5685
y: -540
width: 2158.182
width: 2195.137
height: 1080
m_MinimalGUI: 1
m_defaultScale: 0.55
m_LastWindowPixelSize: {x: 1187, y: 615}
m_defaultScale: 0.5407407
m_LastWindowPixelSize: {x: 1187, y: 605}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -420,7 +420,7 @@ MonoBehaviour:
x: 0
y: 73
width: 1187
height: 282
height: 292
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -655,9 +655,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 718.4728, y: 412.85056, z: -0.7452901}
m_Target: {x: 234.22185, y: 873.42706, z: 1.359273}
speed: 2
m_Value: {x: 718.4728, y: 412.85056, z: -0.7452901}
m_Value: {x: 234.22185, y: 873.42706, z: 1.359273}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -708,9 +708,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 471.6065
m_Target: 261.1524
speed: 2
m_Value: 471.6065
m_Value: 261.1524
m_Ortho:
m_Target: 1
speed: 2
@@ -765,7 +765,7 @@ MonoBehaviour:
m_SaveData: []
m_LockTracker:
m_IsLocked: 0
m_LastSelectedObjectID: 24138
m_LastSelectedObjectID: 35420
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -888,10 +888,10 @@ MonoBehaviour:
m_SaveData: []
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 396}
m_SelectedIDs: 4a5e0000
m_LastClickedID: 24138
m_ExpandedIDs: c6ebffffd6ebffff84efffff8cefffff94efffff9cefffffa6efffff12fbffff4e590000945900004a5e0000e45f0000086400008064000052660000d667000084680000d2680000
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 84dbfeffd0dbfeffe6ddfeff2cedfeff40edfeff46fdfeff5cfdfeff18eaffff62eaffff12fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -956,7 +956,7 @@ MonoBehaviour:
m_SkipHidden: 1
m_SearchArea: 1
m_Folders:
- Assets/_Project/SciptableObjects/UIScriptableObjects
- Assets/_Project/Scripts
m_Globs: []
m_OriginalText:
m_ViewMode: 0
@@ -970,7 +970,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 4a720200
m_LastClickedID: 160330
m_ExpandedIDs: 00000000f66800001484000016840000188400001a8400001c8400001e84000020840000228400002484000026840000288400002a8400002c8400002e84000030840000328400003484000036840000388400003a8400003c8400003e84000040840000428400004484000046840000488400004a8400004c8400004e84000050840000528400005484000056840000588400005a8400005c8400005e84000060840000628400006484000066840000688400006a8400006c840000
m_ExpandedIDs: ffffffff00000000f66800001484000016840000188400001a8400001c8400001e84000020840000228400002484000026840000288400002a8400002c8400002e84000030840000328400003484000036840000388400003a8400003c8400003e84000040840000428400004484000046840000488400004a8400004c8400004e84000050840000528400005484000056840000588400005a8400005c8400005e84000060840000628400006484000066840000688400006a8400006c8400006e840000b2840000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -995,10 +995,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
scrollPos: {x: 0, y: 2340}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: ffffffff00000000f66800001484000016840000188400001a8400001c8400001e84000020840000228400002484000026840000288400002a8400002c8400002e84000030840000328400003484000036840000388400003a8400003c8400003e84000040840000428400004484000046840000488400004a8400004c8400004e84000050840000528400005484000056840000588400005a8400005c8400005e84000060840000628400006484000066840000688400006a8400006c840000de840000
scrollPos: {x: 0, y: 1930}
m_SelectedIDs: 78150000
m_LastClickedID: 5496
m_ExpandedIDs: ffffffff00000000f66800001484000016840000188400001a8400001c8400001e84000020840000228400002484000026840000288400002a8400002c8400002e84000030840000328400003484000036840000388400003a8400003c8400003e84000040840000428400004484000046840000488400004a8400004c8400004e84000050840000528400005484000056840000588400005a8400005c8400005e84000060840000628400006484000066840000688400006a8400006c8400006e840000b2840000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1023,8 +1023,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_SelectedInstanceIDs: 78150000
m_LastClickedInstanceID: 5496
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
@@ -1117,7 +1117,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 423
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker: