add standalone mode ,bug fix
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
using RootMotion.Dynamics;
|
||||
using System.Collections;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using Gallop;
|
||||
using System.IO;
|
||||
|
||||
public class UmaDatabaseEntry
|
||||
{
|
||||
@@ -11,7 +11,30 @@ public class UmaDatabaseEntry
|
||||
public string Url;
|
||||
public string Checksum;
|
||||
public string Prerequisites;
|
||||
public string FilePath => $"{Config.Instance.MainPath}\\dat\\{Url.Substring(0, 2)}\\{Url}";
|
||||
public string FilePath
|
||||
{
|
||||
get
|
||||
{
|
||||
var path = $"{Config.Instance.MainPath}\\dat\\{Url.Substring(0, 2)}\\{Url}";
|
||||
if (!File.Exists(path) && Config.Instance.WorkMode == WorkMode.Standalone)
|
||||
{
|
||||
UmaViewerMain.Instance.StartCoroutine(DownloadAsset(this));
|
||||
}
|
||||
return path;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static IEnumerator DownloadAsset(UmaDatabaseEntry entry)
|
||||
{
|
||||
var path = $"{Config.Instance.MainPath}\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}";
|
||||
yield return UmaViewerDownload.DownloadAsset(entry, path , delegate(string msg)
|
||||
{
|
||||
UmaViewerUI.Instance.MessagePannel.SetActive(true);
|
||||
UmaViewerUI.Instance.MessageText.text = msg;
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public class UmaCharaData
|
||||
|
||||
@@ -57,7 +57,15 @@ public class UmaDatabaseController
|
||||
{
|
||||
try
|
||||
{
|
||||
metaDb = new SqliteConnection($@"Data Source={Config.Instance.MainPath}\meta;");
|
||||
if(Config.Instance.WorkMode == WorkMode.Standalone)
|
||||
{
|
||||
metaDb = new SqliteConnection($@"Data Source={Config.Instance.MainPath}\meta_umaviewer;");
|
||||
}
|
||||
else
|
||||
{
|
||||
metaDb = new SqliteConnection($@"Data Source={Config.Instance.MainPath}\meta;");
|
||||
}
|
||||
|
||||
masterDb = new SqliteConnection($@"Data Source={Config.Instance.MainPath}\master\master.mdb;");
|
||||
|
||||
metaDb.Open();
|
||||
@@ -71,8 +79,17 @@ public class UmaDatabaseController
|
||||
}
|
||||
catch
|
||||
{
|
||||
UmaViewerUI.Instance.LyricsText.text = $"Database not found: \n{Config.Instance.MainPath}\\meta\n{Config.Instance.MainPath}\\master\\master.mdb";
|
||||
UmaViewerUI.Instance.LyricsText.color = Color.red;
|
||||
UmaViewerUI.Instance.MessagePannel.SetActive(true);
|
||||
UmaViewerUI.Instance.MessageText.text = $"Database not found at: {Config.Instance.MainPath}";
|
||||
if(Config.Instance.WorkMode == WorkMode.Standalone)
|
||||
{
|
||||
UmaViewerUI.Instance.MessageText.text += "\nPlease update the database in the settings panel";
|
||||
}
|
||||
else
|
||||
{
|
||||
UmaViewerUI.Instance.MessageText.text += "\nPlease install the dmm game client";
|
||||
}
|
||||
|
||||
masterDb.Close();
|
||||
metaDb.Close();
|
||||
}
|
||||
@@ -186,4 +203,5 @@ public class UmaDatabaseController
|
||||
masterDb.Close();
|
||||
metaDb.Close();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user