From c96b1d80af24b27feaabe4d4c5e469410f2d8745 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Wed, 6 Mar 2024 22:54:40 +0800 Subject: [PATCH] some bug fix --- Assets/Scripts/LiveToolBox/LiveViewerUI.cs | 1 + Assets/Scripts/UmaContainerCharacter.cs | 2 +- Assets/Scripts/UmaViewerMain.cs | 1 + Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs | 6 +++--- .../Gallop/Live/Cutt/LiveTimelineMotionSequence.cs | 2 +- ProjectSettings/QualitySettings.asset | 8 ++++---- ProjectSettings/TimelineSettings.asset | 1 + 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/LiveToolBox/LiveViewerUI.cs b/Assets/Scripts/LiveToolBox/LiveViewerUI.cs index 1a61d77..e57248f 100644 --- a/Assets/Scripts/LiveToolBox/LiveViewerUI.cs +++ b/Assets/Scripts/LiveToolBox/LiveViewerUI.cs @@ -56,6 +56,7 @@ public class LiveViewerUI : MonoBehaviour public void SetFrameRate(int fps) { + QualitySettings.vSyncCount = 0; Application.targetFrameRate = int.Parse(FrameRateDropDown.options[fps].text); } diff --git a/Assets/Scripts/UmaContainerCharacter.cs b/Assets/Scripts/UmaContainerCharacter.cs index 7359393..9f8f315 100644 --- a/Assets/Scripts/UmaContainerCharacter.cs +++ b/Assets/Scripts/UmaContainerCharacter.cs @@ -907,7 +907,7 @@ public class UmaContainerCharacter : UmaContainer var textures = TailTextures; foreach (Renderer r in Tail.GetComponentsInChildren()) { - foreach (Material m in r.sharedMaterials) + foreach (Material m in r.materials) { m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name.EndsWith("diff"))); m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name.Contains("shad"))); diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index cabca6c..57d32da 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -29,6 +29,7 @@ public class UmaViewerMain : MonoBehaviour { Instance = this; new Config(); + QualitySettings.vSyncCount = 0; Application.targetFrameRate = 120; AbList = UmaDatabaseController.Instance.MetaEntries; diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 27c7f3c..d4f3b40 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -973,9 +973,9 @@ namespace Gallop MangaMorph.BindProperties[1].Value = 1; } - var tearyEnable = ((int)info.attribute & LiveTimelineKeyFacialEffectData.kAttrTeary) > 0; - var tearytype = tearyEnable ? info.tearyType : 0; - StaticTearMorph.BindProperties.ForEach(p => p.Value = tearytype); + var tearfulEnable = ((int)info.attribute & LiveTimelineKeyFacialEffectData.kAttrTearful) > 0; + var tearfultype = tearfulEnable ? info.tearyType : 0; + StaticTearMorph.BindProperties.ForEach(p => p.Value = tearfultype); var shaderEnable = ((int)info.attribute & LiveTimelineKeyFacialEffectData.kAttrFaceShadowVisible) > 0; if (shaderEnable) diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs index 731890d..bd89a59 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs @@ -125,7 +125,7 @@ namespace Gallop.Live.Cutt _tempAnim.wrapMode = (arg.loop ? WrapMode.Loop : WrapMode.Default); _tempAnim[anim.name].time = (float)(start + interval); - if (Mathf.Abs(_prevFrameAnimationTime - currentTime) < 0.01f) + if (Mathf.Abs(_prevFrameAnimationTime - currentTime) < 0.01f && Director.instance.sliderControl.is_Touched) { if (_tempAnim.IsPlaying(anim.name)) { diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 3e04563..12e3f48 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -100,7 +100,7 @@ QualitySettings: softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 - vSyncCount: 1 + vSyncCount: 0 lodBias: 0.7 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -137,7 +137,7 @@ QualitySettings: softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 1 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -174,7 +174,7 @@ QualitySettings: softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 1.5 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -211,7 +211,7 @@ QualitySettings: softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 2 maximumLODLevel: 0 streamingMipmapsActive: 0 diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset index b4fbdb0..cfaebd7 100644 --- a/ProjectSettings/TimelineSettings.asset +++ b/ProjectSettings/TimelineSettings.asset @@ -13,3 +13,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: assetDefaultFramerate: 60 + m_DefaultFrameRate: 60