diff --git a/.gitignore b/.gitignore index df96f1b4..08c5fa1e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ Backup* Assets/ExternalPlugins/uOSC* Assets/ExternalPlugins/MidiJack* Assets/ExternalPlugins/EasyDeviceDiscoveryProtocol* +FastSpringBone*csproj DepthFirstScheduler*csproj MeshUtility*csproj MToon*csproj @@ -96,4 +97,5 @@ sysinfo.txt *.unitypackage common.json Assets/_TerrainAutoUpgrade/ -.vsconfig \ No newline at end of file +.vsconfig +/TrackerPositions.json diff --git a/Assets/Scripts/Avatar/DynamicOVRLipSync.cs b/Assets/Scripts/Avatar/DynamicOVRLipSync.cs index 2d4c61c1..45f6945c 100644 --- a/Assets/Scripts/Avatar/DynamicOVRLipSync.cs +++ b/Assets/Scripts/Avatar/DynamicOVRLipSync.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using UnityEngine; -using VRM; +using UniVRM10; namespace VMC { @@ -83,25 +83,25 @@ void Update() OVRLipSync.Frame frame = GetCurrentPhonemeFrame(); if (frame != null) { - //あ OVRLipSync.Viseme.aa; BlendShapePreset.A; - //い OVRLipSync.Viseme.ih; BlendShapePreset.I; - //う OVRLipSync.Viseme.ou; BlendShapePreset.U; - //え OVRLipSync.Viseme.E; BlendShapePreset.E; - //お OVRLipSync.Viseme.oh; BlendShapePreset.O; - var presets = new BlendShapePreset[] { - BlendShapePreset.A, - BlendShapePreset.I, - BlendShapePreset.U, - BlendShapePreset.E, - BlendShapePreset.O, - }; + //あ OVRLipSync.Viseme.aa; ExpressionPreset.aa; + //い OVRLipSync.Viseme.ih; ExpressionPreset.ih; + //う OVRLipSync.Viseme.ou; ExpressionPreset.ou; + //え OVRLipSync.Viseme.E; ExpressionPreset.ee; + //お OVRLipSync.Viseme.oh; ExpressionPreset.oh; + var presets = new ExpressionPreset[] { + ExpressionPreset.aa, + ExpressionPreset.ih, + ExpressionPreset.ou, + ExpressionPreset.ee, + ExpressionPreset.oh, + }; var visemes = new float[] { - frame.Visemes[(int)OVRLipSync.Viseme.aa], - frame.Visemes[(int)OVRLipSync.Viseme.ih], - frame.Visemes[(int)OVRLipSync.Viseme.ou], - frame.Visemes[(int)OVRLipSync.Viseme.E], - frame.Visemes[(int)OVRLipSync.Viseme.oh], - }; + frame.Visemes[(int)OVRLipSync.Viseme.aa], + frame.Visemes[(int)OVRLipSync.Viseme.ih], + frame.Visemes[(int)OVRLipSync.Viseme.ou], + frame.Visemes[(int)OVRLipSync.Viseme.E], + frame.Visemes[(int)OVRLipSync.Viseme.oh], + }; int maxindex = 0; float maxvisemes = 0; diff --git a/Assets/Scripts/Avatar/EyeTracking/EyeTracking_Tobii.cs b/Assets/Scripts/Avatar/EyeTracking/EyeTracking_Tobii.cs index b61ba94c..4f9211a8 100644 --- a/Assets/Scripts/Avatar/EyeTracking/EyeTracking_Tobii.cs +++ b/Assets/Scripts/Avatar/EyeTracking/EyeTracking_Tobii.cs @@ -80,16 +80,16 @@ private void Calibration(GameObject currentModel, bool fromSetting) LookTarget.transform.parent = MonitorPosition.transform; LookTarget.transform.localRotation = Quaternion.identity; LookTarget.transform.localPosition = new Vector3(0, 0, 0f); - var vrmLookAtHead = currentModel.GetComponent(); + //var vrmLookAtHead = currentModel.GetComponent(); if (faceBeforeApply != null) faceController.BeforeApply -= faceBeforeApply; faceBeforeApply = () => { if (LookTarget == null) return; - if (vrmLookAtHead.Head == null) return; + //if (vrmLookAtHead.Head == null) return; if (isValidPosition == false) return; - vrmLookAtHead.Target = LookTarget.transform; - vrmLookAtHead.LookWorldPosition(); - vrmLookAtHead.Target = null; + //vrmLookAtHead.Target = LookTarget.transform; + //vrmLookAtHead.LookWorldPosition(); + //vrmLookAtHead.Target = null; }; faceController.BeforeApply += faceBeforeApply; StartPos = LookTarget.transform.localPosition; diff --git a/Assets/Scripts/Avatar/EyeTracking/EyeTracking_ViveProEye.cs b/Assets/Scripts/Avatar/EyeTracking/EyeTracking_ViveProEye.cs index 29e67630..b81fc61b 100644 --- a/Assets/Scripts/Avatar/EyeTracking/EyeTracking_ViveProEye.cs +++ b/Assets/Scripts/Avatar/EyeTracking/EyeTracking_ViveProEye.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; using UnityMemoryMappedFile; +using UniVRM10; using ViveSR.anipal.Eye; namespace VMC @@ -88,16 +89,16 @@ private void ModelInitialize(GameObject currentModel) LookTarget.transform.parent = MonitorPosition.transform; LookTarget.transform.localRotation = Quaternion.identity; LookTarget.transform.localPosition = new Vector3(0, 0, 1f); //すべて0地点にすると目が荒ぶる - var vrmLookAtHead = currentModel.GetComponent(); + var vrm10Instance = currentModel.GetComponent(); if (faceBeforeApply != null) faceController.BeforeApply -= faceBeforeApply; faceBeforeApply = () => { if ((SRanipal_Eye_Framework.Status != SRanipal_Eye_Framework.FrameworkStatus.WORKING && SRanipal_Eye_Framework.Status != SRanipal_Eye_Framework.FrameworkStatus.NOT_SUPPORT) || SRanipal_Eye_Framework.Status == SRanipal_Eye_Framework.FrameworkStatus.NOT_SUPPORT || enabled == false) return; - vrmLookAtHead.Target = LookTarget.transform; - vrmLookAtHead.LookWorldPosition(); - vrmLookAtHead.Target = null; + //vrm10Instance.LookAtTarget = LookTarget.transform; + //vrmLookAtHead.LookWorldPosition(); + //vrm10Instance.LookAtTarget = null; }; faceController.BeforeApply += faceBeforeApply; StartPos = LookTarget.transform.localPosition; diff --git a/Assets/Scripts/Avatar/FaceController.cs b/Assets/Scripts/Avatar/FaceController.cs index 606dd8e8..6961db8b 100644 --- a/Assets/Scripts/Avatar/FaceController.cs +++ b/Assets/Scripts/Avatar/FaceController.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using VRM; +using UniVRM10; +//using VRM; namespace VMC { @@ -9,7 +10,7 @@ public class FaceController : MonoBehaviour { private GameObject VRMmodel; - private VRMBlendShapeProxy proxy; + private Vrm10RuntimeExpression vrm10RuntimeExpression; public bool EnableBlink = false; public bool ViveProEyeEnabled = false; @@ -39,12 +40,12 @@ public bool StopBlink private bool IsSetting = false; - public List BlendShapeClips; //読み込んだモデルの表情のキー一覧 + public IReadOnlyList BlendShapeClips = new List(); //読み込んだモデルの表情のキー一覧 public System.Action BeforeApply; - private BlendShapePreset defaultFace = BlendShapePreset.Neutral; - public BlendShapePreset DefaultFace + private ExpressionPreset defaultFace = ExpressionPreset.neutral; + public ExpressionPreset DefaultFace { get { return defaultFace; } set @@ -52,28 +53,28 @@ public BlendShapePreset DefaultFace if (defaultFace != value) { //前回の表情を消しておく - if (proxy != null) + if (vrm10RuntimeExpression != null) { - if (defaultFace != BlendShapePreset.Unknown) + if (defaultFace != ExpressionPreset.custom) { SetFace(defaultFace, 0.0f, StopBlink); } else if (string.IsNullOrEmpty(FacePresetName) == false) { - SetFace(BlendShapeKey.CreateUnknown(FacePresetName), 0.0f, StopBlink); + SetFace(ExpressionKey.CreateCustom(FacePresetName), 0.0f, StopBlink); } } defaultFace = value; //新しい表情を設定する - if (proxy != null) + if (vrm10RuntimeExpression != null) { - if (defaultFace != BlendShapePreset.Unknown) + if (defaultFace != ExpressionPreset.custom) { SetFace(defaultFace, 1.0f, StopBlink); } else if (string.IsNullOrEmpty(FacePresetName) == false) { - SetFace(BlendShapeKey.CreateUnknown(FacePresetName), 1.0f, StopBlink); + SetFace(ExpressionKey.CreateCustom(FacePresetName), 1.0f, StopBlink); } } } @@ -83,18 +84,18 @@ public BlendShapePreset DefaultFace private AnimationController animationController; - private Dictionary CurrentShapeKeys; - private Dictionary> AccumulateShapeKeys = new Dictionary>(); - private Dictionary> OverwriteShapeKeys = new Dictionary>(); - private BlendShapeKey NeutralKey = BlendShapeKey.CreateFromPreset(BlendShapePreset.Neutral); + private Dictionary CurrentShapeKeys; + private Dictionary> AccumulateShapeKeys = new Dictionary>(); + private Dictionary> OverwriteShapeKeys = new Dictionary>(); + private ExpressionKey NeutralKey = ExpressionKey.CreateFromPreset(ExpressionPreset.neutral); - private Dictionary BlendShapeKeyString = new Dictionary(); + private Dictionary BlendShapeKeyString = new Dictionary(); private Dictionary KeyUpperCaseDictionary = new Dictionary(); public string GetCaseSensitiveKeyName(string upperCase) { if (KeyUpperCaseDictionary.Count == 0) { - foreach (var presetName in System.Enum.GetNames(typeof(BlendShapePreset))) + foreach (var presetName in System.Enum.GetNames(typeof(ExpressionPreset))) { KeyUpperCaseDictionary[presetName.ToUpper()] = presetName; } @@ -104,10 +105,10 @@ public string GetCaseSensitiveKeyName(string upperCase) private void Start() { - var dict = new Dictionary(); + var dict = new Dictionary(); foreach (var clip in BlendShapeClips) { - dict.Add(clip.Key, 0.0f); + dict.Add(clip, 0.0f); } CurrentShapeKeys = dict; @@ -127,21 +128,21 @@ private void OnDisable() private void OnCurrentModelChanged(GameObject model) { VRMmodel = model; - proxy = null; + vrm10RuntimeExpression = null; InitializeProxy(); } private void CreateAnimation() { if (animationController == null) animationController = new AnimationController(); - if (proxy != null) + if (vrm10RuntimeExpression != null) { animationController.ClearAnimations(); - animationController.AddResetAction(() => MixPreset("Blink", BlendShapePreset.Blink, 0.0f)); + animationController.AddResetAction(() => MixPreset("Blink", ExpressionPreset.blink, 0.0f)); animationController.AddWait(null, () => BlinkTimeMin + Random.value * (BlinkTimeMax - BlinkTimeMin)); - animationController.AddAnimation(CloseAnimationTime, 0.0f, 1.0f, v => MixPreset("Blink", BlendShapePreset.Blink, v)); + animationController.AddAnimation(CloseAnimationTime, 0.0f, 1.0f, v => MixPreset("Blink", ExpressionPreset.blink, v)); animationController.AddWait(ClosingTime); - animationController.AddAnimation(OpenAnimationTime, 1.0f, 0.0f, v => MixPreset("Blink", BlendShapePreset.Blink, v)); + animationController.AddAnimation(OpenAnimationTime, 1.0f, 0.0f, v => MixPreset("Blink", ExpressionPreset.blink, v)); } } @@ -149,43 +150,43 @@ public void SetBlink_L(float value) { if (ViveProEyeEnabled == false) { - MixPreset("Blink", BlendShapePreset.Blink, 0.0f); + MixPreset("Blink", ExpressionPreset.blink, 0.0f); } if (StopBlink) { - MixPreset("Blink_L", BlendShapePreset.Blink_L, 0.0f); + MixPreset("Blink_L", ExpressionPreset.blinkLeft, 0.0f); } else { - MixPreset("Blink_L", BlendShapePreset.Blink_L, value); + MixPreset("Blink_L", ExpressionPreset.blinkLeft, value); } } public void SetBlink_R(float value) { if (ViveProEyeEnabled == false) { - MixPreset("Blink", BlendShapePreset.Blink, 0.0f); + MixPreset("Blink", ExpressionPreset.blink, 0.0f); } if (StopBlink) { - MixPreset("Blink_R", BlendShapePreset.Blink_L, 0.0f); + MixPreset("Blink_R", ExpressionPreset.blinkLeft, 0.0f); } else { - MixPreset("Blink_R", BlendShapePreset.Blink_R, value); + MixPreset("Blink_R", ExpressionPreset.blinkRight, value); } } private void SetFaceNeutral() { //表情をデフォルトに戻す - if (proxy != null) + if (vrm10RuntimeExpression != null) { - var keys = new List(); + var keys = new List(); var values = new List(); foreach (var clip in BlendShapeClips) { - var shapekey = clip.Key; + var shapekey = clip; if (shapekey.Equals(NeutralKey)) { values.Add(1.0f); @@ -212,23 +213,23 @@ public void EndSetting() IsSetting = false; } - public void SetFace(BlendShapePreset preset, float strength, bool stopBlink) + public void SetFace(ExpressionPreset preset, float strength, bool stopBlink) { - SetFace(BlendShapeKey.CreateFromPreset(preset), strength, stopBlink); + SetFace(ExpressionKey.CreateFromPreset(preset), strength, stopBlink); } - public void SetFace(BlendShapeKey key, float strength, bool stopBlink) + public void SetFace(ExpressionKey key, float strength, bool stopBlink) { - SetFace(new List { key }, new List { strength }, stopBlink); + SetFace(new List { key }, new List { strength }, stopBlink); } public void SetFace(List keys, List strength, bool stopBlink) { - if (proxy != null) + if (vrm10RuntimeExpression != null) { if (keys.Any(d => BlendShapeKeyString.ContainsKey(d) == false)) { - var convertKeys = new List(); + var convertKeys = new List(); var convertValues = new List(); for (int i = 0; i < keys.Count; i++) { @@ -248,15 +249,15 @@ public void SetFace(List keys, List strength, bool stopBlink) } } - public void SetFace(List keys, List strength, bool stopBlink) + public void SetFace(List keys, List strength, bool stopBlink) { - if (proxy != null) + if (vrm10RuntimeExpression != null) { StopBlink = stopBlink; - var dict = new Dictionary(); + var dict = new Dictionary(); foreach (var clip in BlendShapeClips) { - dict.Add(clip.Key, 0.0f); + dict.Add(clip, 0.0f); } //dict[NeutralKey] = 1.0f; for (int i = 0; i < keys.Count; i++) @@ -268,17 +269,17 @@ public void SetFace(List keys, List strength, bool stopBli } } - public void MixPreset(string presetName, BlendShapePreset preset, float value) + public void MixPreset(string presetName, ExpressionPreset preset, float value) { MixPresets(presetName, new[] { preset }, new[] { value }); } - public void MixPresets(string presetName, BlendShapePreset[] presets, float[] values) + public void MixPresets(string presetName, ExpressionPreset[] presets, float[] values) { - MixPresets(presetName, presets.Select(d => BlendShapeKey.CreateFromPreset(d)).ToArray(), values); + MixPresets(presetName, presets.Select(d => ExpressionKey.CreateFromPreset(d)).ToArray(), values); } - public void MixPreset(string presetName, BlendShapeKey preset, float value) + public void MixPreset(string presetName, ExpressionKey preset, float value) { MixPresets(presetName, new[] { preset }, new[] { value }); } @@ -287,7 +288,7 @@ public void MixPresets(string presetName, string[] keys, float[] values) { if (keys.Any(d => BlendShapeKeyString.ContainsKey(d) == false)) { - var convertKeys = new List(); + var convertKeys = new List(); var convertValues = new List(); for (int i = 0; i < keys.Length; i++) { @@ -306,14 +307,14 @@ public void MixPresets(string presetName, string[] keys, float[] values) } } - public void MixPresets(string presetName, BlendShapeKey[] presets, float[] values) + public void MixPresets(string presetName, ExpressionKey[] presets, float[] values) { - if (proxy == null) return; + if (vrm10RuntimeExpression == null) return; if (CurrentShapeKeys == null) return; if (AccumulateShapeKeys.ContainsKey(presetName) == false) { - AccumulateShapeKeys.Add(presetName, new Dictionary()); + AccumulateShapeKeys.Add(presetName, new Dictionary()); } var presetDictionary = AccumulateShapeKeys[presetName]; presetDictionary.Clear(); @@ -325,14 +326,14 @@ public void MixPresets(string presetName, BlendShapeKey[] presets, float[] value } } - public void OverwritePresets(string presetName, BlendShapeKey[] presets, float[] values) + public void OverwritePresets(string presetName, ExpressionKey[] presets, float[] values) { - if (proxy == null) return; + if (vrm10RuntimeExpression == null) return; if (CurrentShapeKeys == null) return; if (OverwriteShapeKeys.ContainsKey(presetName) == false) { - OverwriteShapeKeys.Add(presetName, new Dictionary()); + OverwriteShapeKeys.Add(presetName, new Dictionary()); } var presetDictionary = OverwriteShapeKeys[presetName]; presetDictionary.Clear(); @@ -346,8 +347,8 @@ public void OverwritePresets(string presetName, BlendShapeKey[] presets, float[] private void AccumulateBlendShapes() { - if (proxy == null) return; - var accumulatedValues = new Dictionary(); + if (vrm10RuntimeExpression == null) return; + var accumulatedValues = new Dictionary(); //ベースの表情を設定する(使わない表情には全て0が入っている) foreach (var shapeKey in CurrentShapeKeys) { @@ -385,34 +386,43 @@ private void AccumulateBlendShapes() } } - //全ての表情をSetValuesで1度に反映させる - proxy.SetValues(accumulatedValues); - - //SetValuesは内部でApplyまで行うためApply不要 + //全ての表情をSetWeightsで1度に反映させる + vrm10RuntimeExpression.SetWeights(accumulatedValues); } private void InitializeProxy() { - proxy = VRMmodel.GetComponent(); + var vrm10Instance = VRMmodel.GetComponent(); + vrm10RuntimeExpression = vrm10Instance.Runtime.Expression; + //すべての表情の名称一覧を取得 - if (proxy != null) + if (vrm10RuntimeExpression != null) { - BlendShapeClips = proxy.BlendShapeAvatar.Clips; + BlendShapeClips = vrm10RuntimeExpression.ExpressionKeys; foreach (var clip in BlendShapeClips) { - if (clip.Preset == BlendShapePreset.Unknown) - { - //非プリセット(Unknown)であれば、Unknown用の名前変数を参照する - BlendShapeKeyString[clip.BlendShapeName] = clip.Key; - KeyUpperCaseDictionary[clip.BlendShapeName.ToUpper()] = clip.BlendShapeName; - } - else - { - //プリセットであればENUM値をToStringした値を利用する - BlendShapeKeyString[clip.Preset.ToString()] = clip.Key; - KeyUpperCaseDictionary[clip.Preset.ToString().ToUpper()] = clip.Preset.ToString(); - } + BlendShapeKeyString[clip.Name] = clip; + KeyUpperCaseDictionary[clip.Name.ToUpper()] = clip.Name; } + + // VRM 0.x compatibility + BlendShapeKeyString.Add("Neutral", ExpressionKey.Neutral); + BlendShapeKeyString.Add("A", ExpressionKey.Aa); + BlendShapeKeyString.Add("I", ExpressionKey.Ih); + BlendShapeKeyString.Add("U", ExpressionKey.Ou); + BlendShapeKeyString.Add("E", ExpressionKey.Ee); + BlendShapeKeyString.Add("O", ExpressionKey.Oh); + BlendShapeKeyString.Add("Blink", ExpressionKey.Blink); + BlendShapeKeyString.Add("Joy", ExpressionKey.Happy); + BlendShapeKeyString.Add("Angry", ExpressionKey.Angry); + BlendShapeKeyString.Add("Sorrow", ExpressionKey.Sad); + BlendShapeKeyString.Add("Fun", ExpressionKey.Relaxed); + BlendShapeKeyString.Add("LookUp", ExpressionKey.LookUp); + BlendShapeKeyString.Add("LookDown", ExpressionKey.LookDown); + BlendShapeKeyString.Add("LookLeft", ExpressionKey.LookLeft); + BlendShapeKeyString.Add("LookRight", ExpressionKey.LookRight); + BlendShapeKeyString.Add("Blink_L", ExpressionKey.BlinkLeft); + BlendShapeKeyString.Add("Blink_R", ExpressionKey.BlinkRight); } SetFaceNeutral(); } diff --git a/Assets/Scripts/Avatar/FinalIKCalibrator.cs b/Assets/Scripts/Avatar/FinalIKCalibrator.cs index a547e281..64939966 100644 --- a/Assets/Scripts/Avatar/FinalIKCalibrator.cs +++ b/Assets/Scripts/Avatar/FinalIKCalibrator.cs @@ -1,11 +1,8 @@ -using RootMotion; using RootMotion.FinalIK; using System; using System.Collections; -using System.Collections.Generic; using UnityEngine; using Valve.VR; -using VRM; namespace VMC { diff --git a/Assets/Scripts/Avatar/MotionTracking/IKManager.cs b/Assets/Scripts/Avatar/MotionTracking/IKManager.cs index b0ddadd8..a3974d46 100644 --- a/Assets/Scripts/Avatar/MotionTracking/IKManager.cs +++ b/Assets/Scripts/Avatar/MotionTracking/IKManager.cs @@ -1,3 +1,4 @@ +using RootMotion.FinalIK; using sh_akira; using System; using System.Collections; @@ -7,8 +8,6 @@ using UnityEngine; using UnityMemoryMappedFile; using Valve.VR; -using RootMotion.FinalIK; -using VRM; namespace VMC { diff --git a/Assets/Scripts/Avatar/VMC_VRMLookAtBlendShapeApplyer.cs b/Assets/Scripts/Avatar/VMC_VRMLookAtBlendShapeApplyer.cs index 04755c10..f866961d 100644 --- a/Assets/Scripts/Avatar/VMC_VRMLookAtBlendShapeApplyer.cs +++ b/Assets/Scripts/Avatar/VMC_VRMLookAtBlendShapeApplyer.cs @@ -1,10 +1,10 @@ #pragma warning disable 0414, 0649 using UnityEngine; -using VRM; +using UniVRM10; namespace VMC { - public class VMC_VRMLookAtBlendShapeApplyer : MonoBehaviour, IVRMComponent + public class VMC_VRMLookAtBlendShapeApplyer : MonoBehaviour { public bool DrawGizmo = true; @@ -22,29 +22,29 @@ public class VMC_VRMLookAtBlendShapeApplyer : MonoBehaviour, IVRMComponent public FaceController faceController; - public void OnImported(VRMImporterContext context) + public void OnImported(VRM10ObjectLookAt vrm10ObjectLookAt) { - var gltfFirstPerson = context.VRM.firstPerson; - Horizontal.Apply(gltfFirstPerson.lookAtHorizontalOuter); - VerticalDown.Apply(gltfFirstPerson.lookAtVerticalDown); - VerticalUp.Apply(gltfFirstPerson.lookAtVerticalUp); + Horizontal = vrm10ObjectLookAt.HorizontalOuter; + VerticalDown = vrm10ObjectLookAt.VerticalDown; + VerticalUp = vrm10ObjectLookAt.VerticalUp; } - VRMLookAtHead m_head; + //VRMLookAtHead m_head; private void Start() { - m_head = GetComponent(); + Vrm10RuntimeLookAt lookAt = GetComponent().Runtime.LookAt; + //m_head = GetComponent(); if (faceController == null) faceController = GameObject.Find("AnimationController").GetComponent(); - if (m_head == null) + //if (m_head == null) { enabled = false; return; } - m_head.YawPitchChanged += ApplyRotations; + //m_head.YawPitchChanged += ApplyRotations; } - private BlendShapeKey[] presets = new[] { BlendShapeKey.CreateFromPreset(BlendShapePreset.LookLeft), BlendShapeKey.CreateFromPreset(BlendShapePreset.LookRight), BlendShapeKey.CreateFromPreset(BlendShapePreset.LookUp), BlendShapeKey.CreateFromPreset(BlendShapePreset.LookDown) }; + private ExpressionKey[] presets = new[] { ExpressionKey.LookLeft, ExpressionKey.LookRight, ExpressionKey.LookUp, ExpressionKey.LookDown }; private float[] blendShapeValues = new float[4]; void ApplyRotations(float yaw, float pitch) diff --git a/Assets/Scripts/Avatar/VRMMetaImporter.cs b/Assets/Scripts/Avatar/VRMMetaImporter.cs index 4143f653..2e4f18fd 100644 --- a/Assets/Scripts/Avatar/VRMMetaImporter.cs +++ b/Assets/Scripts/Avatar/VRMMetaImporter.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using UniGLTF; using UnityEngine; -using VRM; namespace VMC { diff --git a/Assets/Scripts/ControlWPFWindow.cs b/Assets/Scripts/ControlWPFWindow.cs index 606ca2a4..f8ec2982 100644 --- a/Assets/Scripts/ControlWPFWindow.cs +++ b/Assets/Scripts/ControlWPFWindow.cs @@ -1,21 +1,18 @@ -using RootMotion.FinalIK; -using sh_akira; +using sh_akira; using System; using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Runtime.Serialization; using System.Threading.Tasks; using UnityEngine; using UnityMemoryMappedFile; -using Valve.VR; using VMCMod; -using VRM; using static VMC.NativeMethods; using UniGLTF; -using VRMShaders; +using UniVRM10; + #if UNITY_EDITOR // エディタ上でしか動きません。 using UnityEditor; #endif @@ -68,7 +65,7 @@ public class ControlWPFWindow : MonoBehaviour private System.Threading.SynchronizationContext context = null; public Action AdditionalSettingAction = null; - public Action VRMmetaLodedAction = null; + public Action VRMmetaLoadedAction = null; public Action VRMRemoteLoadedAction = null; public Action EyeTracking_TobiiCalibrationAction = null; @@ -239,10 +236,10 @@ private void Server_Received(object sender, DataReceivedEventArgs e) modManager.ImportMods(); } } - else if (e.CommandType == typeof(PipeCommands.LoadVRM)) + else if (e.CommandType == typeof(PipeCommands.LoadVRMMeta)) { - var d = (PipeCommands.LoadVRM)e.Data; - await server.SendCommandAsync(new PipeCommands.ReturnLoadVRM { Data = LoadVRM(d.Path) }, e.RequestId); + var d = (PipeCommands.LoadVRMMeta)e.Data; + await server.SendCommandAsync(new PipeCommands.ReturnLoadVRMMeta { Data = await LoadVRMMetaAsync(d.Path) }, e.RequestId); } else if (e.CommandType == typeof(PipeCommands.LoadRemoteVRM)) { @@ -255,7 +252,7 @@ private void Server_Received(object sender, DataReceivedEventArgs e) var t = ImportVRM(d.Path); //メタ情報をOSC送信する - VRMmetaLodedAction?.Invoke(LoadVRM(d.Path)); + VRMmetaLoadedAction?.Invoke(await LoadVRMMetaAsync(d.Path)); } else if (e.CommandType == typeof(PipeCommands.SetLipSyncEnable)) @@ -388,7 +385,7 @@ private void Server_Received(object sender, DataReceivedEventArgs e) } else if (e.CommandType == typeof(PipeCommands.GetFaceKeys)) { - await server.SendCommandAsync(new PipeCommands.ReturnFaceKeys { Keys = faceController.BlendShapeClips.Select(d => d.BlendShapeName).ToList() }, e.RequestId); + await server.SendCommandAsync(new PipeCommands.ReturnFaceKeys { Keys = faceController.BlendShapeClips.Select(d => d.Name).ToList() }, e.RequestId); } else if (e.CommandType == typeof(PipeCommands.SetFace)) { @@ -991,7 +988,7 @@ private void SetAdvancedGraphicsOption() #region VRM - public UnityMemoryMappedFile.VRMData LoadVRM(string path) + public async Task LoadVRMMetaAsync(string path) { if (string.IsNullOrEmpty(path) || File.Exists(path) == false) { @@ -1001,48 +998,45 @@ public UnityMemoryMappedFile.VRMData LoadVRM(string path) var vrmdata = new UnityMemoryMappedFile.VRMData(); vrmdata.FilePath = path; - using (GltfData data = new AutoGltfFileParser(path).Parse()) - { - VRM.VRMData vrmData = new VRM.VRMData(data); - using (var context = new VRMImporterContext(vrmData)) - { + IAwaitCaller awaitCaller = Application.isPlaying ? new RuntimeOnlyAwaitCaller() : new ImmediateCaller(); - // metaを取得 - var meta = context.ReadMeta(true); + using var data = await awaitCaller.Run(() => { return new AutoGltfFileParser(path).Parse(); }); + if (data == null) + return null; - // サムネイル - if (meta.Thumbnail != null) - { - vrmdata.ThumbnailPNGBytes = meta.Thumbnail.EncodeToPNG(); //Or SaveAsPng( memoryStream, texture.Width, texture.Height ) - } + var vrm10Data = Vrm10Data.Parse(data); - // Info - vrmdata.Title = meta.Title; - vrmdata.Version = meta.Version; - vrmdata.Author = meta.Author; - vrmdata.ContactInformation = meta.ContactInformation; - vrmdata.Reference = meta.Reference; - - // Permission - vrmdata.AllowedUser = (UnityMemoryMappedFile.AllowedUser)meta.AllowedUser; - vrmdata.ViolentUssage = (UnityMemoryMappedFile.UssageLicense)meta.ViolentUssage; - vrmdata.SexualUssage = (UnityMemoryMappedFile.UssageLicense)meta.SexualUssage; - vrmdata.CommercialUssage = (UnityMemoryMappedFile.UssageLicense)meta.CommercialUssage; - vrmdata.OtherPermissionUrl = meta.OtherPermissionUrl; - - // Distribution License - vrmdata.LicenseType = (UnityMemoryMappedFile.LicenseType)meta.LicenseType; - vrmdata.OtherLicenseUrl = meta.OtherLicenseUrl; - /* - // ParseしたJSONをシーンオブジェクトに変換していく - var now = Time.time; - var go = await VRMImporter.LoadVrmAsync(context); + MigrationData migration = null; + if (vrm10Data == null) + { + await awaitCaller.Run(() => Vrm10Data.Migrate(data, out vrm10Data, out migration)); + } - var delta = Time.time - now; - Debug.LogFormat("LoadVrmAsync {0:0.0} seconds", delta); - //OnLoaded(go); - */ - } + if (vrm10Data == null) + return null; + + if (migration != null) + { + // VRM 0.x + vrmdata.Title = migration.OriginalMetaBeforeMigration.title; + vrmdata.Version = migration.OriginalMetaBeforeMigration.version; + vrmdata.Author = migration.OriginalMetaBeforeMigration.author; + vrmdata.ContactInformation = migration.OriginalMetaBeforeMigration.contactInformation; + vrmdata.Reference = migration.OriginalMetaBeforeMigration.reference; + vrmdata.AllowedUser = (UnityMemoryMappedFile.AllowedUser)migration.OriginalMetaBeforeMigration.allowedUser; + vrmdata.ViolentUssage = migration.OriginalMetaBeforeMigration.violentUsage ? UnityMemoryMappedFile.UssageLicense.Allow : UnityMemoryMappedFile.UssageLicense.Disallow; + vrmdata.SexualUssage = migration.OriginalMetaBeforeMigration.sexualUsage ? UnityMemoryMappedFile.UssageLicense.Allow : UnityMemoryMappedFile.UssageLicense.Disallow; + vrmdata.CommercialUssage = migration.OriginalMetaBeforeMigration.commercialUsage ? UnityMemoryMappedFile.UssageLicense.Allow : UnityMemoryMappedFile.UssageLicense.Disallow; + vrmdata.OtherPermissionUrl = migration.OriginalMetaBeforeMigration.otherPermissionUrl; + vrmdata.LicenseType = (UnityMemoryMappedFile.LicenseType)migration.OriginalMetaBeforeMigration.licenseType; + vrmdata.OtherLicenseUrl = migration.OriginalMetaBeforeMigration.otherLicenseUrl; + + using var loader = new Vrm10Importer(vrm10Data); + vrmdata.ThumbnailPNGBytes = (await loader.LoadVrmThumbnailAsync()).EncodeToPNG(); + } + else + { + // TODO: VRM 1.x or later } return vrmdata; @@ -1054,6 +1048,19 @@ public async Task ImportVRM(string path) Settings.Current.VRMPath = path; + var vrm10Instance = await Vrm10.LoadPathAsync(path); + var runtimeGltfInstance = vrm10Instance.GetComponent(); + + runtimeGltfInstance.ShowMeshes(); + + LoadNewModel(runtimeGltfInstance.Root); + await server.SendCommandAsync(new PipeCommands.VRMLoadStatus { Valid = true }); + + // BlendShape目線制御時の表情とのぶつかりを防ぐ + if (vrm10Instance.Vrm.LookAt.LookAtType == UniGLTF.Extensions.VRMC_vrm.LookAtType.expression) + { + } +#if false using (GltfData data = new AutoGltfFileParser(path).Parse()) { VRM.VRMData vrmData = new VRM.VRMData(data); @@ -1078,6 +1085,7 @@ public async Task ImportVRM(string path) await server.SendCommandAsync(new PipeCommands.VRMLoadStatus { Valid = true }); } } +#endif } public void LoadNewModel(GameObject model) @@ -1305,17 +1313,17 @@ void SetClosingTime(float time) Settings.Current.ClosingTime = time; } - private Dictionary BlendShapeNameDictionary = new Dictionary + private Dictionary BlendShapeNameDictionary = new Dictionary { - { "通常(NEUTRAL)", BlendShapePreset.Neutral }, - { "喜(JOY)", BlendShapePreset.Joy }, - { "怒(ANGRY)", BlendShapePreset.Angry }, - { "哀(SORROW)", BlendShapePreset.Sorrow }, - { "楽(FUN)", BlendShapePreset.Fun }, - { "上見(LOOKUP)", BlendShapePreset.LookUp }, - { "下見(LOOKDOWN)", BlendShapePreset.LookDown }, - { "左見(LOOKLEFT)", BlendShapePreset.LookLeft }, - { "右見(LOOKRIGHT)", BlendShapePreset.LookRight }, + { "通常(NEUTRAL)", ExpressionPreset.neutral }, + { "喜(JOY)", ExpressionPreset.happy }, // joy -> happy + { "怒(ANGRY)", ExpressionPreset.angry }, + { "哀(SORROW)", ExpressionPreset.sad }, // sorrow -> sad + { "楽(FUN)", ExpressionPreset.relaxed }, // fun -> relaxed + { "上見(LOOKUP)", ExpressionPreset.lookUp }, + { "下見(LOOKDOWN)", ExpressionPreset.lookDown }, + { "左見(LOOKLEFT)", ExpressionPreset.lookLeft }, + { "右見(LOOKRIGHT)", ExpressionPreset.lookRight }, }; void SetDefaultFace(string face) @@ -1331,7 +1339,7 @@ void SetDefaultFace(string face) } else { - faceController.DefaultFace = BlendShapePreset.Unknown; + faceController.DefaultFace = ExpressionPreset.custom; faceController.FacePresetName = face; } } @@ -1766,7 +1774,7 @@ private async void ApplySettings() await ImportVRM(Settings.Current.VRMPath); //メタ情報をOSC送信する - VRMmetaLodedAction?.Invoke(LoadVRM(Settings.Current.VRMPath)); + VRMmetaLoadedAction?.Invoke(await LoadVRMMetaAsync(Settings.Current.VRMPath)); } //SetResolutionは強制的にウインドウ枠を復活させるのでBorder設定の前にやっておく必要がある @@ -2064,4 +2072,4 @@ void LateUpdate() } } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/ExternalSender/ExternalReceiverForVMC.cs b/Assets/Scripts/ExternalSender/ExternalReceiverForVMC.cs index f3e48691..bbeae034 100644 --- a/Assets/Scripts/ExternalSender/ExternalReceiverForVMC.cs +++ b/Assets/Scripts/ExternalSender/ExternalReceiverForVMC.cs @@ -6,7 +6,7 @@ using System.Reflection; using UnityEngine; using UnityMemoryMappedFile; -using VRM; +using UniVRM10; namespace VMC { @@ -44,7 +44,8 @@ public class ExternalReceiverForVMC : MonoBehaviour public GameObject CurrentModel = null; Camera currentCamera = null; FaceController faceController = null; - VRMLookAtHead vrmLookAtHead = null; + //VRMLookAtHead vrmLookAtHead = null; + Vrm10Instance vrm10Instance = null; Transform headTransform = null; //仮想視線操作用 @@ -63,7 +64,8 @@ public class ExternalReceiverForVMC : MonoBehaviour //ボーン情報取得 Animator animator = null; //VRMのブレンドシェーププロキシ - VRMBlendShapeProxy blendShapeProxy = null; + //VRMBlendShapeProxy blendShapeProxy = null; + Vrm10RuntimeExpression vrm10RuntimeExpression = null; //ボーンENUM情報テーブル Dictionary HumanBodyBonesTable = new Dictionary(); @@ -158,10 +160,10 @@ public void Initialize() beforeFaceApply = () => { - if (vrmLookAtHead == null || lookTargetOSC == null) return; - vrmLookAtHead.Target = lookTargetOSC.transform; - vrmLookAtHead.LookWorldPosition(); - vrmLookAtHead.Target = null; + if (vrm10Instance.Runtime.LookAt == null || lookTargetOSC == null) return; + //vrm10Instance.LookAtTarget = lookTargetOSC.transform; + //vrmLookAtHead.LookWorldPosition(); + //vrm10Instance.LookAtTarget = null; }; var modelRoot = new GameObject("ModelRoot").transform; @@ -192,7 +194,7 @@ private void OnModelChanged() { if (CurrentModel != null) { - vrmLookAtHead = CurrentModel.GetComponent(); + vrm10Instance = CurrentModel.GetComponent(); animator = CurrentModel.GetComponent(); headTransform = null; if (animator != null) @@ -472,6 +474,7 @@ void ProcessMessage(uOSC.Message message) { lookTargetOSC = new GameObject(); lookTargetOSC.name = "lookTargetOSC"; + vrm10Instance.LookAtTarget = lookTargetOSC.transform; } //位置を書き込む if (lookTargetOSC.transform != null) @@ -481,7 +484,7 @@ void ProcessMessage(uOSC.Message message) } //視線に書き込む - if (vrmLookAtHead != null && setFaceApplyAction == false) + if (vrm10Instance != null && setFaceApplyAction == false) { faceController.BeforeApply += beforeFaceApply; setFaceApplyAction = true; @@ -490,7 +493,7 @@ void ProcessMessage(uOSC.Message message) else { //視線を止める - if (vrmLookAtHead != null && setFaceApplyAction == true) + if (vrm10Instance != null && setFaceApplyAction == true) { faceController.BeforeApply -= beforeFaceApply; setFaceApplyAction = false; diff --git a/Assets/Scripts/ExternalSender/ExternalSender.cs b/Assets/Scripts/ExternalSender/ExternalSender.cs index 56132f67..dde6f2b4 100644 --- a/Assets/Scripts/ExternalSender/ExternalSender.cs +++ b/Assets/Scripts/ExternalSender/ExternalSender.cs @@ -1,14 +1,12 @@ //gpsnmeajp -using RootMotion.FinalIK; using sh_akira; using System; using System.Collections.Generic; using System.Linq; using System.Reflection; using UnityEngine; -using UnityMemoryMappedFile; +using UniVRM10; using uOSC; -using VRM; namespace VMC { @@ -18,7 +16,8 @@ public class ExternalSender : MonoBehaviour GameObject CurrentModel = null; ControlWPFWindow window = null; Animator animator = null; - VRMBlendShapeProxy blendShapeProxy = null; + //VRMBlendShapeProxy blendShapeProxy = null; + Vrm10RuntimeExpression vrm10RuntimeExpression = null; Camera currentCamera = null; UnityMemoryMappedFile.VRMData vrmdata = null; string remoteName = null; @@ -64,7 +63,7 @@ void Start() { this.CurrentModel = CurrentModel; animator = CurrentModel.GetComponent(); - blendShapeProxy = CurrentModel.GetComponent(); + //blendShapeProxy = CurrentModel.GetComponent(); } }; @@ -73,7 +72,7 @@ void Start() this.currentCamera = currentCamera; }; - window.VRMmetaLodedAction += (UnityMemoryMappedFile.VRMData vrmdata) => + window.VRMmetaLoadedAction += (UnityMemoryMappedFile.VRMData vrmdata) => { this.vrmdata = vrmdata; this.remoteName = null; @@ -424,10 +423,10 @@ void SendPerFrame() frameOfBone++; //Blendsharp - if (blendShapeProxy == null) + if (vrm10RuntimeExpression == null) { - blendShapeProxy = CurrentModel.GetComponent(); - Debug.Log("ExternalSender: VRMBlendShapeProxy Updated"); + vrm10RuntimeExpression = CurrentModel.GetComponent().Runtime.Expression; + Debug.Log("ExternalSender: Vrm10RuntimeExpression Updated"); } if (frameOfBlendShape > periodBlendShape && periodBlendShape != 0) @@ -435,9 +434,9 @@ void SendPerFrame() frameOfBlendShape = 1; uOSC.Bundle blendShapeBundle = new uOSC.Bundle(uOSC.Timestamp.Immediate); - if (blendShapeProxy != null) + if (vrm10RuntimeExpression != null) { - foreach (var b in blendShapeProxy.GetValues()) + foreach (var b in vrm10RuntimeExpression.GetWeights()) { blendShapeBundle.Add(new uOSC.Message("/VMC/Ext/Blend/Val", b.Key.ToString(), diff --git a/ControlWindowWPF/ControlWindowWPF/VRMImportWindow.xaml.cs b/ControlWindowWPF/ControlWindowWPF/VRMImportWindow.xaml.cs index 8cef957d..e2078300 100644 --- a/ControlWindowWPF/ControlWindowWPF/VRMImportWindow.xaml.cs +++ b/ControlWindowWPF/ControlWindowWPF/VRMImportWindow.xaml.cs @@ -42,9 +42,9 @@ private async void LoadVRMButton_Click(object sender, RoutedEventArgs e) if (ofd.ShowDialog() == true) { - await Globals.Client.SendCommandWaitAsync(new PipeCommands.LoadVRM { Path = ofd.FileName }, d => + await Globals.Client.SendCommandWaitAsync(new PipeCommands.LoadVRMMeta { Path = ofd.FileName }, d => { - var ret = (PipeCommands.ReturnLoadVRM)d; + var ret = (PipeCommands.ReturnLoadVRMMeta)d; Dispatcher.Invoke(() => LoadMetaData(ret.Data)); }); if (Globals.CurrentCommonSettingsWPF.CurrentPathOnVRMFileDialog != System.IO.Path.GetDirectoryName(ofd.FileName)) diff --git a/FastSpringBone10.csproj b/FastSpringBone10.csproj deleted file mode 100644 index 89ef79dd..00000000 --- a/FastSpringBone10.csproj +++ /dev/null @@ -1,772 +0,0 @@ - - - - - 9.0 - - - Debug - AnyCPU - 10.0.20506 - 2.0 - - {15C49320-9FDE-034D-8CF5-23BE8AD1CEC9} - Library - Properties - FastSpringBone10 - v4.7.1 - 512 - . - - - true - full - false - Temp\Bin\Debug\ - UNITY_2022_3_5;UNITY_2022_3;UNITY_2022;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;UNITY_2021_1_OR_NEWER;UNITY_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;UNITY_2022_1_OR_NEWER;UNITY_2022_2_OR_NEWER;UNITY_2022_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_EDITOR_GAME_SERVICES;ENABLE_UNITY_GAME_SERVICES_ANALYTICS_SUPPORT;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_GENERATE_NATIVE_PLUGINS_FOR_ASSEMBLIES_API;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;ENABLE_NAVIGATION_PACKAGE_DEBUG_VISUALIZATION;ENABLE_NAVIGATION_HEIGHTMESH_RUNTIME_SUPPORT;ENABLE_NAVIGATION_UI_REQUIRES_PACKAGE;PLATFORM_STANDALONE;TEXTCORE_1_0_OR_NEWER;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_NVIDIA;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;PLATFORM_INITIALIZES_MEMORY_MANAGER_EXPLICITLY;ENABLE_MONO;NET_4_6;NET_UNITY_4_8;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;TEXTCORE_FONT_ENGINE_1_5_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2;ENABLE_SPRINGBONE_BURST;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER - prompt - 4 - 0169 - True - - - pdbonly - true - Temp\bin\Release\ - prompt - 4 - 0169 - True - - - true - true - false - false - false - - - {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Package - 2.0.21 - Game:1 - StandaloneWindows64:19 - 2022.3.5f1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.AIModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.ARModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.AccessibilityModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.AndroidJNIModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.AnimationModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.AssetBundleModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.AudioModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClothModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterInputModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterRendererModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.ContentLoadModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.CoreModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.CrashReportingModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.DSPGraphModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.DirectorModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.GIModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.GameCenterModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.GridModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.HotReloadModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.IMGUIModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.ImageConversionModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.InputModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.InputLegacyModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.JSONSerializeModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.LocalizationModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.ParticleSystemModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.PerformanceReportingModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.PhysicsModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.Physics2DModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.ProfilerModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.PropertiesModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.ScreenCaptureModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.SharedInternalsModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteMaskModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteShapeModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.StreamingModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.SubstanceModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.SubsystemsModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.TLSModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainPhysicsModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreFontEngineModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreTextEngineModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextRenderingModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.TilemapModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UmbraModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsCommonModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityConnectModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityCurlModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityTestProtocolModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAssetBundleModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAudioModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestTextureModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestWWWModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.VFXModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.VRModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.VehiclesModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.VideoModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.VirtualTexturingModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.WindModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEngine.XRModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.CoreModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.DeviceSimulatorModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.DiagnosticsModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.EditorToolbarModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.GraphViewModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.PresetsUIModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.QuickSearchModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.SceneTemplateModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.SceneViewModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreFontEngineModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreTextEngineModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIBuilderModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsSamplesModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\Managed\UnityEditor.Graphs.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\PlaybackEngines\WindowsStandaloneSupport\UnityEditor.WindowsStandalone.Extensions.dll - - - Library\PackageCache\com.unity.analytics@3.8.1\Unity.Analytics.Tracker.dll - - - Library\PackageCache\com.unity.analytics@3.8.1\Unity.Analytics.Editor.dll - - - Library\PackageCache\com.unity.collab-proxy@2.0.5\Lib\Editor\PlasticSCM\Unity.Plastic.Antlr3.Runtime.dll - - - Library\PackageCache\com.unity.collab-proxy@2.0.5\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll - - - Library\PackageCache\com.unity.collab-proxy@2.0.5\Lib\Editor\PlasticSCM\log4netPlastic.dll - - - Assets\VRoidSDK\Bin\Pixiv.VroidSdk.dll - - - Assets\ExternalPlugins\UnityMemoryMappedFile\UnityMemoryMappedFile.dll - - - Library\PackageCache\com.unity.nuget.newtonsoft-json@3.2.1\Runtime\Newtonsoft.Json.dll - - - Assets\VRoidSDK\Bin\Pixiv.VroidSdk.Unity.dll - - - Assets\ExternalPlugins\SteamVR\Input\Plugins\JSON.NET\Valve.Newtonsoft.Json.dll - - - Library\PackageCache\com.unity.collab-proxy@2.0.5\Lib\Editor\PlasticSCM\unityplastic.dll - - - Library\PackageCache\com.unity.analytics@3.8.1\AnalyticsStandardEvents\Unity.Analytics.StandardEvents.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Core.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Runtime.Serialization.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Xml.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Xml.Linq.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Numerics.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Numerics.Vectors.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Net.Http.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.IO.Compression.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Microsoft.CSharp.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Data.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Data.DataSetExtensions.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Drawing.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.IO.Compression.FileSystem.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.ComponentModel.Composition.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\System.Transactions.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\Microsoft.Win32.Primitives.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\netstandard.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.AppContext.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Buffers.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Collections.Concurrent.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Collections.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Collections.NonGeneric.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Collections.Specialized.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ComponentModel.Annotations.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ComponentModel.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ComponentModel.EventBasedAsync.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ComponentModel.Primitives.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ComponentModel.TypeConverter.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Console.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Data.Common.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Diagnostics.Contracts.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Diagnostics.Debug.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Diagnostics.FileVersionInfo.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Diagnostics.Process.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Diagnostics.StackTrace.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Diagnostics.TextWriterTraceListener.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Diagnostics.Tools.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Diagnostics.TraceSource.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Drawing.Primitives.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Dynamic.Runtime.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Globalization.Calendars.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Globalization.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Globalization.Extensions.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.Compression.ZipFile.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.FileSystem.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.FileSystem.DriveInfo.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.FileSystem.Primitives.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.FileSystem.Watcher.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.IsolatedStorage.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.MemoryMappedFiles.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.Pipes.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.IO.UnmanagedMemoryStream.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Linq.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Linq.Expressions.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Linq.Parallel.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Linq.Queryable.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Memory.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.Http.Rtc.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.NameResolution.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.NetworkInformation.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.Ping.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.Primitives.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.Requests.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.Security.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.Sockets.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.WebHeaderCollection.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.WebSockets.Client.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Net.WebSockets.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ObjectModel.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Reflection.DispatchProxy.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Reflection.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Reflection.Emit.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Reflection.Emit.ILGeneration.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Reflection.Emit.Lightweight.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Reflection.Extensions.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Reflection.Primitives.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Resources.Reader.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Resources.ResourceManager.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Resources.Writer.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.CompilerServices.VisualC.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.Extensions.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.Handles.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.InteropServices.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.InteropServices.RuntimeInformation.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.InteropServices.WindowsRuntime.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.Numerics.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.Serialization.Formatters.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.Serialization.Json.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.Serialization.Primitives.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Runtime.Serialization.Xml.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Security.Claims.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Security.Cryptography.Algorithms.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Security.Cryptography.Csp.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Security.Cryptography.Encoding.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Security.Cryptography.Primitives.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Security.Cryptography.X509Certificates.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Security.Principal.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Security.SecureString.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ServiceModel.Duplex.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ServiceModel.Http.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ServiceModel.NetTcp.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ServiceModel.Primitives.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ServiceModel.Security.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Text.Encoding.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Text.Encoding.Extensions.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Text.RegularExpressions.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Threading.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Threading.Overlapped.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Threading.Tasks.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Threading.Tasks.Extensions.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Threading.Tasks.Parallel.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Threading.Thread.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Threading.ThreadPool.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Threading.Timer.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.ValueTuple.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.ReaderWriter.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XDocument.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XmlDocument.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XmlSerializer.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.dll - - - C:\Program Files\Unity\Hub\Editor\2022.3.5f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll - - - Library\ScriptAssemblies\Unity.Burst.dll - - - Library\ScriptAssemblies\UnityEditor.UI.dll - - - Library\ScriptAssemblies\UnityEngine.UI.dll - - - - - - - - diff --git a/Packages/manifest.json b/Packages/manifest.json index d23ebfba..cbba5662 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -21,7 +21,7 @@ "com.unity.ugui": "1.0.0", "com.unity.xr.management": "4.4.0", "com.valvesoftware.unity.openvr": "file:../Assets/ExternalPlugins/SteamVR/OpenVRUnityXRPackage/Editor/com.valvesoftware.unity.openvr-1.1.4.tgz", - "com.vrmc.univrm": "0.112.0", + "com.vrmc.vrm": "0.128.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 70a79d07..4b4541f2 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -38,8 +38,8 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.analytics": "1.0.4", - "com.unity.ugui": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.services.analytics": "1.0.4" }, "url": "https://packages.unity.com" }, @@ -130,11 +130,11 @@ "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.services.core": "1.8.1", "com.unity.modules.androidjni": "1.0.0", - "com.unity.services.core": "1.8.1" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -144,8 +144,8 @@ "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.services.core": "1.10.1" + "com.unity.services.core": "1.10.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -154,9 +154,9 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.modules.androidjni": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -210,9 +210,9 @@ "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -251,9 +251,9 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", + "com.unity.modules.subsystems": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.7" }, "url": "https://packages.unity.com" @@ -269,32 +269,20 @@ } }, "com.vrmc.gltf": { - "version": "0.112.0", + "version": "0.128.0", "depth": 1, "source": "registry", "dependencies": { - "com.vrmc.vrmshaders": "0.112.0", "com.unity.modules.animation": "1.0.0" }, "url": "https://package.openupm.com" }, - "com.vrmc.univrm": { - "version": "0.112.0", + "com.vrmc.vrm": { + "version": "0.128.0", "depth": 0, "source": "registry", "dependencies": { - "com.vrmc.vrmshaders": "0.112.0", - "com.vrmc.gltf": "0.112.0", - "com.unity.ugui": "1.0.0" - }, - "url": "https://package.openupm.com" - }, - "com.vrmc.vrmshaders": { - "version": "0.112.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.imageconversion": "1.0.0" + "com.vrmc.gltf": "0.128.0" }, "url": "https://package.openupm.com" }, diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index f4261d25..4044b862 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -6,7 +6,7 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 5 m_QualitySettings: - - serializedVersion: 2 + - serializedVersion: 3 name: Very Low pixelLightCount: 0 shadows: 0 @@ -18,23 +18,44 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 1 - textureQuality: 1 + skinWeights: 1 + globalTextureMipmapLimit: 1 + textureMipmapLimitSettings: [] anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.3 maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Low pixelLightCount: 0 shadows: 0 @@ -46,23 +67,44 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.4 maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 16 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Medium pixelLightCount: 1 shadows: 1 @@ -74,23 +116,44 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 25 lodBias: 0.7 maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 64 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: High pixelLightCount: 2 shadows: 2 @@ -102,23 +165,44 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 2 - textureQuality: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 50 lodBias: 1 maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Very High pixelLightCount: 3 shadows: 2 @@ -130,23 +214,44 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 + skinWeights: 4 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 50 lodBias: 1.5 maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Ultra pixelLightCount: 4 shadows: 2 @@ -158,28 +263,51 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 + skinWeights: 4 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 100 lodBias: 2 maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4096 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] + m_TextureMipmapLimitGroupNames: [] m_PerPlatformDefaultQuality: Android: 2 Nintendo 3DS: 5 Nintendo Switch: 5 PS4: 5 PSP2: 2 + Server: 0 Standalone: 5 Tizen: 2 WebGL: 3 diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 00000000..cfaebd7a --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60 diff --git a/UnityMemoryMappedFile/PipeCommands.cs b/UnityMemoryMappedFile/PipeCommands.cs index f9994afd..c5033b59 100644 --- a/UnityMemoryMappedFile/PipeCommands.cs +++ b/UnityMemoryMappedFile/PipeCommands.cs @@ -35,7 +35,7 @@ public class SetIsBeta public bool IsBeta { get; set; } } - public class LoadVRM + public class LoadVRMMeta { public string Path { get; set; } } @@ -45,7 +45,7 @@ public class LoadRemoteVRM public string Path { get; set; } } - public class ReturnLoadVRM + public class ReturnLoadVRMMeta { public VRMData Data { get; set; } }