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

Re add the missing gameplay notifications

Browse Source
This commit is contained in:
David Kalatzis
2023-05-05 13:51:37 +03:00
parent 45fb64f975
commit 2ff333b1c7
8 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/_Project/Animations/SimulationAnimations/Characters/Nocturne/Nocturne.asset
+1 -1
View File
@@ -1864,7 +1864,7 @@ MonoBehaviour:
hurtboxes:
- size: {x: 32, y: 48}
offset: {x: -13, y: 24}
- frames: 8
- frames: 12
sprite: {fileID: -518461439, guid: e35084ba433dbe04188a002ca11560bb, type: 3}
animationEvent:
jump: 0
Assets/_Project/Scenes/GameScenes/4. GameScene.unity
+2 -2
View File
@@ -17382,8 +17382,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_stage: 0
_characterOne: 4
_characterTwo: 0
_characterOne: 1
_characterTwo: 2
_assistOne: 3
_assistTwo: 0
_controllerOne: 0
Assets/_Project/SciptableObjects/_Rendering/RendererData.asset
+2 -3
View File
@@ -30,9 +30,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
debugShaders:
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
m_RendererFeatures:
- {fileID: 0}
m_RendererFeatureMap: a1e1dc3596a825fd
m_RendererFeatures: []
m_RendererFeatureMap:
m_UseNativeRenderPass: 0
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
Assets/_Project/Scripts/SimulationScripts/StateScripts/StatesScripts/ExceptionStateScripts/ArcanaState.cs
+5
View File
@@ -21,6 +21,9 @@ public class ArcanaState : State
player.attackFrames = DemonicsAnimator.GetMaxAnimationFrames(player.playerStats._animation, player.animation);
player.velocity = new DemonicsVector2(player.attackNetwork.travelDistance.x * (DemonicsFloat)player.flip, (DemonicsFloat)player.attackNetwork.travelDistance.y);
player.InitializeProjectile(player.attackNetwork.moveName, player.attackNetwork, player.attackNetwork.projectileSpeed, player.attackNetwork.projectilePriority, player.attackNetwork.projectileDestroyOnHit);
player.invincible = player.player.PlayerAnimator.GetInvincible(player.animation, player.animationFrames);
if (player.invincible)
player.player.PlayerUI.DisplayNotification(NotificationTypeEnum.Reversal);
UpdateFramedata(player);
return;
}
@@ -35,6 +38,7 @@ public class ArcanaState : State
player.attackFrames--;
}
player.invincible = player.player.PlayerAnimator.GetInvincible(player.animation, player.animationFrames);
UpdateFramedata(player);
ToIdleState(player);
@@ -120,6 +124,7 @@ public class ArcanaState : State
}
else
{
player.player.PlayerUI.DisplayNotification(NotificationTypeEnum.Punish);
if (player.attackHurtNetwork.hardKnockdown)
EnterState(player, "Airborne");
else
Assets/_Project/Scripts/SimulationScripts/StateScripts/StatesScripts/ExceptionStateScripts/AttackState.cs
+1 -1
View File
@@ -257,7 +257,7 @@ public class AttackState : State
player.otherPlayer.pushbackDuration = player.attackHurtNetwork.knockbackDuration;
}
player.player.PlayerUI.DisplayNotification(NotificationTypeEnum.Punish);
if (player.attackHurtNetwork.hardKnockdown)
{
EnterState(player, "Airborne");
Assets/_Project/Scripts/SimulationScripts/StateScripts/StatesScripts/ExceptionStateScripts/GrabbedState.cs
+1
View File
@@ -31,6 +31,7 @@ public class GrabbedState : State
{
if (player.otherPlayer.state != "Arcana" && player.animationFrames <= 6)
{
player.player.PlayerUI.DisplayNotification(NotificationTypeEnum.ThrowBreak);
player.sound = "ParryStart";
player.SetEffect("Impact", new DemonicsVector2((player.position.x + player.otherPlayer.position.x) / 2, player.position.y + (player.pushbox.size.y / 2)));
EnterState(player, "Knockback");
Assets/_Project/Scripts/SimulationScripts/StateScripts/StatesScripts/ExceptionStateScripts/WallSplatState.cs
+1
View File
@@ -7,6 +7,7 @@ public class WallSplatState : State
CheckFlip(player);
if (!player.enter)
{
player.player.PlayerUI.DisplayNotification(NotificationTypeEnum.WallSplat);
CameraShake.Instance.Zoom(-4, 0.2f);
if (player.CurrentState != this)
player.comboLocked = true;
UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+36 -19
View File
@@ -25,7 +25,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 4838
controlID: 10216
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -143,7 +143,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 4803
controlID: 10217
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -542,7 +542,7 @@ MonoBehaviour:
m_OverlaysVisible: 1
m_LockTracker:
m_IsLocked: 0
m_LastSelectedObjectID: 72602
m_LastSelectedObjectID: 32230
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -576,6 +576,7 @@ MonoBehaviour:
m_KeySerializationHelper:
- {fileID: 1371068910987701928, guid: d18292e38a339a24786ca0fe42247b71, type: 2}
- {fileID: 8204161146273501805, guid: 0bfa287c34589f847aa8257262d4f23a, type: 2}
- {fileID: -6926532007188653009, guid: 5cb05553a9262e34ca1156277f027512, type: 2}
m_ValueSerializationHelper:
- e00: 1
e01: 0
@@ -609,10 +610,26 @@ MonoBehaviour:
e31: 0
e32: 0
e33: 1
- e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_PreviewAnimator: {fileID: 0}
m_AnimatorController: {fileID: 9100000, guid: 0bfa287c34589f847aa8257262d4f23a, type: 2}
m_AnimatorController: {fileID: 9100000, guid: 5cb05553a9262e34ca1156277f027512, type: 2}
m_BreadCrumbs:
- m_Target: {fileID: 8204161146273501805, guid: 0bfa287c34589f847aa8257262d4f23a, type: 2}
- m_Target: {fileID: -6926532007188653009, guid: 5cb05553a9262e34ca1156277f027512, type: 2}
m_ScrollPosition: {x: 0, y: 0}
stateMachineGraph: {fileID: 0}
stateMachineGraphGUI: {fileID: 0}
@@ -705,7 +722,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 4812
controlID: 10182
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -763,10 +780,10 @@ MonoBehaviour:
m_OverlaysVisible: 1
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
scrollPos: {x: 0, y: 300}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: dcfaffff
m_ExpandedIDs: dcfaffff006a00008a6e0000ac6f0000d0780000d47e000008820000c4820000c882000024830000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -809,8 +826,8 @@ MonoBehaviour:
y: 473
width: 301
height: 466
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
@@ -859,7 +876,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/_Project/Animations/SimulationAnimations
- Assets/_Project/SciptableObjects/_Rendering
m_Globs: []
m_OriginalText:
m_ViewMode: 0
@@ -873,7 +890,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 4a720200
m_LastClickedID: 160330
m_ExpandedIDs: ffffffff00000000ec01000020880000568b0000ce980000749a00000ea0000010a0000012a0000014a0000016a0000018a000001aa000001ca000001ea0000020a0000022a0000024a0000026a0000028a000002aa000002ca000002ea0000030a0000032a0000034a0000036a0000038a000003aa000003ca000003ea0000040a0000042a0000044a0000046a0000048a000004aa000004ca000004ea0000050a0000052a0000054a0000056a0000058a000005aa000005ca000005ea0000060a0000062a0000064a0000066a0000068a000006aa000006ca000006ea0000070a0000072a0000074a0000076a0000078a000007aa000007ca000007ea0000080a0000082a0000084a0000086a0000088a000008aa000008ca000008ea0000090a0000092a0000094a0000096a0000098a000009aa000009ca000009ea00000a0a00000a2a00000a4a00000a6a00000a8a00000aaa00000aca00000aea00000b0a00000b2a00000b4a00000b6a00000b8a00000baa00000bca00000bea00000c0a00000c2a00000c4a00000c6a00000c8a00000caa00000cca00000cea00000d0a00000d2a00000d6a00000d8a00000dca00000dea00000e0a00000e2a00000e4a00000e6a00000e8a0000032a1000058a10000aca80000
m_ExpandedIDs: ffffffff00000000ec01000020880000568b0000ce980000749a00000ea0000010a0000012a0000014a0000016a0000018a000001aa000001ca000001ea0000020a0000022a0000024a0000026a0000028a000002aa000002ca000002ea0000030a0000032a0000034a0000036a0000038a000003aa000003ca000003ea0000040a0000042a0000044a0000046a0000048a000004aa000004ca000004ea0000050a0000052a0000054a0000056a0000058a000005aa000005ca000005ea0000060a0000062a0000064a0000066a0000068a000006aa000006ca000006ea0000070a0000072a0000074a0000076a0000078a000007aa000007ca000007ea0000080a0000082a0000084a0000086a0000088a000008aa000008ca000008ea0000090a0000092a0000094a0000096a0000098a000009aa000009ca000009ea00000a0a00000a2a00000a4a00000a6a00000a8a00000aaa00000aca00000aea00000b0a00000b2a00000b4a00000b6a00000b8a00000baa00000bca00000bea00000c0a00000c2a00000c4a00000c6a00000c8a00000caa00000cca00000cea00000d0a00000d2a00000d4a00000d6a00000d8a00000dca00000dea00000e0a00000e2a00000e4a00000e6a00000e8a0000032a1000058a10000aca8000042b10000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -898,10 +915,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
scrollPos: {x: 0, y: 689}
m_SelectedIDs: f0990000
m_LastClickedID: 39408
m_ExpandedIDs: ffffffff00000000ec01000020880000568b0000ce980000749a00000ea0000010a0000012a0000014a0000016a0000018a000001aa000001ca000001ea0000020a0000022a0000024a0000026a0000028a000002aa000002ca000002ea0000030a0000032a0000034a0000036a0000038a000003aa000003ca000003ea0000040a0000042a0000044a0000046a0000048a000004aa000004ca000004ea0000050a0000052a0000054a0000056a0000058a000005aa000005ca000005ea0000060a0000062a0000064a0000066a0000068a000006aa000006ca000006ea0000070a0000072a0000074a0000076a0000078a000007aa000007ca000007ea0000080a0000082a0000084a0000086a0000088a000008aa000008ca000008ea0000090a0000092a0000094a0000096a0000098a000009aa000009ca000009ea00000a0a00000a2a00000a4a00000a6a00000a8a00000aaa00000aca00000aea00000b0a00000b2a00000b4a00000b6a00000b8a00000baa00000bca00000bea00000c0a00000c2a00000c4a00000c6a00000c8a00000caa00000cca00000cea00000d0a00000d2a00000d6a00000d8a00000dca00000dea00000e0a00000e2a00000e4a00000e6a00000e8a0000032a1000058a10000aca80000
scrollPos: {x: 0, y: 2257}
m_SelectedIDs: e67d0000
m_LastClickedID: 0
m_ExpandedIDs: ffffffff00000000ec01000020880000568b0000ce980000749a00000ea0000010a0000012a0000014a0000016a0000018a000001aa000001ca000001ea0000020a0000022a0000024a0000026a0000028a000002aa000002ca000002ea0000030a0000032a0000034a0000036a0000038a000003aa000003ca000003ea0000040a0000042a0000044a0000046a0000048a000004aa000004ca000004ea0000050a0000052a0000054a0000056a0000058a000005aa000005ca000005ea0000060a0000062a0000064a0000066a0000068a000006aa000006ca000006ea0000070a0000072a0000074a0000076a0000078a000007aa000007ca000007ea0000080a0000082a0000084a0000086a0000088a000008aa000008ca000008ea0000090a0000092a0000094a0000096a0000098a000009aa000009ca000009ea00000a0a00000a2a00000a4a00000a6a00000a8a00000aaa00000aca00000aea00000b0a00000b2a00000b4a00000b6a00000b8a00000baa00000bca00000bea00000c0a00000c2a00000c4a00000c6a00000c8a00000caa00000cca00000cea00000d0a00000d2a00000d4a00000d6a00000d8a00000dca00000dea00000e0a00000e2a00000e4a00000e6a00000e8a0000032a1000058a10000aca8000042b10000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -926,8 +943,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: f0990000
m_LastClickedInstanceID: 39408
m_SelectedInstanceIDs: e67d0000
m_LastClickedInstanceID: 32230
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
@@ -1047,7 +1064,7 @@ MonoBehaviour:
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: 39408
m_LastInspectedObjectInstanceID: 32230
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0