bug fix
This commit is contained in:
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using Gallop;
|
||||
using System.IO;
|
||||
using static UmaViewerUI;
|
||||
|
||||
public class UmaDatabaseEntry
|
||||
{
|
||||
@@ -28,9 +29,9 @@ public class UmaDatabaseEntry
|
||||
public static void DownloadAsset(UmaDatabaseEntry entry)
|
||||
{
|
||||
var path = $"{Config.Instance.MainPath}\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}";
|
||||
UmaViewerDownload.DownloadAssetSync(entry, path , delegate(string msg)
|
||||
UmaViewerDownload.DownloadAssetSync(entry, path , delegate(string msg, UIMessageType type)
|
||||
{
|
||||
UmaViewerUI.Instance.ShowMessage(msg);
|
||||
Instance.ShowMessage(msg, type);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -132,6 +133,13 @@ public class CostumeEntry
|
||||
public Sprite Icon;
|
||||
}
|
||||
|
||||
public enum UIMessageType
|
||||
{
|
||||
Default,
|
||||
Warning,
|
||||
Error,
|
||||
Success
|
||||
}
|
||||
public enum UmaFileType
|
||||
{
|
||||
_3d_cutt,
|
||||
|
||||
@@ -92,7 +92,7 @@ public class UmaDatabaseController
|
||||
{
|
||||
msg += "\nPlease install the dmm game client";
|
||||
}
|
||||
UmaViewerUI.Instance.ShowMessage(msg);
|
||||
UmaViewerUI.Instance.ShowMessage(msg, UIMessageType.Error);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -131,7 +131,6 @@ public class UmaDatabaseController
|
||||
return ReadMaster(conn, "SELECT * FROM mob_data");
|
||||
}
|
||||
|
||||
|
||||
static IEnumerable<DataRow> ReadMaster(SqliteConnection conn,string sql)
|
||||
{
|
||||
SqliteCommand sqlite_cmd = conn.CreateCommand();
|
||||
@@ -144,6 +143,7 @@ public class UmaDatabaseController
|
||||
{
|
||||
yield return (DataRow)temp.Current;
|
||||
}
|
||||
sqlite_cmd.Dispose();
|
||||
}
|
||||
|
||||
static IEnumerable<FaceTypeData> ReadFaceTypeData(SqliteConnection conn)
|
||||
@@ -191,7 +191,6 @@ public class UmaDatabaseController
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static DataRow ReadMobDressColor(string mobid)
|
||||
{
|
||||
var results= ReadMaster(instance.masterDb, $"SELECT * FROM mob_dress_color_set WHERE id LIKE {mobid}");
|
||||
@@ -216,6 +215,11 @@ public class UmaDatabaseController
|
||||
{
|
||||
masterDb.Close();
|
||||
metaDb.Close();
|
||||
masterDb.Dispose();
|
||||
metaDb.Dispose();
|
||||
SqliteConnection.ClearAllPools();
|
||||
GC.Collect();
|
||||
GC.WaitForPendingFinalizers();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user