h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:23:20 +08:00
Code Issues Releases Wiki Activity

Add opsu migration, fix font not rendering

Browse Source
This commit is contained in:
tangalbert919 2018-12-14 09:27:02 -06:00
parent 5d7043156b
commit 214908aaa0
4 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Android/GameView.cs
View File

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

2
osu.Android/MainActivity.cs
View File

@ -5,6 +5,7 @@ using Android.App;
using Android.OS;
using Android.Runtime;
using Android.Widget;
using Android.Views;
using Android.Content.PM;
namespace osu.Android
@ -17,6 +18,7 @@ namespace osu.Android
base.OnCreate(savedInstanceState);
// Set our view from the "main" layout resource
SetContentView(Resource.Layout.activity_main);
Window.AddFlags(WindowManagerFlags.KeepScreenOn);
}
public override void OnBackPressed()
{

44
osu.Android/OsuGameAndroid.cs Normal file
View File

@ -0,0 +1,44 @@
// 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();
}
}
}
}

5
osu.Android/osu.Android.csproj
View File

@ -63,6 +63,7 @@
<ItemGroup>
<Compile Include="GameView.cs" />
<Compile Include="MainActivity.cs" />
<Compile Include="OsuGameAndroid.cs" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
@ -120,10 +121,10 @@
<Version>1.1.0</Version>
</PackageReference>
<PackageReference Include="SixLabors.Core">
<Version>1.0.0-beta0006</Version>
<Version>1.0.0-dev000094</Version>
</PackageReference>
<PackageReference Include="SixLabors.ImageSharp">
<Version>1.0.0-beta0005</Version>
<Version>1.0.0-dev002278</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
</ItemGroup>