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 f893266..0000000 Binary files a/Assets/Plugins/Android/AndroidPlugin.jar and /dev/null differ diff --git a/Assets/Plugins/Android/AndroidPlugin.jar.meta b/Assets/Plugins/Android/AndroidPlugin.jar.meta deleted file mode 100644 index 3979da1..0000000 --- a/Assets/Plugins/Android/AndroidPlugin.jar.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: cdeb84ba555594c4cbbc11f9a2a036a5 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/CRIMW/CriScript/LoadSound.cs b/Assets/Scripts/CRIMW/CriScript/LoadSound.cs index d3c2a91..05f40fc 100644 --- a/Assets/Scripts/CRIMW/CriScript/LoadSound.cs +++ b/Assets/Scripts/CRIMW/CriScript/LoadSound.cs @@ -15,8 +15,8 @@ public class LoadSound : ScriptableObject public UmaSoundInfo getSoundPath(string name) { UmaSoundInfo info; - info.acbPath = UmaViewerBuilder.GetABPath(Main.AbList.FirstOrDefault(a => 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); }