From bd092e99d750d86441f41b8842f55b88fc9ff072 Mon Sep 17 00:00:00 2001 From: None1637 Date: Mon, 25 May 2020 12:45:55 +0800 Subject: [PATCH 1/4] fixed display bug when use EZREZ --- src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java b/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java index 54ac20193..24d9b4593 100644 --- a/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java +++ b/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java @@ -889,6 +889,9 @@ public void changeDimensionInfo(TrackInfo track) { } //added by hao1637 if (mod.contains(GameMod.MOD_REALLYEASY)) { + if(mod.contains(GameMod.MOD_EASY)){ + ar *= 2f; + } ar -= 0.5f; if(mod.contains(GameMod.MOD_DOUBLETIME) | mod.contains(GameMod.MOD_NIGHTCORE)){ ar -= 0.5f; From c6ab82484bf2e587113092909223300bdf08e273 Mon Sep 17 00:00:00 2001 From: None1637 Date: Mon, 25 May 2020 13:20:41 +0800 Subject: [PATCH 2/4] fixed --- .settings/org.eclipse.buildship.core.prefs | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .settings/org.eclipse.buildship.core.prefs diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 000000000..68eb8cb4f --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3)) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home=D\:/Program Files (x86)/jdk +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true From 287c8c6bbc1a4cf8d2800fe400377b1253767852 Mon Sep 17 00:00:00 2001 From: None1637 Date: Mon, 25 May 2020 13:33:44 +0800 Subject: [PATCH 3/4] fixed REZ's bug --- .settings/org.eclipse.buildship.core.prefs | 2 +- src/ru/nsu/ccfit/zuev/osu/game/GameScene.java | 10 ++++++++-- src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java | 7 +++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs index 68eb8cb4f..e4d52ec7c 100644 --- a/.settings/org.eclipse.buildship.core.prefs +++ b/.settings/org.eclipse.buildship.core.prefs @@ -1,7 +1,7 @@ arguments= auto.sync=false build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3)) +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 gradle.user.home= diff --git a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java index 826ed9c54..f73cec7e8 100644 --- a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java +++ b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java @@ -419,8 +419,14 @@ private boolean loadGame(final TrackInfo track, final String rFile) { scale += 0.125f; drain *= 0.5f; overallDifficulty *= 0.5f; - approachRate = (float) ((ModMenu.getInstance().getMod().contains(GameMod.MOD_DOUBLETIME) || ModMenu.getInstance().getMod().contains(GameMod.MOD_NIGHTCORE))? - (GameHelper.ar2ms(rawApproachRate - 1f) / 1000f):(GameHelper.ar2ms(rawApproachRate - 0.5f) / 1000f)); + if(ModMenu.getInstance().getMod().contains(GameMod.MOD_HARDROCK)){ + approachRate = (float) ((ModMenu.getInstance().getMod().contains(GameMod.MOD_DOUBLETIME) || ModMenu.getInstance().getMod().contains(GameMod.MOD_NIGHTCORE))? + (GameHelper.ar2ms(Math.min(1.4f * rawApproachRate, 10f) - 1f) / 1000f):(GameHelper.ar2ms(Math.min(1.4f * rawApproachRate, 10f) - 0.5f) / 1000f)); + } + else{ + approachRate = (float) ((ModMenu.getInstance().getMod().contains(GameMod.MOD_DOUBLETIME) || ModMenu.getInstance().getMod().contains(GameMod.MOD_NIGHTCORE))? + (GameHelper.ar2ms(rawApproachRate - 1f) / 1000f):(GameHelper.ar2ms(rawApproachRate - 0.5f) / 1000f)); + } } if (ModMenu.getInstance().getMod().contains(GameMod.MOD_SMALLCIRCLE)) { diff --git a/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java b/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java index 24d9b4593..cee87d961 100644 --- a/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java +++ b/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java @@ -911,6 +911,13 @@ public void changeDimensionInfo(TrackInfo track) { String binfoStr = String.format(StringTable.get(R.string.binfoStr1), sdf.format(length), (bpm_min == bpm_max ? GameHelper.Round(bpm_min, 1) : GameHelper.Round(bpm_min, 1) + "-" + GameHelper.Round(bpm_max, 1)), track.getMaxCombo()); + if(length > 3600 * 1000){ + sdf = new SimpleDateFormat("HH:mm:ss"); + sdf.setTimeZone(TimeZone.getTimeZone("GMT+0")); + binfoStr = String.format(StringTable.get(R.string.binfoStr1), sdf.format(length), + (bpm_min == bpm_max ? GameHelper.Round(bpm_min, 1) : GameHelper.Round(bpm_min, 1) + "-" + GameHelper.Round(bpm_max, 1)), + track.getMaxCombo()); + } beatmapInfo.setText(binfoStr); final StringBuilder dimensionStringBuilder = new StringBuilder(); From 0713117732e1166655f1a478e57ae75977c8a368 Mon Sep 17 00:00:00 2001 From: EdrowsLuo <793971297@qq.com> Date: Sat, 30 May 2020 08:50:11 +0800 Subject: [PATCH 4/4] Delete org.eclipse.buildship.core.prefs Delete user specific config file --- .settings/org.eclipse.buildship.core.prefs | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .settings/org.eclipse.buildship.core.prefs diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index e4d52ec7c..000000000 --- a/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -arguments= -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) -connection.project.dir= -eclipse.preferences.version=1 -gradle.user.home= -java.home=D\:/Program Files (x86)/jdk -jvm.arguments= -offline.mode=false -override.workspace.settings=true -show.console.view=true -show.executions.view=true