This commit is contained in:
左右看
2023-07-13 12:12:18 +08:00
11 changed files with 1058 additions and 196 deletions
+197
View File
@@ -0,0 +1,197 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEngine;
public class UmaAssetManager : MonoBehaviour
{
public static UmaAssetManager instance;
private Dictionary<string, AssetBundle> LoadedBundles = new Dictionary<string, AssetBundle>();
private Dictionary<string, AssetBundle> NeverUnload = new Dictionary<string, AssetBundle>();
public static event Action <UmaDatabaseEntry> OnLoadedBundleUpdate;
public static event Action OnLoadedBundleClear;
public static event Action<int, int> OnLoadProgressChange;
public static Coroutine LoadCoroutine;
private void Awake()
{
if (instance)
{
DestroyImmediate(gameObject);
return;
}
instance = this;
DontDestroyOnLoad(this);
}
public static void PreLoadAndRun(List<UmaDatabaseEntry> entries, Action OnDone)
{
if (LoadCoroutine != null) return;
LoadCoroutine = instance.StartCoroutine(instance.PreLoadAsset(entries, OnDone));
}
private IEnumerator PreLoadAsset(List<UmaDatabaseEntry> entries, Action OnDone)
{
var Main = UmaViewerMain.Instance;
List<UmaDatabaseEntry> result = new List<UmaDatabaseEntry>();
foreach (var entry in entries)
{
SearchAB(Main, entry, ref result);
}
for(int i = 0; i < result.Count; i++)
{
LoadAB(result[i]);
OnLoadProgressChange?.Invoke(i, result.Count);
yield return null;
}
OnLoadProgressChange?.Invoke(-1, result.Count);
LoadCoroutine = null;
OnDone?.Invoke();
}
public static AssetBundle LoadAssetBundle(UmaDatabaseEntry entry, bool neverUnload = false)
{
if (Exist(entry)) return Get(entry);
var Main = UmaViewerMain.Instance;
List<UmaDatabaseEntry> result = new List<UmaDatabaseEntry>();
SearchAB(Main, entry, ref result);
foreach(var e in result)
{
LoadAB(e, entry.Name.EndsWith("shader") || neverUnload);
}
return Get(entry.Name);
}
private static void LoadAB(UmaDatabaseEntry entry, bool neverUnload = false)
{
string filePath = entry.FilePath;
if (Exist(entry.Name))
{
return;
}
else if (File.Exists(filePath))
{
AssetBundle bundle = AssetBundle.LoadFromFile(filePath);
if (!bundle)
{
Debug.Log(filePath + " exists and doesn't work");
UmaViewerUI.Instance?.ShowMessage(filePath + " exists and doesn't work", UIMessageType.Error);
return;
}
AddOrUpdate(entry.Name, bundle, neverUnload);
if (!neverUnload)
{
OnLoadedBundleUpdate?.Invoke(entry);
}
}
else
{
Debug.LogError($"{entry.Name} - {filePath} does not exist");
UmaViewerUI.Instance?.ShowMessage($"{entry.Name} - {filePath} does not exist", UIMessageType.Error);
}
}
private static void SearchAB(UmaViewerMain Main, UmaDatabaseEntry entry,ref List<UmaDatabaseEntry> result)
{
if (!string.IsNullOrEmpty(entry.Prerequisites))
{
foreach (string prerequisite in entry.Prerequisites.Split(';'))
{
if (prerequisite.StartsWith(UmaDatabaseController.CharaPath))
{
SearchAB(Main , Main.AbChara.FirstOrDefault(ab => ab.Name == prerequisite),ref result);
}
else if (prerequisite.StartsWith(UmaDatabaseController.MotionPath))
{
SearchAB(Main, Main.AbMotions.FirstOrDefault(ab => ab.Name == prerequisite), ref result);
}
else
SearchAB(Main, Main.AbList.FirstOrDefault(ab => ab.Name == prerequisite), ref result);
}
}
result.Add(entry);
}
public static AssetBundle Get(string name) => instance.LoadedBundles[name];
public static AssetBundle Get(UmaDatabaseEntry entry) => Get(entry.Name);
public static void AddOrUpdate(string name, AssetBundle bundle, bool neverUnload = false)
{
if (instance.LoadedBundles.ContainsKey(name))
{
instance.LoadedBundles[name] = bundle;
}
else
{
instance.LoadedBundles.Add(name, bundle);
}
if (neverUnload)
{
if (instance.NeverUnload.ContainsKey(name))
{
instance.NeverUnload[name] = bundle;
}
else
{
instance.NeverUnload.Add(name, bundle);
}
}
}
public static bool Exist(string name) => instance.LoadedBundles.ContainsKey(name) && instance.LoadedBundles[name] != null;
public static bool Exist(UmaDatabaseEntry entry) => Exist(entry.Name);
public static bool Exist(AssetBundle bundle) => instance.LoadedBundles.ContainsValue(bundle);
private static void UnloadBundle(AssetBundle bundle, bool unloadAllObjects)
{
if(instance.NeverUnload.ContainsValue(bundle)) return;
var entry = instance.LoadedBundles.FirstOrDefault(b => b.Value == bundle);
if (entry.Key != null)
{
instance.LoadedBundles.Remove(entry.Key);
}
bundle.Unload(unloadAllObjects);
}
public static void UnloadAllBundle(bool unloadAllObjects = false)
{
foreach (var bundle in instance.LoadedBundles)
{
if (!instance.NeverUnload.ContainsKey(bundle.Key) && bundle.Value)
{
bundle.Value.Unload(unloadAllObjects);
}
}
if (unloadAllObjects)
{
var builder = UmaViewerBuilder.Instance;
if (builder)
{
if (builder.CurrentUMAContainer) Destroy(builder.CurrentUMAContainer);
if (builder.CurrentOtherContainer) Destroy(builder.CurrentOtherContainer);
}
}
instance.LoadedBundles.Clear();
foreach(var bundle in instance.NeverUnload)
{
instance.LoadedBundles.Add(bundle.Key, bundle.Value);
}
OnLoadedBundleClear?.Invoke();
}
}
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 48ddc49d7aabf3947bdbcaa84cf080a6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+27 -1
View File
@@ -1,25 +1,37 @@
using System;
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class UmaSceneController:MonoBehaviour
{
public static UmaSceneController instance;
public GameObject CavansPrefab;
public GameObject CavansInstance;
public GameObject LoadingProgressPanel;
public Slider LoadingProgressSlider;
public TextMeshProUGUI LoadingProgressText;
private void Awake()
{
if (instance)
{
Destroy(gameObject);
DestroyImmediate(gameObject);
return;
}
instance = this;
DontDestroyOnLoad(this);
}
private void Start()
{
UmaAssetManager.OnLoadProgressChange += LoadingProgressChange;
}
public static void LoadScene(string name, Action OnSceneloaded = null, Action OnLastSceneUnloaded = null)
{
instance.StartCoroutine(instance.LoadLiveSceneAsync(name, OnSceneloaded, OnLastSceneUnloaded));
@@ -58,5 +70,19 @@ public class UmaSceneController:MonoBehaviour
yield return new WaitUntil(() => !animation.isPlaying);
Destroy(CavansInstance);
}
public void LoadingProgressChange(int curren, int target)
{
if(curren == -1)
{
LoadingProgressPanel.SetActive(false);
}
else
{
LoadingProgressPanel.SetActive(true);
LoadingProgressText.text = $"Loading...({curren}/{target})";
LoadingProgressSlider.value = (float)curren / target;
}
}
}
+65 -157
View File
@@ -44,6 +44,8 @@ public class UmaViewerBuilder : MonoBehaviour
public Animator AnimationCameraAnimator;
public Camera AnimationCamera;
private bool ShadersLoaded = false;
private void Awake()
{
Instance = this;
@@ -52,11 +54,10 @@ public class UmaViewerBuilder : MonoBehaviour
public IEnumerator LoadUma(CharaEntry chara, string costumeId, bool mini)
{
UnloadUma();
UmaAssetManager.UnloadAllBundle(true);
int id = chara.Id;
CurrentUMAContainer = new GameObject($"Chara_{id}_{costumeId}").AddComponent<UmaContainer>();
CurrentUMAContainer.CharaEntry = chara;
UnloadAllBundle();
if (mini)
{
@@ -84,7 +85,7 @@ public class UmaViewerBuilder : MonoBehaviour
public void LoadLiveUma(List<LiveCharacterSelect> characters)
{
UnloadAllBundle();
UmaAssetManager.UnloadAllBundle();
for (int i = 0; i < characters.Count; i++)
{
if (characters[i].CharaEntry.Name != "")
@@ -662,7 +663,7 @@ public class UmaViewerBuilder : MonoBehaviour
public void LoadProp(UmaDatabaseEntry entry)
{
UnloadProp();
UnloadAllBundle();
UmaAssetManager.UnloadAllBundle();
CurrentOtherContainer = new GameObject(Path.GetFileName(entry.Name)).AddComponent<UmaContainer>();
RecursiveLoadAsset(entry);
@@ -715,7 +716,7 @@ public class UmaViewerBuilder : MonoBehaviour
);
}
//Use CriWare Library
/*
@@ -871,7 +872,6 @@ public class UmaViewerBuilder : MonoBehaviour
public List<AudioClip> LoadAudio(UmaDatabaseEntry awb)
{
List<AudioClip> clips = new List<AudioClip>();
UmaViewerUI.Instance.LoadedAssetsAdd(awb);
string awbPath = awb.FilePath;
if (!File.Exists(awbPath)) return clips;
@@ -908,62 +908,30 @@ public class UmaViewerBuilder : MonoBehaviour
string lyricsVar = $"live/musicscores/m{songid}/m{songid}_lyrics";
UmaDatabaseEntry lyricsAsset = Main.AbList.FirstOrDefault(a => a.Name.Contains(lyricsVar));
if (lyricsAsset != null)
AssetBundle bundle = UmaAssetManager.LoadAssetBundle(lyricsAsset);
TextAsset asset = bundle.LoadAsset<TextAsset>(Path.GetFileNameWithoutExtension(lyricsVar));
string[] lines = asset.text.Split("\n"[0]);
for (int i = 1; i < lines.Length; i++)
{
string filePath = lyricsAsset.FilePath;
if (File.Exists(filePath))
string[] words = lines[i].Split(',');
if (words.Length > 0)
{
AssetBundle bundle;
if (Main.LoadedBundles.ContainsKey(lyricsAsset.Name))
try
{
bundle = Main.LoadedBundles[lyricsAsset.Name];
}
else
{
UI.LoadedAssetsAdd(lyricsAsset);
bundle = AssetBundle.LoadFromFile(filePath);
Main.LoadedBundles.Add(lyricsAsset.Name, bundle);
}
TextAsset asset = bundle.LoadAsset<TextAsset>(Path.GetFileNameWithoutExtension(lyricsVar));
string[] lines = asset.text.Split("\n"[0]);
for (int i = 1; i < lines.Length; i++)
{
string[] words = lines[i].Split(',');
if (words.Length > 0)
UmaLyricsData lyricsData = new UmaLyricsData()
{
try
{
UmaLyricsData lyricsData = new UmaLyricsData()
{
time = float.Parse(words[0]) / 1000,
text = (words.Length > 1) ? words[1].Replace("[COMMA]", ",") : ""
};
CurrentLyrics.Add(lyricsData);
}
catch { }
}
time = float.Parse(words[0]) / 1000,
text = (words.Length > 1) ? words[1].Replace("[COMMA]", ",") : ""
};
CurrentLyrics.Add(lyricsData);
}
catch { }
}
}
}
public static AssetBundle LoadOrGet(UmaDatabaseEntry entry)
{
if ((Main.LoadedBundles.ContainsKey(entry.Name)))
{
return Main.LoadedBundles[entry.Name];
}
else
{
var bundle = AssetBundle.LoadFromFile(entry.FilePath);
Main.LoadedBundles.Add(entry.Name, bundle);
return bundle;
}
}
public void RecursiveLoadAsset(UmaDatabaseEntry entry, bool IsSubAsset = false, Transform SetParent = null )
public void RecursiveLoadAsset(UmaDatabaseEntry entry, bool IsSubAsset = false, Transform SetParent = null)
{
if (!string.IsNullOrEmpty(entry.Prerequisites))
{
@@ -987,34 +955,15 @@ public class UmaViewerBuilder : MonoBehaviour
public void LoadAsset(UmaDatabaseEntry entry, bool IsSubAsset = false, Transform SetParent = null)
{
Debug.Log("Loading " + entry.Name);
string filePath = entry.FilePath;
if (Main.LoadedBundles.ContainsKey(entry.Name))
{
LoadBundle(Main.LoadedBundles[entry.Name], IsSubAsset, SetParent);
}
else if (File.Exists(filePath))
{
AssetBundle bundle = AssetBundle.LoadFromFile(filePath);
if (bundle == null)
{
Debug.Log(filePath + " exists and doesn't work");
return;
}
Main.LoadedBundles.Add(entry.Name, bundle);
UI.LoadedAssetsAdd(entry);
LoadBundle(bundle, IsSubAsset, SetParent);
}
else
{
Debug.LogError($"{entry.Name} - {filePath} does not exist");
}
var bundle = UmaAssetManager.LoadAssetBundle(entry);
LoadBundle(bundle, IsSubAsset, SetParent);
}
private void LoadBundle(AssetBundle bundle, bool IsSubAsset = false, Transform SetParent = null)
{
if (bundle.name == "shader.a")
{
if (Main.ShadersLoaded)
if (ShadersLoaded)
{
return;
}
@@ -1028,7 +977,7 @@ public class UmaViewerBuilder : MonoBehaviour
alphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonhairtser.shader");
bodyAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoontser.shader");
bodyBehindAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonbehindtser.shader");
Main.ShadersLoaded = true;
ShadersLoaded = true;
}
}
@@ -1051,14 +1000,14 @@ public class UmaViewerBuilder : MonoBehaviour
{
Debug.Log("LiveTime" + UI.LiveTime.ToString());
LoadAnimation(aClip);
break;
}
if (aClip.name.Contains("tear"))
{
break;
}
UnloadBundle(bundle, false);
UmaAssetManager.UnloadAllBundle();
break;
}
case GameObject go:
@@ -1496,7 +1445,7 @@ public class UmaViewerBuilder : MonoBehaviour
public void LoadAssetPath(string path, Transform SetParent)
{
foreach(var asset in UmaViewerMain.Instance.AbList.Where(a => a.Name == path))
foreach (var asset in UmaViewerMain.Instance.AbList.Where(a => a.Name == path))
{
RecursiveLoadAsset(asset, false, SetParent);
}
@@ -1522,7 +1471,7 @@ public class UmaViewerBuilder : MonoBehaviour
{
if (!CurrentUMAContainer.Head) return;
var locatorEntry = Main.AbList.FirstOrDefault(a => a.Name == "3d/animator/drivenkeylocator");
var bundle = LoadOrGet(locatorEntry);
var bundle = UmaAssetManager.LoadAssetBundle(locatorEntry);
var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), CurrentUMAContainer.transform) as GameObject;
locator.name = "DrivenKeyLocator";
@@ -1534,7 +1483,7 @@ public class UmaViewerBuilder : MonoBehaviour
var mangaObjects = new List<GameObject>();
mangaEntry.ForEach(entry =>
{
AssetBundle ab = LoadOrGet(entry);
AssetBundle ab = UmaAssetManager.LoadAssetBundle(entry);
var obj = ab.LoadAsset(Path.GetFileNameWithoutExtension(entry.Name)) as GameObject;
obj.SetActive(false);
@@ -1656,11 +1605,11 @@ public class UmaViewerBuilder : MonoBehaviour
if (CurrentUMAContainer.OverrideController["clip_2"].name.Contains("_loop"))
{
motion_e = Main.AbMotions.FirstOrDefault(a =>
motion_e = Main.AbMotions.FirstOrDefault(a =>
a.Name.EndsWith(CurrentUMAContainer.OverrideController["clip_2"].name.Replace("_loop", "_e"))
&& !a.Name.Contains("hom_")); //home end animation not for interpolation
if (motion_e != null)
if (motion_e != null)
{
RecursiveLoadAsset(motion_e);
}
@@ -1779,8 +1728,8 @@ public class UmaViewerBuilder : MonoBehaviour
if (CurrentUMAContainer.FaceOverrideController["clip_2"].name.Contains("_loop"))
{
motion_e = Main.AbMotions.FirstOrDefault(a =>
a.Name.EndsWith(CurrentUMAContainer.FaceOverrideController["clip_2"].name.Replace("_loop", "_e"))
motion_e = Main.AbMotions.FirstOrDefault(a =>
a.Name.EndsWith(CurrentUMAContainer.FaceOverrideController["clip_2"].name.Replace("_loop", "_e"))
&& !a.Name.Contains("hom_"));
if (motion_e != null)
@@ -1824,8 +1773,8 @@ public class UmaViewerBuilder : MonoBehaviour
if (CurrentUMAContainer.FaceOverrideController["clip_2_ear"].name.Contains("_loop"))
{
motion_e = Main.AbMotions.FirstOrDefault(a =>
a.Name.EndsWith(CurrentUMAContainer.FaceOverrideController["clip_2_ear"].name.Replace("_loop", "_e"))
motion_e = Main.AbMotions.FirstOrDefault(a =>
a.Name.EndsWith(CurrentUMAContainer.FaceOverrideController["clip_2_ear"].name.Replace("_loop", "_e"))
&& !a.Name.Contains("hom_"));
if (motion_e != null)
@@ -1871,50 +1820,19 @@ public class UmaViewerBuilder : MonoBehaviour
}
}
private void UnloadBundle(AssetBundle bundle, bool unloadAllObjects)
{
var entry = Main.LoadedBundles.FirstOrDefault(b => b.Value == bundle);
if (entry.Key != null)
{
Main.LoadedBundles.Remove(entry.Key);
}
bundle.Unload(unloadAllObjects);
}
public void UnloadAllBundle(bool unloadAllObjects = false)
{
foreach (var bundle in Main.LoadedBundles)
{
if (bundle.Value)
bundle.Value.Unload(unloadAllObjects);
}
if (unloadAllObjects)
{
if (CurrentUMAContainer) Destroy(CurrentUMAContainer);
if (CurrentOtherContainer) Destroy(CurrentOtherContainer);
}
Main.LoadedBundles.Clear();
UI.LoadedAssetsClear();
}
public Sprite LoadCharaIcon(string id)
{
string value = $"chara/chr{id}/chr_icon_{id}";
var entry = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name.Equals(value));
if (entry != null)
if (entry != null)
{
string path = entry.FilePath;
if (File.Exists(path))
AssetBundle assetBundle = UmaAssetManager.LoadAssetBundle(entry, true);
if (assetBundle.Contains($"chr_icon_{id}"))
{
AssetBundle assetBundle = AssetBundle.LoadFromFile(path);
if (assetBundle.Contains($"chr_icon_{id}"))
{
Texture2D texture = (Texture2D)assetBundle.LoadAsset($"chr_icon_{id}");
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
assetBundle.Unload(false);
return sprite;
}
Texture2D texture = (Texture2D)assetBundle.LoadAsset($"chr_icon_{id}");
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
assetBundle.Unload(false);
return sprite;
}
}
return null;
@@ -1926,27 +1844,10 @@ public class UmaViewerBuilder : MonoBehaviour
var entry = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name.Equals(value));
if (entry == null) { return null; }
string path = entry.FilePath;
if (File.Exists(path))
AssetBundle assetBundle = UmaAssetManager.LoadAssetBundle(entry, true);
if (assetBundle.Contains($"mob_chr_icon_{id}_000001_01"))
{
AssetBundle assetBundle = AssetBundle.LoadFromFile(path);
if (assetBundle.Contains($"mob_chr_icon_{id}_000001_01"))
{
Texture2D texture = (Texture2D)assetBundle.LoadAsset($"mob_chr_icon_{id}_000001_01");
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
assetBundle.Unload(false);
return sprite;
}
}
return null;
}
public Sprite LoadSprite(UmaDatabaseEntry item)
{
string path = item.FilePath;
if (File.Exists(path))
{
AssetBundle assetBundle = AssetBundle.LoadFromFile(path);
Texture2D texture = (Texture2D)assetBundle.LoadAsset(assetBundle.GetAllAssetNames()[0]);
Texture2D texture = (Texture2D)assetBundle.LoadAsset($"mob_chr_icon_{id}_000001_01");
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
assetBundle.Unload(false);
return sprite;
@@ -1954,22 +1855,27 @@ public class UmaViewerBuilder : MonoBehaviour
return null;
}
public Sprite LoadSprite(UmaDatabaseEntry item)
{
AssetBundle assetBundle = UmaAssetManager.LoadAssetBundle(item, true);
Texture2D texture = (Texture2D)assetBundle.LoadAsset(assetBundle.GetAllAssetNames()[0]);
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
assetBundle.Unload(false);
return sprite;
}
public Sprite LoadLiveIcon(int musicid)
{
string value = $"live/jacket/jacket_icon_l_{musicid}";
var entry = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name.Equals(value));
if (entry == null) return null;
string path = entry.FilePath;
if (File.Exists(path))
AssetBundle assetBundle = UmaAssetManager.LoadAssetBundle(entry, true);
if (assetBundle.Contains($"jacket_icon_l_{musicid}"))
{
AssetBundle assetBundle = AssetBundle.LoadFromFile(path);
if (assetBundle.Contains($"jacket_icon_l_{musicid}"))
{
Texture2D texture = (Texture2D)assetBundle.LoadAsset($"jacket_icon_l_{musicid}");
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
assetBundle.Unload(false);
return sprite;
}
Texture2D texture = (Texture2D)assetBundle.LoadAsset($"jacket_icon_l_{musicid}");
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
assetBundle.Unload(false);
return sprite;
}
return null;
}
@@ -1990,12 +1896,12 @@ public class UmaViewerBuilder : MonoBehaviour
UmaViewerUI.Instance.currentFaceDrivenKeyTarget = null;
UmaViewerUI.Instance.LoadEmotionPanels(null);
UmaViewerUI.Instance.LoadFacialPanels(null);
foreach(Transform t in UmaViewerUI.Instance.MaterialsList.content)
foreach (Transform t in UmaViewerUI.Instance.MaterialsList.content)
{
Destroy(t.gameObject);
}
if(CurrentUMAContainer.transform.parent && CurrentUMAContainer.transform.parent.name.Contains("Root"))
if (CurrentUMAContainer.transform.parent && CurrentUMAContainer.transform.parent.name.Contains("Root"))
{
Destroy(CurrentUMAContainer.transform.parent.gameObject);
}
@@ -2111,6 +2017,8 @@ public class UmaViewerBuilder : MonoBehaviour
}
}
public void UnloadAllBundle() => UmaAssetManager.UnloadAllBundle(true);
private void FixedUpdate()
{
if (AnimationCamera && AnimationCamera.enabled == true)
+1 -5
View File
@@ -23,10 +23,6 @@ public class UmaViewerMain : MonoBehaviour
public List<UmaDatabaseEntry> AbEffect = new List<UmaDatabaseEntry>();
public List<UmaDatabaseEntry> CostumeList = new List<UmaDatabaseEntry>();
[Header("Asset Memory")]
public bool ShadersLoaded = false;
public Dictionary<string, AssetBundle> LoadedBundles = new Dictionary<string, AssetBundle>();
private void Awake()
{
Instance = this;
@@ -149,7 +145,7 @@ public class UmaViewerMain : MonoBehaviour
string filePath = asset.FilePath;
if (File.Exists(filePath))
{
AssetBundle bundle = UmaViewerBuilder.LoadOrGet(asset);
AssetBundle bundle = UmaAssetManager.LoadAssetBundle(asset, true);
foreach (var item in UmaDatabaseController.Instance.LiveData)
{
var musicId = Convert.ToInt32(item["music_id"]);
+14 -4
View File
@@ -157,6 +157,14 @@ public class UmaViewerUI : MonoBehaviour
WorkModeDropdown.SetValueWithoutNotify((int)Config.Instance.WorkMode);
LanguageDropdown.SetValueWithoutNotify((int)Config.Instance.Language);
UpdateDBButton.interactable = (Config.Instance.WorkMode == WorkMode.Standalone);
UmaAssetManager.OnLoadedBundleUpdate += LoadedAssetsAdd;
UmaAssetManager.OnLoadedBundleClear += LoadedAssetsClear;
}
private void OnDestroy()
{
UmaAssetManager.OnLoadedBundleUpdate -= LoadedAssetsAdd;
UmaAssetManager.OnLoadedBundleClear -= LoadedAssetsClear;
}
private void Update()
@@ -267,7 +275,7 @@ public class UmaViewerUI : MonoBehaviour
{
if (ui.Name == Path.GetFileName(entry.Name)) return;
}
LoadedAssetCount++;
string filePath = entry.FilePath;
var container = Instantiate(UmaContainerAssetsPrefab, LoadedAssetsPanel).GetComponent<UmaUIContainer>();
@@ -278,6 +286,7 @@ public class UmaViewerUI : MonoBehaviour
public void LoadedAssetsClear()
{
if (!LoadedAssetsPanel) return;
LoadedAssetCount = 0;
foreach (UmaUIContainer ui in LoadedAssetsPanel.GetComponentsInChildren<UmaUIContainer>())
{
@@ -429,7 +438,6 @@ public class UmaViewerUI : MonoBehaviour
foreach (var prop in extraMorph.BindProperties)
{
var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent<UmaUIContainer>();
Debug.Log(morph.name);
container.Name = $"{morph.locator.name}({prop.Type})";
container.Slider.value = prop.Value;
switch (prop.Type)
@@ -585,7 +593,6 @@ public class UmaViewerUI : MonoBehaviour
}
}
public void LoadNormalSoundPanels()
{
NormalSoundCtrl.Clear();
@@ -737,7 +744,10 @@ public class UmaViewerUI : MonoBehaviour
else
{
HighlightChildImage(costumeList.content, container);
StartCoroutine(Builder.LoadUma(achara, costumeId, mini));
var list = new List<UmaDatabaseEntry>();
list.AddRange(Main.AbChara.FindAll(a => a.Name.Contains($"{achara.Id}")));
UmaAssetManager.PreLoadAndRun(list , delegate { StartCoroutine(Builder.LoadUma(achara, costumeId, mini)); });
//StartCoroutine(Builder.LoadUma(achara, costumeId, mini));
}
});
}
@@ -102,7 +102,7 @@ namespace Gallop.Live.Cutt
//Get MotionList
foreach (var motion in UmaViewerMain.Instance.AbMotions.Where(a => a.Name.StartsWith($"3d/motion/live/body/son{Director.instance.live.MusicId}") && Path.GetFileName(a.Name).Split('_').Length == 4))
{
AssetBundle motionAB = UmaViewerBuilder.LoadOrGet(motion);
AssetBundle motionAB = UmaAssetManager.LoadAssetBundle(motion);
AnimationClip motionAnim = motionAB.LoadAsset<AnimationClip>(Path.GetFileName(motion.Name).Split('.')[0]);
Anims.Add(motionAnim);
}
@@ -375,7 +375,7 @@ namespace Gallop.Live
Debug.Log(partAsset.Name);
AssetBundle bundle = UmaViewerBuilder.LoadOrGet(partAsset);
AssetBundle bundle = UmaAssetManager.LoadAssetBundle(partAsset);
TextAsset partData = bundle.LoadAsset<TextAsset>($"m{live.MusicId}_part");
partInfo = new PartEntry(partData.text);
@@ -534,7 +534,7 @@ namespace Gallop.Live
transferObjs.ForEach(o => SceneManager.MoveGameObjectToScene(o, SceneManager.GetSceneByName("Version2")));
});
AssetBundle.UnloadAllAssetBundles(true);
UmaAssetManager.UnloadAllBundle(true);
}
if (_isLiveSetup)