Merge pull request #16 from LumpBloom7/dependabot/nuget/ppy.osu.Game-…

…2020.1114.0 Bump ppy.osu.Game from 2020.1031.0 to 2020.1114.0
LumpBloom7 · Nov 14, 2020 · 9d1da14 · 9d1da14
2 parents e967e55 + f3f3182
commit 9d1da14
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/osu.Game.Rulesets.Hishigata/Objects/Drawables/DrawableHishigataHitObject.cs b/osu.Game.Rulesets.Hishigata/Objects/Drawables/DrawableHishigataHitObject.cs
@@ -52,6 +52,12 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
+        }
+
         protected override void UpdateInitialTransforms()
         {
             if (HitObject.IsFeign)
@@ -63,7 +69,7 @@ protected override void UpdateInitialTransforms()
                 note.MoveTo(new Vector2(0, -80), HitObject.TimePreempt);
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
             double animationDuration = HitObject.TimePreempt / 6;
 

diff --git a/osu.Game.Rulesets.Hishigata/UI/HishigataPlayfield.cs b/osu.Game.Rulesets.Hishigata/UI/HishigataPlayfield.cs
@@ -43,6 +43,7 @@ public HishigataPlayfield()
                 };
                 lanes.Add(lane);
                 playfieldContainer.Add(lane);
+                AddNested(lane);
             }
         }
 

diff --git a/osu.Game.Rulesets.Hishigata/UI/Lane.cs b/osu.Game.Rulesets.Hishigata/UI/Lane.cs
@@ -1,3 +1,4 @@
+using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
@@ -39,6 +40,7 @@ private void onNewResult(DrawableHitObject h, JudgementResult judgement)
         {
             if (judgement.IsHit)
                 hitExplosionContainer.Add(hitExplosionPool.Get(e => e.Apply(h as DrawableHishigataHitObject)));
+            Console.WriteLine(judgement.Type.ToString());
         }
 
         public class LaneReceptor : CompositeDrawable

diff --git a/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj b/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj
@@ -10,6 +10,6 @@
     <AssemblyName>osu.Game.Rulesets.Hishigata</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2020.1031.0"/>
+    <PackageReference Include="ppy.osu.Game" Version="2020.1114.0"/>
   </ItemGroup>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ public HishigataPlayfield() @@
                     };
                     lanes.Add(lane);
                     playfieldContainer.Add(lane);
+                    AddNested(lane);
                 }
             }
@@ Expand Down @@