From badbcf8e7bea37b0b3262122a6deca3672c53209 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Thu, 3 Nov 2022 23:22:14 +0800 Subject: [PATCH] update --- Assets/Scenes/Version2.unity | 88 ++++++++++++++++++++++++++++-- Assets/Scripts/UmaViewerBuilder.cs | 18 ++++-- 2 files changed, 96 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index fe1a765..2e874c4 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -13456,6 +13456,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 788055507} m_CullTransparentMesh: 1 +--- !u!1 &790387847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 790387848} + - component: {fileID: 790387849} + m_Layer: 0 + m_Name: PreviewCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &790387848 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 790387847} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8918259399633999301} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} +--- !u!20 &790387849 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 790387847} + m_Enabled: 0 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0, g: 1, b: 0.08161616, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 1000 + field of view: 40 + orthographic: 0 + orthographic size: 400 + m_Depth: 2 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &793664715 GameObject: m_ObjectHideFlags: 0 @@ -19980,8 +20054,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1882365343} m_HandleRect: {fileID: 1882365342} m_Direction: 2 - m_Value: 0 - m_Size: 1 + m_Value: 1 + m_Size: 0.97654355 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -25233,6 +25307,7 @@ MonoBehaviour: type: 2} CameraOverrideController: {fileID: 22100000, guid: 2074a3b49810aed419168eda443b9e1a, type: 2} + CurrentCameraAnimator: {fileID: 0} --- !u!1 &1566898429 GameObject: m_ObjectHideFlags: 0 @@ -41918,7 +41993,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8918259399633999296} - m_Enabled: 0 + m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 0} m_CullingMode: 0 @@ -41936,10 +42011,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8918259399633999296} - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 2.4000015} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 790387848} m_Father: {fileID: 0} m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 61ce2eb..03ead08 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -42,6 +42,7 @@ public class UmaViewerBuilder : MonoBehaviour public AnimatorOverrideController FaceOverrideController; public AnimatorOverrideController CameraOverrideController; public Animator CurrentCameraAnimator; + public Camera PreviewCamera; private void Awake() { @@ -966,6 +967,7 @@ public class UmaViewerBuilder : MonoBehaviour overrideController["clip_1"] = clip; CurrentCameraAnimator = Camera.main.gameObject.GetComponent(); CurrentCameraAnimator.runtimeAnimatorController = overrideController; + PreviewCamera.enabled = true; CurrentCameraAnimator.Play("motion_1", 0, 0); } else @@ -983,7 +985,7 @@ public class UmaViewerBuilder : MonoBehaviour { RecursiveLoadAsset(facialMotion); } - if(cameraMotion != null) + if (cameraMotion != null) { RecursiveLoadAsset(cameraMotion); } @@ -995,9 +997,10 @@ public class UmaViewerBuilder : MonoBehaviour { CurrentUMAContainer.isAnimatorControl = false; CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); + PreviewCamera.enabled = false; - if(CurrentCameraAnimator) - CurrentCameraAnimator.GetComponent().runtimeAnimatorController = null; + if (CurrentCameraAnimator) + CurrentCameraAnimator.GetComponent().runtimeAnimatorController = null; CurrentUMAContainer.UmaAnimator.Play("motion_1", 0, lastTime); CurrentUMAContainer.UmaAnimator.SetTrigger(needTransit ? "next_s" : "next"); @@ -1078,7 +1081,6 @@ public class UmaViewerBuilder : MonoBehaviour Destroy(CurrentUMAContainer.gameObject); } } - public void ClearMorphs() { if (CurrentUMAContainer != null && CurrentUMAContainer.FaceDrivenKeyTarget != null) @@ -1097,4 +1099,12 @@ public class UmaViewerBuilder : MonoBehaviour CurrentUMAContainer.FaceDrivenKeyTarget.ChangeMorph(); } } + + private void FixedUpdate() + { + if (PreviewCamera&&PreviewCamera.enabled == true) + { + PreviewCamera.fieldOfView = PreviewCamera.gameObject.transform.parent.transform.localScale.x; + } + } }