sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization

Browse Source
This commit is contained in:
smoogipoo
2019-02-27 12:08:43 +09:00
parent c9c8cccd68 109abf4d28
commit a07d797d75
413 changed files with 2972 additions and 2334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Extensions.TypeExtensions;
using osu.Framework.Graphics.Primitives;
using osu.Game.Audio;
@ -124,14 +124,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
{
base.LoadComplete();
State.ValueChanged += state =>
State.ValueChanged += armed =>
{
UpdateState(state);
UpdateState(armed.NewValue);
// apply any custom state overrides
ApplyCustomUpdateState?.Invoke(this, state);
ApplyCustomUpdateState?.Invoke(this, armed.NewValue);
if (State == ArmedState.Hit)
if (armed.NewValue == ArmedState.Hit)
PlaySamples();
};

2
osu.Game/Rulesets/Objects/Drawables/IScrollingHitObject.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
namespace osu.Game.Rulesets.Objects.Drawables