Merge remote-tracking branch 'upstream/master'

This commit is contained in:
gamer-jp
2022-09-29 03:49:01 +09:00
3 changed files with 63 additions and 39 deletions
+34 -9
View File
@@ -28,6 +28,12 @@ public class UmaViewerBuilder : MonoBehaviour
public UmaHeadData CurrentHead;
public Shader hairShader;
public Shader faceShader;
public Shader eyeShader;
public Shader cheekShader;
public Shader eyebrowShader;
public List<AudioSource> CurrentAudioSources = new List<AudioSource>();
public List<UmaLyricsData> CurrentLyrics = new List<UmaLyricsData>();
@@ -173,8 +179,9 @@ public class UmaViewerBuilder : MonoBehaviour
int head_id;
string head_costumeId;
int tailId = (int)charaData["tailModelId"];
if (id == 9006) tailId = -1;//The tailId of 9006 is 1, but the character has no tail
//The tailId of 9006 is 1, but the character has no tail
if (id == 9006) tailId = -1;
if (UI.isHeadFix && CurrentHead != null)
{
@@ -605,8 +612,19 @@ public class UmaViewerBuilder : MonoBehaviour
{
if (bundle.name == "shader.a")
{
if (Main.ShadersLoaded) return;
else Main.ShadersLoaded = true;
if (Main.ShadersLoaded)
{
return;
}
else
{
hairShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonhairtser.shader");
faceShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonfacetser.shader");
eyeShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertooneyet.shader");
cheekShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactermultiplycheek.shader");
eyebrowShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonmayu.shader");
Main.ShadersLoaded = true;
}
}
foreach (string name in bundle.GetAllAssetNames())
@@ -816,19 +834,25 @@ public class UmaViewerBuilder : MonoBehaviour
switch (m.shader.name)
{
case "Gallop/3D/Chara/MultiplyCheek":
m.shader = cheekShader;
m.CopyPropertiesFromMaterial(TransMaterialCharas);
break;
case "Gallop/3D/Chara/ToonFace/TSER":
m.shader = faceShader;
m.SetFloat("_CylinderBlend", 0.25f);
m.SetColor("_RimColor", new Color(0, 0, 0, 0));
break;
case "Gallop/3D/Chara/ToonEye/T":
m.shader = eyeShader;
m.SetFloat("_CylinderBlend", 0.25f);
break;
case "Gallop/3D/Chara/ToonHair/TSER":
m.shader = hairShader;
m.SetFloat("_CylinderBlend", 0.25f);
break;
case "Gallop/3D/Chara/ToonMayu":
m.shader = eyebrowShader;
break;
default:
Debug.Log(m.shader.name);
// m.shader = Shader.Find("Nars/UmaMusume/Body");
@@ -887,11 +911,12 @@ public class UmaViewerBuilder : MonoBehaviour
RecursiveLoadAsset(motion_e);
RecursiveLoadAsset(motion_s);
}
CurrentUMAContainer.OverrideController["clip_1"] = CurrentUMAContainer.OverrideController["clip_2"];
var lastTime = CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0).normalizedTime;
CurrentUMAContainer.UmaAnimator.Play("motion_1", 0, lastTime);
CurrentUMAContainer.OverrideController["clip_1"] = CurrentUMAContainer.OverrideController["clip_2"];
CurrentUMAContainer.OverrideController["clip_2"] = clip;
CurrentUMAContainer.UmaAnimator.Play("motion_1", 0, lastTime);
CurrentUMAContainer.UmaAnimator.SetTrigger(needTransit ? "next_s" : "next");
}
else if(clip.name.EndsWith("_S"))
@@ -916,9 +941,9 @@ public class UmaViewerBuilder : MonoBehaviour
else
{
CurrentUMAContainer.UmaAnimator.Play("motion_1", 0, lastTime);
CurrentUMAContainer.UmaAnimator.SetTrigger(needTransit ? "next_s" : "next");
}
CurrentUMAContainer.UmaAnimator.SetTrigger(needTransit ? "next_s" : "next");
}
}
+18 -19
View File
@@ -310,7 +310,6 @@ public class UmaViewerUI : MonoBehaviour
}
}
public void SetCriWare(bool value)
{
isCriware = value;
@@ -319,7 +318,6 @@ public class UmaViewerUI : MonoBehaviour
public void SetHeadFix(bool value)
{
isHeadFix = value;
UnityEngine.Debug.Log(isHeadFix);
}
void ListLiveSounds(int songid)
@@ -456,7 +454,8 @@ public class UmaViewerUI : MonoBehaviour
public void LoadedAnimation()
{
AnimationSlider.value = 0f;
if (!Builder.CurrentUMAContainer || !Builder.CurrentUMAContainer.UmaAnimator) return;
AnimationSlider.SetValueWithoutNotify(0);
// Reset settings by Panel
Builder.CurrentUMAContainer.UmaAnimator.speed = AnimationSpeedSlider.value;
}
@@ -501,7 +500,6 @@ public class UmaViewerUI : MonoBehaviour
{
cySpring.EnablePhysics(isOn);
}
}
}
@@ -547,12 +545,12 @@ public class UmaViewerUI : MonoBehaviour
source.time = source.clip.length * val;
}
}
}
}
public void AnimationPause()
{
if (!Builder.CurrentUMAContainer || !Builder.CurrentUMAContainer.UmaAnimator) return;
if (Builder.OverrideController.animationClips.Length > 0)
{
var animator = Builder.CurrentUMAContainer.UmaAnimator;
@@ -577,6 +575,7 @@ public class UmaViewerUI : MonoBehaviour
public void AnimationProgressChange(float val)
{
if (!Builder.CurrentUMAContainer || !Builder.CurrentUMAContainer.UmaAnimator) return;
var animator = Builder.CurrentUMAContainer.UmaAnimator;
if (animator != null)
{
@@ -590,12 +589,9 @@ public class UmaViewerUI : MonoBehaviour
public void AnimationSpeedChange(float val)
{
var animator = Builder.CurrentUMAContainer.UmaAnimator;
if (animator != null)
{
Builder.CurrentUMAContainer.UmaAnimator.speed = val;
AnimationSpeedText.text = $"Animation Speed: {val}";
}
AnimationSpeedText.text = string.Format("Animation Speed: {0:F2}", val);
if (!Builder.CurrentUMAContainer || !Builder.CurrentUMAContainer.UmaAnimator) return;
Builder.CurrentUMAContainer.UmaAnimator.speed = val;
}
private void Update()
@@ -612,16 +608,19 @@ public class UmaViewerUI : MonoBehaviour
}
}
if (Builder.CurrentUMAContainer != null && Builder.CurrentUMAContainer.OverrideController["clip_2"].name != "clip_2")
if (Builder.CurrentUMAContainer != null && Builder.CurrentUMAContainer.OverrideController != null)
{
var AnimeState = Builder.CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0);
var AnimeClip = Builder.CurrentUMAContainer.OverrideController["clip_2"];
if (AnimeClip && Builder.CurrentUMAContainer.UmaAnimator.speed != 0)
if(Builder.CurrentUMAContainer.OverrideController["clip_2"].name != "clip_2")
{
AnimationTitleText.text = AnimeClip.name;
var normalizedTime = (AnimeState.normalizedTime < 1.0f) ? AnimeState.normalizedTime : 1.0f;
AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(normalizedTime * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate));
AnimationSlider.SetValueWithoutNotify(normalizedTime);
var AnimeState = Builder.CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0);
var AnimeClip = Builder.CurrentUMAContainer.OverrideController["clip_2"];
if (AnimeClip && Builder.CurrentUMAContainer.UmaAnimator.speed != 0)
{
AnimationTitleText.text = AnimeClip.name;
AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(Mathf.Repeat(AnimeState.normalizedTime, 1) * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate));
AnimationSlider.SetValueWithoutNotify(Mathf.Repeat(AnimeState.normalizedTime, 1));
}
}
}
}