From 3c17d8770d208b6e5df7c9ebe8fd2fb67ee9608d Mon Sep 17 00:00:00 2001
From: CroakFang <1605296300@qq.com>
Date: Sat, 10 Sep 2022 15:01:29 +0800
Subject: [PATCH] add android platform build support
---
Assets/Plugins/Android/AndroidManifest.xml | 16 ------
.../Plugins/Android/AndroidManifest.xml.meta | 7 ---
Assets/Plugins/Android/AndroidPlugin.jar | Bin 2862 -> 0 bytes
Assets/Plugins/Android/AndroidPlugin.jar.meta | 32 ------------
Assets/Scripts/CRIMW/CriScript/LoadSound.cs | 4 +-
.../UmaDatabase/UmaDatabaseController.cs | 48 ++++++++++++++----
Assets/Scripts/UmaViewerBuilder.cs | 16 ++----
Assets/Scripts/UmaViewerMain.cs | 3 +-
Assets/Scripts/UmaViewerUI.cs | 4 +-
9 files changed, 47 insertions(+), 83 deletions(-)
delete mode 100644 Assets/Plugins/Android/AndroidManifest.xml
delete mode 100644 Assets/Plugins/Android/AndroidManifest.xml.meta
delete mode 100644 Assets/Plugins/Android/AndroidPlugin.jar
delete mode 100644 Assets/Plugins/Android/AndroidPlugin.jar.meta
diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
deleted file mode 100644
index 193356e..0000000
--- a/Assets/Plugins/Android/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Assets/Plugins/Android/AndroidManifest.xml.meta b/Assets/Plugins/Android/AndroidManifest.xml.meta
deleted file mode 100644
index c7855e9..0000000
--- a/Assets/Plugins/Android/AndroidManifest.xml.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 7a8ce2fd87b517b4eae4a125b76f65eb
-TextScriptImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Plugins/Android/AndroidPlugin.jar b/Assets/Plugins/Android/AndroidPlugin.jar
deleted file mode 100644
index f893266ed75ed6aaf507b11d99b6da8f9c684123..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2862
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 a.Name.Contains(name) && a.Name.EndsWith("acb")));
- info.awbPath = UmaViewerBuilder.GetABPath(Main.AbList.FirstOrDefault(a => a.Name.Contains(name) && a.Name.EndsWith("awb")));
+ info.acbPath = UmaDatabaseController.GetABPath(Main.AbList.FirstOrDefault(a => a.Name.Contains(name) && a.Name.EndsWith("acb")));
+ info.awbPath = UmaDatabaseController.GetABPath(Main.AbList.FirstOrDefault(a => a.Name.Contains(name) && a.Name.EndsWith("awb")));
return info;
}
diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs
index b03c4ad..d0aa718 100644
--- a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs
+++ b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs
@@ -56,26 +56,33 @@ public class UmaDatabaseController
/// Master Database Connection
///
private SqliteConnection masterDb;
-
///
/// Loads the file database
///
public UmaDatabaseController()
{
- if (Application.platform == RuntimePlatform.Android)
+ try
{
- metaDb = new SqliteConnection($@"Data Source=/data/data/jp.co.cygames.umamusume/files/meta;");
- masterDb = new SqliteConnection($@"Data Source=/data/data/jp.co.cygames.umamusume/files/master/master.mdb;");
+ if (Application.platform == RuntimePlatform.Android)
+ {
+ metaDb = new SqliteConnection($@"Data Source={GetGameRootPath()}/meta;");
+ masterDb = new SqliteConnection($@"Data Source={GetGameRootPath()}/master/master.mdb;");
+ }
+ else
+ {
+ metaDb = new SqliteConnection($@"Data Source={Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\Cygames\umamusume\meta;");
+ masterDb = new SqliteConnection($@"Data Source={Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\Cygames\umamusume\master\master.mdb;");
+ }
+ metaDb.Open();
+ MetaEntries = ReadMeta(metaDb);
+ masterDb.Open();
+ CharaData = ReadMaster(masterDb);
}
- else
+ catch
{
- metaDb = new SqliteConnection($@"Data Source={Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\Cygames\umamusume\meta;");
- masterDb = new SqliteConnection($@"Data Source={Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\Cygames\umamusume\master\master.mdb;");
+ UmaViewerUI.Instance.LyricsText.text = $"Database not found: \n{GetGameRootPath()}/meta\n{GetGameRootPath()}/master/master.mdb";
+ UmaViewerUI.Instance.LyricsText.color = Color.red;
}
- metaDb.Open();
- MetaEntries = ReadMeta(metaDb);
- masterDb.Open();
- CharaData = ReadMaster(masterDb);
}
static IEnumerable ReadMeta(SqliteConnection conn)
@@ -120,4 +127,23 @@ public class UmaDatabaseController
}
//conn.Close();
}
+
+ public static string GetABPath(UmaDatabaseEntry entry)
+ {
+ if (Application.platform == RuntimePlatform.Android)
+ {
+ return $"{GetGameRootPath()}/dat/{entry.Url.Substring(0, 2)}/{entry.Url}";
+ }
+
+ return $"{GetGameRootPath()}\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}";
+ }
+
+ public static string GetGameRootPath()
+ {
+ if (Application.platform == RuntimePlatform.Android)
+ {
+ return Application.persistentDataPath;
+ }
+ return $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\\Cygames\\umamusume";
+ }
}
diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs
index d041b71..f13af38 100644
--- a/Assets/Scripts/UmaViewerBuilder.cs
+++ b/Assets/Scripts/UmaViewerBuilder.cs
@@ -448,7 +448,7 @@ public class UmaViewerBuilder : MonoBehaviour
{
List clips = new List();
UmaViewerUI.Instance.LoadedAssetsAdd(awb);
- string awbPath = GetABPath(awb); ;
+ string awbPath = UmaDatabaseController.GetABPath(awb); ;
if (!File.Exists(awbPath)) return clips;
FileStream awbFile = File.OpenRead(awbPath);
@@ -485,7 +485,7 @@ public class UmaViewerBuilder : MonoBehaviour
UmaDatabaseEntry lyricsAsset = Main.AbList.FirstOrDefault(a => a.Name.Contains(lyricsVar));
if (lyricsAsset != null)
{
- string filePath = GetABPath(lyricsAsset);
+ string filePath = UmaDatabaseController.GetABPath(lyricsAsset);
if (File.Exists(filePath))
{
AssetBundle bundle;
@@ -533,7 +533,7 @@ public class UmaViewerBuilder : MonoBehaviour
Debug.Log("Loading " + entry.Name);
if (Main.LoadedBundles.ContainsKey(entry.Name)) return;
- string filePath = GetABPath(entry);
+ string filePath = UmaDatabaseController.GetABPath(entry);
if (File.Exists(filePath))
{
AssetBundle bundle = AssetBundle.LoadFromFile(filePath);
@@ -856,13 +856,5 @@ public class UmaViewerBuilder : MonoBehaviour
UI.LoadedAssetsClear();
}
- public static string GetABPath(UmaDatabaseEntry entry)
- {
- if(Application.platform == RuntimePlatform.Android)
- {
- return $"/data/data/jp.co.cygames.umamusume/files/dat/{entry.Url.Substring(0, 2)}/{entry.Url}";
- }
-
- return $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\\Cygames\\umamusume\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}";
- }
+
}
diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs
index 9d3ea70..05809c0 100644
--- a/Assets/Scripts/UmaViewerMain.cs
+++ b/Assets/Scripts/UmaViewerMain.cs
@@ -11,6 +11,7 @@ public class UmaViewerMain : MonoBehaviour
public static UmaViewerMain Instance;
private UmaViewerUI UI => UmaViewerUI.Instance;
private UmaViewerBuilder Builder => UmaViewerBuilder.Instance;
+
public JArray UmaCharaData;
public JArray UmaLiveData;
@@ -30,11 +31,11 @@ public class UmaViewerMain : MonoBehaviour
{
Application.targetFrameRate = -1;
Instance = this;
- AbList = UmaDatabaseController.Instance.MetaEntries.ToList();
}
IEnumerator Start()
{
+ AbList = UmaDatabaseController.Instance.MetaEntries.ToList();
yield return UmaViewerDownload.DownloadText("https://www.tracenacademy.com/api/BasicCharaDataInfo", txt =>
{
UmaCharaData = JArray.Parse(txt);
diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs
index 3ff598b..00a636b 100644
--- a/Assets/Scripts/UmaViewerUI.cs
+++ b/Assets/Scripts/UmaViewerUI.cs
@@ -77,10 +77,10 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack
public void LoadedAssetsAdd(UmaDatabaseEntry entry)
{
LoadedAssetCount++;
- string filePath = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\\Cygames\\umamusume\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}";
+ string filePath = UmaDatabaseController.GetABPath(entry);
var container = Instantiate(UmaContainerAssetsPrefab, LoadedAssetsPanel).GetComponent();
container.Name.text = Path.GetFileName(entry.Name) + "\n" + entry.Url;
- container.Button.onClick.AddListener(() => { Process.Start("explorer.exe", "/select," + filePath);});
+ container.Button.onClick.AddListener(() => {Process.Start("explorer.exe", "/select," + filePath);});
LoadedAssetsPanel.sizeDelta = new Vector2(0, LoadedAssetCount * 35);
}