h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 06:03:22 +08:00
Code Issues Releases Wiki Activity

Remove ability to import from opsu!

Browse Source 
This has been struck down by @ppy
This commit is contained in:
tangalbert919 2018-12-20 09:11:20 -06:00
parent 214908aaa0
commit 660be6a2a4
4 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android/GameView.cs
View File

@ -20,6 +20,6 @@ namespace osu.Android
{ {
CreateGame(); CreateGame();
} }
public override Framework.Game CreateGame() => new OsuGameAndroid(); public override Framework.Game CreateGame() => new OsuGame();
} }
} }

44
osu.Android/OsuGameAndroid.cs
View File

@ -1,44 +0,0 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Android;
using osu.Framework.Platform;
using osu.Game;
using System;
using System.IO;
namespace osu.Android
{
internal class OsuGameAndroid : OsuGame
{
public OsuGameAndroid() : base()
{
}
public override Storage GetStorageForStableInstall()
{
return new OpsuStorage();
}
// For better migration from opsu! to osu!lazer (WIP)
private class OpsuStorage : AndroidStorage
{
bool checkExists(string p) => Directory.Exists(Path.Combine(p, "Songs"));
protected override string LocateBasePath()
{
BasePath = base.LocateBasePath();
string opsuInstallPath = Path.Combine(BasePath, "opsu");
Console.WriteLine(opsuInstallPath);
if (checkExists(opsuInstallPath))
return opsuInstallPath;
return null;
}
public OpsuStorage() : base(string.Empty, null)
{
BasePath = LocateBasePath();
}
}
}
}

1
osu.Android/Properties/AndroidManifest.xml
View File

@ -4,5 +4,6 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"></application> <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
</manifest> </manifest>

2
osu.Android/osu.Android.csproj
View File

@ -40,6 +40,7 @@
<BundleAssemblies>false</BundleAssemblies> <BundleAssemblies>false</BundleAssemblies>
<MandroidI18n>CJK;Mideast;Rare;West;Other</MandroidI18n> <MandroidI18n>CJK;Mideast;Rare;West;Other</MandroidI18n>
<AndroidSupportedAbis /> <AndroidSupportedAbis />
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
@ -63,7 +64,6 @@
<ItemGroup> <ItemGroup>
<Compile Include="GameView.cs" /> <Compile Include="GameView.cs" />
<Compile Include="MainActivity.cs" /> <Compile Include="MainActivity.cs" />
<Compile Include="OsuGameAndroid.cs" />
<Compile Include="Resources\Resource.designer.cs" /> <Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>