From e19124cd2cd77ca0d7ce3a019d1acff3cfa1d224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9C=8B?= <1918891542@qq.com> Date: Sun, 2 Jul 2023 00:47:02 +0800 Subject: [PATCH] improve assetbundles loading --- ... Jobs (Unity 2018.2.4f1).unitypackage.meta | 7 --- .../IK Jobs (Unity 2019.3).unitypackage.meta | 7 --- ...culus Integration v1.37).unitypackage.meta | 7 --- ...4.28f1, PlayMaker 1.9.0).unitypackage.meta | 7 --- ..., SteamVR Plugin v2.2.0).unitypackage.meta | 7 --- ... 2017.4.28f1, UMA 2.8.1).unitypackage.meta | 7 --- .../PuppetMaster/Scripts/PuppetMasterSetup.cs | 2 +- Assets/Scripts/UmaContainer.cs | 4 ++ Assets/Scripts/UmaViewerBuilder.cs | 57 ++++++++++++++++--- Assets/Scripts/UmaViewerUI.cs | 1 + .../Gallop/Live/Cutt/LiveTimelineControl.cs | 4 ++ .../Scripts/umamusume/Gallop/Live/Director.cs | 31 ++++++++-- .../umamusume/Gallop/Live/StageController.cs | 42 +++++++++++++- ProjectSettings/ProjectVersion.txt | 4 +- 14 files changed, 127 insertions(+), 60 deletions(-) delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta deleted file mode 100644 index fd115b1..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b3e58808cb15120468eafdef64280407 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta deleted file mode 100644 index 00a91fc..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 59d63bcae2fecff42be7b4fc8b1df10f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta deleted file mode 100644 index d9fcdc9..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7d1083877b3838042b9e91b249731b89 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta deleted file mode 100644 index 7ce27d6..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0512c18ad5403428db876010796c1cda -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta deleted file mode 100644 index 839abdf..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 57ddc43ace113674392034825a54600a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta deleted file mode 100644 index 21cc026..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d00cc5f8e672c264d856aa10ed20df7e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/PuppetMaster/Scripts/PuppetMasterSetup.cs b/Assets/Plugins/RootMotion/PuppetMaster/Scripts/PuppetMasterSetup.cs index 7d966f3..d152b08 100644 --- a/Assets/Plugins/RootMotion/PuppetMaster/Scripts/PuppetMasterSetup.cs +++ b/Assets/Plugins/RootMotion/PuppetMaster/Scripts/PuppetMasterSetup.cs @@ -24,7 +24,7 @@ namespace RootMotion.Dynamics { /// Sets up a Puppet using a single ragdoll character. This will duplicate the ragdoll character, remove the ragdoll components from the original and use it as the animated target. /// public static PuppetMaster SetUp(Transform target, int characterControllerLayer, int ragdollLayer) { - Transform ragdoll = ((GameObject)GameObject.Instantiate(target.gameObject, target.position, target.rotation)).transform; + Transform ragdoll = ((GameObject)GameObject.Instantiate(target.gameObject, target.position, target.rotation, target.transform.parent)).transform; PuppetMaster puppetMaster = ragdoll.gameObject.AddComponent(); puppetMaster.SetUpTo(target, characterControllerLayer, ragdollLayer); diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs index cd8fb3e..4e441ce 100644 --- a/Assets/Scripts/UmaContainer.cs +++ b/Assets/Scripts/UmaContainer.cs @@ -76,10 +76,14 @@ public class UmaContainer : MonoBehaviour public GameObject PhysicsContainer; public float BodyScale = 1; + [Header("Live")] + public bool IsLive = false; + [Header("Other")] public CharaShaderEffectData ShaderEffectData; private List Materials = new List(); + public void Initialize(bool smile) { TrackTarget = new GameObject("TrackTarget").transform; diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 014cb4e..4883ed7 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -11,6 +11,7 @@ using System.IO; using System.Linq; using UmaMusumeAudio; using UnityEngine; +using static UnityEngine.Rendering.VirtualTexturing.Debugging; using Random = UnityEngine.Random; public class UmaViewerBuilder : MonoBehaviour @@ -84,6 +85,22 @@ public class UmaViewerBuilder : MonoBehaviour yield break; } + public IEnumerator LoadLiveUma(List characters) + { + UnloadAllBundle(); + for (int i = 0; i < characters.Count; i++) + { + CurrentUMAContainer = new GameObject($"Chara_{characters[i].CharaEntry.Id}_{characters[i].CostumeId}").AddComponent(); + CurrentUMAContainer.IsLive = true; + CurrentUMAContainer.CharaData = UmaDatabaseController.ReadCharaData(characters[i].CharaEntry); + CurrentUMAContainer.transform.parent = Gallop.Live.Director.instance.charaObjs[i]; + LoadNormalUma(characters[i].CharaEntry, characters[i].CostumeId); + } + + + yield break; + } + private void LoadNormalUma(CharaEntry chara, string costumeId) { int id = chara.Id; @@ -653,6 +670,8 @@ public class UmaViewerBuilder : MonoBehaviour a.CostumeId = "00"; } });//fill empty + + GameObject MainLive = new GameObject("Live"); GameObject Director = new GameObject("Director"); @@ -661,6 +680,8 @@ public class UmaViewerBuilder : MonoBehaviour Instantiate(mController, MainLive.transform); Destroy(Director); + + StartCoroutine(LoadLiveUma(characters)); } //Use CriWare Library @@ -848,6 +869,20 @@ public class UmaViewerBuilder : MonoBehaviour } } + public 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 ) { if (!string.IsNullOrEmpty(entry.Prerequisites)) @@ -872,10 +907,12 @@ public class UmaViewerBuilder : MonoBehaviour public void LoadAsset(UmaDatabaseEntry entry, bool IsSubAsset = false, Transform SetParent = null) { Debug.Log("Loading " + entry.Name); - if (Main.LoadedBundles.ContainsKey(entry.Name)) return; - string filePath = entry.FilePath; - if (File.Exists(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) @@ -982,7 +1019,10 @@ public class UmaViewerBuilder : MonoBehaviour break; } case Shader sha: - ShaderList.Add(sha); + if (!ShaderList.Contains(sha)) + { + ShaderList.Add(sha); + } break; case Texture2D tex2D: @@ -1355,6 +1395,8 @@ public class UmaViewerBuilder : MonoBehaviour { var container = CurrentOtherContainer; var prop = Instantiate(go, SetParent ? SetParent : container.transform); + + /* foreach (Renderer r in prop.GetComponentsInChildren()) { foreach (Material m in r.sharedMaterials) @@ -1363,6 +1405,7 @@ public class UmaViewerBuilder : MonoBehaviour m.shader = Shader.Find("Unlit/Transparent Cutout"); } } + */ } public void LoadAssetPath(string path, Transform SetParent) @@ -1393,8 +1436,7 @@ public class UmaViewerBuilder : MonoBehaviour { if (!CurrentUMAContainer.Head) return; var locatorEntry = Main.AbList.FirstOrDefault(a => a.Name == "3d/animator/drivenkeylocator"); - var bundle = AssetBundle.LoadFromFile(locatorEntry.FilePath); - Main.LoadedBundles.Add(locatorEntry.Name, bundle); + var bundle = LoadOrGet(locatorEntry); var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), CurrentUMAContainer.transform) as GameObject; locator.name = "DrivenKeyLocator"; @@ -1406,8 +1448,7 @@ public class UmaViewerBuilder : MonoBehaviour var mangaObjects = new List(); mangaEntry.ForEach(entry => { - AssetBundle ab = AssetBundle.LoadFromFile(entry.FilePath); - Main.LoadedBundles.Add(entry.Name, ab); + AssetBundle ab = LoadOrGet(entry); var obj = ab.LoadAsset(Path.GetFileNameWithoutExtension(entry.Name)) as GameObject; obj.SetActive(false); diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 2bb7436..7351697 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -351,6 +351,7 @@ public class UmaViewerUI : MonoBehaviour foreach (var prop in extraMorph.BindProperties) { var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent(); + Debug.Log(morph.name); container.Name = $"{morph.locator.name}({prop.Type})"; container.Slider.value = prop.Value; switch (prop.Type) diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs index eb6525c..b75a17f 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs @@ -28,6 +28,10 @@ namespace Gallop.Live.Cutt private void Awake() { InitializeTimeLineData(); + if (Director.instance) + { + Director.instance._liveTimelineControl = this; + } } public void InitializeTimeLineData() diff --git a/Assets/Scripts/umamusume/Gallop/Live/Director.cs b/Assets/Scripts/umamusume/Gallop/Live/Director.cs index 8feef64..8d8d07b 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Director.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Director.cs @@ -6,6 +6,7 @@ using System.Runtime.CompilerServices; using UnityEngine; using Gallop.Live.Cutt; using static Director; +using UnityEditor.SceneManagement; namespace Gallop.Live { @@ -150,11 +151,11 @@ namespace Gallop.Live private const float LiveTotalTimeMargin = 0; private const float MaxOutlineOffLength = 99999; private const int FINALIZE_CAMERA_DEPTH = 19; - private static Director _instance; + private static Director _instance = null; [SerializeField] private Director.State _state; private bool _isDestroyed; - private LiveTimelineControl _liveTimelineControl; + public LiveTimelineControl _liveTimelineControl; //Edited to public private bool _isFinished; private readonly RandomTable _randomTable; private RandomRatioTable _blinkLightRandomRatioTable; @@ -167,7 +168,7 @@ namespace Gallop.Live private bool _isEnableBloom; private bool _isBloom; private bool _isDof; - private StageController _stageController; + public StageController _stageController; //Edited to public private bool _isEnabledStageController; public RenderTexture[] MonitorTextureArray; [SerializeField] @@ -255,7 +256,7 @@ namespace Gallop.Live private Vector3 _tempRateVector; private Vector3 _tempAttachRateVector; - public static Director Instance { get; } + public static Director instance => _instance; public static bool HasInstance { get; } public LiveTimelineControl LiveTimelineControl { get; } public Director.DisplayMode displayMode { get; set; } @@ -303,18 +304,38 @@ namespace Gallop.Live public static RegisterInfo[] EffectRegisterInfoArray { get; set; } public static Dictionary> FlashSeCueNameDict { get; set; } - //Testing + // public LiveEntry live; private const string CUTT_PATH = "cutt/cutt_son{0}/cutt_son{0}"; + private const string STAGE_PATH = "3d/env/live/live{0}/pfb_env_live{0}_controller000"; private UmaViewerBuilder Builder => UmaViewerBuilder.Instance; + public List charaObjs; + private void Awake() { if (live != null) { + _instance = this; Debug.Log(string.Format(CUTT_PATH, live.MusicId)); + Debug.Log(live.BackGroundId); Builder.LoadAssetPath(string.Format(CUTT_PATH, live.MusicId), this.gameObject.transform); + Builder.LoadAssetPath(string.Format(STAGE_PATH, live.BackGroundId), this.gameObject.transform); + + //Make CharacterObject + var characterStandPos = this._liveTimelineControl.transform.Find("CharacterStandPos"); + int counter = 0; + foreach (Transform trans in characterStandPos.GetComponentsInChildren()) { + if (trans == characterStandPos) + { + continue; + } + var newObj = Instantiate(trans, this.transform); + newObj.gameObject.name = string.Format("CharacterObject{0}", counter); + charaObjs.Add(newObj.transform); + counter++; + }; } } } diff --git a/Assets/Scripts/umamusume/Gallop/Live/StageController.cs b/Assets/Scripts/umamusume/Gallop/Live/StageController.cs index e306b5c..230e143 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/StageController.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/StageController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -7,12 +8,45 @@ namespace Gallop.Live { public class StageController : MonoBehaviour { - [System.Serializable] + [Serializable] + public class StageObjectUnit + { + public string UnitName; // 0x10 + public GameObject[] ChildObjects; // 0x18 + + public bool IsEnabled { get; set; } + public int UnitNameHash { get; set; } + public int[] ChildObjectNameHashArray { get; set; } + } + + [SerializeField] + public class StageObjectSelect + { + public enum Condition + { + Random = 0, + Direct = 1 + } + + [SerializeField] // RVA: 0xEBE0 Offset: 0xEBE0 VA: 0x7FF85CCBEBE0 + private string _prefabName; // 0x10 + [SerializeField] // RVA: 0xEBE0 Offset: 0xEBE0 VA: 0x7FF85CCBEBE0 + private StageController.StageObjectSelect.Condition _condition; // 0x18 + [SerializeField] // RVA: 0xEBE0 Offset: 0xEBE0 VA: 0x7FF85CCBEBE0 + private int _selectIndex; // 0x1C + [SerializeField] // RVA: 0xEBE0 Offset: 0xEBE0 VA: 0x7FF85CCBEBE0 + private GameObject[] _stageObjectArray; // 0x20 + private bool _isEnabled; // 0x28 + } + + [Serializable] public class MipmapBias { public float _stage; } public List _stageObjects; + public StageController.StageObjectUnit[] _stageObjectUnits; + public StageController.StageObjectSelect[] _stageObjectSelects; public List _audienceObjects; public Vector3 _cyalumeOffsetPosition; public List _washLightMaterials; @@ -36,13 +70,17 @@ namespace Gallop.Live private void Awake() { InitializeStage(); + if (Director.instance) + { + Director.instance._stageController = this; + } } public void InitializeStage() { foreach (GameObject stage_part in _stageObjects) { - Instantiate(stage_part, transform.parent); + Instantiate(stage_part, transform); } } } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 3598ae5..495468b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.28f1 -m_EditorVersionWithRevision: 2020.3.28f1 (f5400f52e03f) +m_EditorVersion: 2020.3.24f1 +m_EditorVersionWithRevision: 2020.3.24f1 (79c78de19888)