diff --git a/Assets/Scenes/LiveScene.unity b/Assets/Scenes/LiveScene.unity new file mode 100644 index 0000000..fe1ff71 --- /dev/null +++ b/Assets/Scenes/LiveScene.unity @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} diff --git a/Assets/Scenes/LiveScene.unity.meta b/Assets/Scenes/LiveScene.unity.meta new file mode 100644 index 0000000..7ea5199 --- /dev/null +++ b/Assets/Scenes/LiveScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fd2aa604854afa848a69857be81b7231 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 9f8d498..1a9f798 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -1958,6 +1958,85 @@ RectTransform: m_AnchoredPosition: {x: 200, y: 0} m_SizeDelta: {x: 120, y: 30} m_Pivot: {x: 0, y: 1} +--- !u!1 &85859538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 85859539} + - component: {fileID: 85859541} + - component: {fileID: 85859540} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &85859539 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 85859538} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 1618922985} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &85859540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 85859538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 27 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Loading... +--- !u!222 &85859541 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 85859538} + m_CullTransparentMesh: 1 --- !u!1 &87578738 GameObject: m_ObjectHideFlags: 0 @@ -41443,6 +41522,88 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1558324556} m_CullTransparentMesh: 1 +--- !u!1 &1562228770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1562228773} + - component: {fileID: 1562228772} + - component: {fileID: 1562228771} + m_Layer: 5 + m_Name: LoadingCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1562228771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1562228770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1562228772 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1562228770} + m_Enabled: 0 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 8918259399633999298} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 +--- !u!224 &1562228773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1562228770} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1618922985} + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1564959564 GameObject: m_ObjectHideFlags: 0 @@ -41614,6 +41775,7 @@ MonoBehaviour: DynamicBoneEnable: 1 EnableEyeTracking: 1 EnableFaceOverride: 1 + LiveTime: 0 currentFaceDrivenKeyTarget: {fileID: 0} --- !u!114 &1564959568 MonoBehaviour: @@ -42610,6 +42772,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1618706695} m_CullTransparentMesh: 1 +--- !u!1 &1618922984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1618922985} + - component: {fileID: 1618922987} + - component: {fileID: 1618922986} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1618922985 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1618922984} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 85859539} + m_Father: {fileID: 1562228773} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1618922986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1618922984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1618922987 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1618922984} + m_CullTransparentMesh: 1 --- !u!1 &1622519936 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CallAfterDelay.cs b/Assets/Scripts/CallAfterDelay.cs new file mode 100644 index 0000000..2f41d8b --- /dev/null +++ b/Assets/Scripts/CallAfterDelay.cs @@ -0,0 +1,32 @@ +using UnityEngine; +using System.Collections; + +public class CallAfterDelay : MonoBehaviour +{ + float delay; + System.Action action; + + // Will never call this frame, always the next frame at the earliest + public static CallAfterDelay Create(float delay, System.Action action) + { + CallAfterDelay cad = new GameObject("CallAfterDelay").AddComponent(); + cad.delay = delay; + cad.action = action; + return cad; + } + + float age; + + void Update() + { + if (age > delay) + { + action(); + Destroy(gameObject); + } + } + void LateUpdate() + { + age += Time.deltaTime; + } +} diff --git a/Assets/Scripts/CallAfterDelay.cs.meta b/Assets/Scripts/CallAfterDelay.cs.meta new file mode 100644 index 0000000..bc12514 --- /dev/null +++ b/Assets/Scripts/CallAfterDelay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d30491b056a700f48b6af3b340ae0caf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 9f852cf..2adf08b 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 UnityEngine.SceneManagement; using static UnityEngine.Rendering.VirtualTexturing.Debugging; using Random = UnityEngine.Random; @@ -671,8 +672,6 @@ public class UmaViewerBuilder : MonoBehaviour } });//fill empty - UI.SetEyeTrackingEnable(false); - GameObject MainLive = new GameObject("Live"); GameObject Director = new GameObject("Director"); @@ -686,7 +685,47 @@ public class UmaViewerBuilder : MonoBehaviour Gallop.Live.Director.instance.InitializeTimeline(); - Gallop.Live.Director.instance.Play(); + //Gallop.Live.Director.instance.Play(); + List transferObjs = new List(); + transferObjs.Add(MainLive); + transferObjs.Add(GameObject.Find("ViewerMain")); + transferObjs.Add(GameObject.Find("GlobalShaderController")); + transferObjs.Add(GameObject.Find("Camera")); + transferObjs.Add(GameObject.Find("Directional Light")); + transferObjs.Add(GameObject.Find("AnimationCameraRoot")); + StartCoroutine(LoadLiveSceneAsync("LiveScene", transferObjs, live.MusicId, characters[0].CharaEntry.Id)); + + } + + IEnumerator LoadLiveSceneAsync(string sceneName, List go, int songid, int charaid) + { + // Set the current Scene to be able to unload it later + Scene currentScene = SceneManager.GetActiveScene(); + + // The Application loads the Scene in the background at the same time as the current Scene. + AsyncOperation asyncLoad = SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Additive); + + // Wait until the last operation fully loads to return anything + while (!asyncLoad.isDone) + { + yield return null; + } + + // Move the GameObject (you attach this in the Inspector) to the newly loaded Scene + foreach(var obj in go) + { + SceneManager.MoveGameObjectToScene(obj, SceneManager.GetSceneByName(sceneName)); + } + + + // Unload the previous Scene + //Scene scene = SceneManager.GetSceneByName(sceneName); + + //SceneManager.SetActiveScene(scene); + + SceneManager.UnloadSceneAsync(currentScene); + + Gallop.Live.Director.instance.Play(songid, charaid); } //Use CriWare Library @@ -732,7 +771,7 @@ public class UmaViewerBuilder : MonoBehaviour } //Use decrypt function - public void LoadLiveSound(int songid, UmaDatabaseEntry SongAwb) + public void LoadLiveSound(int songid, UmaDatabaseEntry SongAwb, bool needLyrics = true) { //load character voice PlaySound(SongAwb); @@ -749,7 +788,10 @@ public class UmaViewerBuilder : MonoBehaviour } } - LoadLiveLyrics(songid); + if (needLyrics) + { + LoadLiveLyrics(songid); + } } public void PlaySound(UmaDatabaseEntry SongAwb, int subindex = -1) diff --git a/Assets/Scripts/UmaViewerGlobalShader.cs b/Assets/Scripts/UmaViewerGlobalShader.cs index 7af6195..d08dad9 100644 --- a/Assets/Scripts/UmaViewerGlobalShader.cs +++ b/Assets/Scripts/UmaViewerGlobalShader.cs @@ -127,6 +127,7 @@ public class UmaViewerGlobalShader : MonoBehaviour private void FixedUpdate() { //Used to calculate the correct outline + //Outline need more adjust in live if (UmaViewerBuilder.Instance.CurrentUMAContainer) { if (UmaViewerBuilder.Instance.CurrentUMAContainer.UpBodyBone) diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 63f0bca..8565c91 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -588,7 +588,11 @@ public class UmaViewerUI : MonoBehaviour if (selectlist != null) { LiveTime = true; - Builder.LoadLive(currentLive, new List(selectlist)); + SetEyeTrackingEnable(false); + GameObject.Find("LoadingCanvas").GetComponent().enabled = true; + CallAfterDelay.Create(0, () => { + Builder.LoadLive(currentLive, new List(selectlist)); + }); LiveSelectPannel.SetActive(false); } } diff --git a/Assets/Scripts/umamusume/Gallop/Live/Director.cs b/Assets/Scripts/umamusume/Gallop/Live/Director.cs index 94acefc..8099b14 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Director.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Director.cs @@ -4,11 +4,13 @@ using System.Collections; using System.Collections.Generic; using System.Runtime.CompilerServices; using UnityEngine; +using System.Linq; using Gallop.Live.Cutt; using static Director; using UnityEditor.SceneManagement; using static UnityEditor.Experimental.AssetDatabaseExperimental.AssetDatabaseCounters; using System.Data; +using System.Runtime.Remoting.Metadata.W3cXsd2001; namespace Gallop.Live { @@ -310,6 +312,9 @@ namespace Gallop.Live 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 const string SONG_PATH = "sound/l/{0}/snd_bgm_live_{0}_oke_01.awb"; + private const string VOCAL_PATH = "sound/l/{0}/snd_bgm_live_{0}_chara_{1}_01.awb"; + private const string RANDOM_VOCAL_PATH = "sound/l/{0}/snd_bgm_live_{0}_chara"; private UmaViewerBuilder Builder => UmaViewerBuilder.Instance; @@ -319,6 +324,10 @@ namespace Gallop.Live public List seqData; + public bool _isLiveScene; + + public AudioSource liveSong; + private void Awake() { if (live != null) @@ -355,11 +364,10 @@ namespace Gallop.Live public void InitializeTimeline() { - //Move? _liveTimelineControl.InitCharaMotionSequence(); } - public void Play() + public void Play(int songid, int charaid) { /* int counter = 0; @@ -380,7 +388,30 @@ namespace Gallop.Live } } */ - seqData = this._liveTimelineControl.data.worksheetList[0].charaMotSeqList; + Debug.Log(songid); + Debug.Log(charaid); + Debug.Log(string.Format(VOCAL_PATH, songid, charaid)); + + var entry = UmaViewerMain.Instance.AbSounds.FirstOrDefault(a => a.Name.Contains(string.Format(VOCAL_PATH, songid, charaid))); + if (entry == null) + { + List entries = new List(); + foreach (var random in UmaViewerMain.Instance.AbSounds.Where(a => (a.Name.Contains(string.Format(RANDOM_VOCAL_PATH, songid)) && a.Name.EndsWith("awb")))) + { + entries.Add(random); + } + if (entries.Count > 0) + { + entry = entries[UnityEngine.Random.Range(0, entries.Count - 1)]; + } + } + if(entry != null) + { + Debug.Log(entry.Name); + UmaViewerBuilder.Instance.LoadLiveSound(songid, entry, false); + liveSong = GameObject.Find("SoundController").GetComponent(); + } + _isLiveSetup = true; _liveCurrentTime = 0; } @@ -417,8 +448,16 @@ namespace Gallop.Live { if (_isLiveSetup) { - _liveCurrentTime += Time.deltaTime; - OnTimelineUpdate(_liveCurrentTime); + if(false) + { + _liveCurrentTime = liveSong.time; + OnTimelineUpdate(_liveCurrentTime); + } + else + { + _liveCurrentTime += Time.deltaTime; + OnTimelineUpdate(_liveCurrentTime); + } } else { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index e00ebb5..214b98d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,4 +8,10 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Version2.unity guid: 0befbf05b89507042b07ce8939206165 + - enabled: 1 + path: Assets/Scenes/LiveScene.unity + guid: fd2aa604854afa848a69857be81b7231 + - enabled: 1 + path: Assets/Scenes/Loading.unity + guid: 059e685c063fb484ea6f6757a392a45f m_configObjects: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 46cdcca..dc2436d 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -24,6 +24,12 @@ EditorUserSettings: value: 22424703114646680e0b0227036c711501572b292926237e38271427fb flags: 0 RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c731900122b292926237e38271427fb + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c731f171311242b66333e243d04 + flags: 0 + RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c691504041125227a68252320092a flags: 0 vcSharedLogLevel: