diff --git a/Assets/UniGLTF.Samples.meta b/Assets/UniGLTF/Runtime/Scenes.meta similarity index 100% rename from Assets/UniGLTF.Samples.meta rename to Assets/UniGLTF/Runtime/Scenes.meta diff --git a/Assets/UniGLTF.Samples/LookDev.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev.meta diff --git a/Assets/UniGLTF.Samples/LookDev/RenderingServicePostProcessingProfile.asset b/Assets/UniGLTF/Runtime/Scenes/LookDev/RenderingServicePostProcessingProfile.asset similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/RenderingServicePostProcessingProfile.asset rename to Assets/UniGLTF/Runtime/Scenes/LookDev/RenderingServicePostProcessingProfile.asset diff --git a/Assets/UniGLTF.Samples/LookDev/RenderingServicePostProcessingProfile.asset.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/RenderingServicePostProcessingProfile.asset.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/RenderingServicePostProcessingProfile.asset.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/RenderingServicePostProcessingProfile.asset.meta diff --git a/Assets/UniGLTF.Samples/LookDev/ballroom_1k.unity b/Assets/UniGLTF/Runtime/Scenes/LookDev/ballroom_1k.unity similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/ballroom_1k.unity rename to Assets/UniGLTF/Runtime/Scenes/LookDev/ballroom_1k.unity diff --git a/Assets/UniGLTF.Samples/LookDev/ballroom_1k.unity.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/ballroom_1k.unity.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/ballroom_1k.unity.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/ballroom_1k.unity.meta diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap.meta diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/ballroom_1k.exr b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/ballroom_1k.exr similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/ballroom_1k.exr rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/ballroom_1k.exr diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/ballroom_1k.exr.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/ballroom_1k.exr.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/ballroom_1k.exr.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/ballroom_1k.exr.meta diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/ballroom_1k.mat b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/ballroom_1k.mat similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/ballroom_1k.mat rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/ballroom_1k.mat diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/ballroom_1k.mat.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/ballroom_1k.mat.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/ballroom_1k.mat.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/ballroom_1k.mat.meta diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/lilienstein_1k.exr b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/lilienstein_1k.exr similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/lilienstein_1k.exr rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/lilienstein_1k.exr diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/lilienstein_1k.exr.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/lilienstein_1k.exr.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/lilienstein_1k.exr.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/lilienstein_1k.exr.meta diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/lilienstein_1k.mat b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/lilienstein_1k.mat similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/lilienstein_1k.mat rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/lilienstein_1k.mat diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/lilienstein_1k.mat.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/lilienstein_1k.mat.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/lilienstein_1k.mat.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/lilienstein_1k.mat.meta diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/moonless_golf_1k.exr b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/moonless_golf_1k.exr similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/moonless_golf_1k.exr rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/moonless_golf_1k.exr diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/moonless_golf_1k.exr.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/moonless_golf_1k.exr.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/moonless_golf_1k.exr.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/moonless_golf_1k.exr.meta diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/moonless_golf_1k.mat b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/moonless_golf_1k.mat similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/moonless_golf_1k.mat rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/moonless_golf_1k.mat diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/moonless_golf_1k.mat.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/moonless_golf_1k.mat.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/moonless_golf_1k.mat.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/moonless_golf_1k.mat.meta diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/spruit_sunrise_1k.exr b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/spruit_sunrise_1k.exr similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/spruit_sunrise_1k.exr rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/spruit_sunrise_1k.exr diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/spruit_sunrise_1k.exr.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/spruit_sunrise_1k.exr.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/spruit_sunrise_1k.exr.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/spruit_sunrise_1k.exr.meta diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/spruit_sunrise_1k.mat b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/spruit_sunrise_1k.mat similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/spruit_sunrise_1k.mat rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/spruit_sunrise_1k.mat diff --git a/Assets/UniGLTF.Samples/LookDev/cubemap/spruit_sunrise_1k.mat.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/spruit_sunrise_1k.mat.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/cubemap/spruit_sunrise_1k.mat.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/cubemap/spruit_sunrise_1k.mat.meta diff --git a/Assets/UniGLTF.Samples/LookDev/floor.mat b/Assets/UniGLTF/Runtime/Scenes/LookDev/floor.mat similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/floor.mat rename to Assets/UniGLTF/Runtime/Scenes/LookDev/floor.mat diff --git a/Assets/UniGLTF.Samples/LookDev/floor.mat.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/floor.mat.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/floor.mat.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/floor.mat.meta diff --git a/Assets/UniGLTF.Samples/LookDev/floor.prefab b/Assets/UniGLTF/Runtime/Scenes/LookDev/floor.prefab similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/floor.prefab rename to Assets/UniGLTF/Runtime/Scenes/LookDev/floor.prefab diff --git a/Assets/UniGLTF.Samples/LookDev/floor.prefab.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/floor.prefab.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/floor.prefab.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/floor.prefab.meta diff --git a/Assets/UniGLTF.Samples/LookDev/lilienstein_1k.unity b/Assets/UniGLTF/Runtime/Scenes/LookDev/lilienstein_1k.unity similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/lilienstein_1k.unity rename to Assets/UniGLTF/Runtime/Scenes/LookDev/lilienstein_1k.unity diff --git a/Assets/UniGLTF.Samples/LookDev/lilienstein_1k.unity.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/lilienstein_1k.unity.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/lilienstein_1k.unity.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/lilienstein_1k.unity.meta diff --git a/Assets/UniGLTF.Samples/LookDev/moonless_golf_1k.unity b/Assets/UniGLTF/Runtime/Scenes/LookDev/moonless_golf_1k.unity similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/moonless_golf_1k.unity rename to Assets/UniGLTF/Runtime/Scenes/LookDev/moonless_golf_1k.unity diff --git a/Assets/UniGLTF.Samples/LookDev/moonless_golf_1k.unity.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/moonless_golf_1k.unity.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/moonless_golf_1k.unity.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/moonless_golf_1k.unity.meta diff --git a/Assets/UniGLTF.Samples/LookDev/spruit_sunrise_1k.unity b/Assets/UniGLTF/Runtime/Scenes/LookDev/spruit_sunrise_1k.unity similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/spruit_sunrise_1k.unity rename to Assets/UniGLTF/Runtime/Scenes/LookDev/spruit_sunrise_1k.unity diff --git a/Assets/UniGLTF.Samples/LookDev/spruit_sunrise_1k.unity.meta b/Assets/UniGLTF/Runtime/Scenes/LookDev/spruit_sunrise_1k.unity.meta similarity index 100% rename from Assets/UniGLTF.Samples/LookDev/spruit_sunrise_1k.unity.meta rename to Assets/UniGLTF/Runtime/Scenes/LookDev/spruit_sunrise_1k.unity.meta diff --git a/Assets/VRM.Samples/VRM.Samples.asmdef b/Assets/VRM.Samples/VRM.Samples.asmdef deleted file mode 100644 index 1e14a7444..000000000 --- a/Assets/VRM.Samples/VRM.Samples.asmdef +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "VRM.Samples", - "references": [ - "GUID:05dd262a0c0a2f841b8252c8c3815582", - "GUID:b7aa47b240b57de44a4b2021c143c9bf", - "GUID:8d76e605759c3f64a957d63ef96ada7c", - "GUID:da3e51d19d51a544fa14d43fee843098" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/VRM.Samples.meta b/Assets/VRM/Samples.meta similarity index 78% rename from Assets/VRM.Samples.meta rename to Assets/VRM/Samples.meta index 1763a8756..12702a4d8 100644 --- a/Assets/VRM.Samples.meta +++ b/Assets/VRM/Samples.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: 20ae97a2cd4bae04cbce95721fa3d788 folderAsset: yes -timeCreated: 1546842579 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/VRM.Samples/Scenes.meta b/Assets/VRM/Samples/AnimationBridgeSample.meta similarity index 100% rename from Assets/VRM.Samples/Scenes.meta rename to Assets/VRM/Samples/AnimationBridgeSample.meta diff --git a/Assets/VRM.Samples/Scripts/AnimationBridge.cs b/Assets/VRM/Samples/AnimationBridgeSample/AnimationBridge.cs similarity index 100% rename from Assets/VRM.Samples/Scripts/AnimationBridge.cs rename to Assets/VRM/Samples/AnimationBridgeSample/AnimationBridge.cs diff --git a/Assets/VRM.Samples/Scripts/AnimationBridge.cs.meta b/Assets/VRM/Samples/AnimationBridgeSample/AnimationBridge.cs.meta similarity index 100% rename from Assets/VRM.Samples/Scripts/AnimationBridge.cs.meta rename to Assets/VRM/Samples/AnimationBridgeSample/AnimationBridge.cs.meta diff --git a/Assets/VRM.Samples/Scenes/AnimationBridgeSample.anim b/Assets/VRM/Samples/AnimationBridgeSample/AnimationBridgeSample.anim similarity index 100% rename from Assets/VRM.Samples/Scenes/AnimationBridgeSample.anim rename to Assets/VRM/Samples/AnimationBridgeSample/AnimationBridgeSample.anim diff --git a/Assets/VRM.Samples/Scenes/AnimationBridgeSample.anim.meta b/Assets/VRM/Samples/AnimationBridgeSample/AnimationBridgeSample.anim.meta similarity index 100% rename from Assets/VRM.Samples/Scenes/AnimationBridgeSample.anim.meta rename to Assets/VRM/Samples/AnimationBridgeSample/AnimationBridgeSample.anim.meta diff --git a/Assets/VRM.Samples/Editor.meta b/Assets/VRM/Samples/FirstPersonSample.meta similarity index 58% rename from Assets/VRM.Samples/Editor.meta rename to Assets/VRM/Samples/FirstPersonSample.meta index 8b017e0e5..c3a24c652 100644 --- a/Assets/VRM.Samples/Editor.meta +++ b/Assets/VRM/Samples/FirstPersonSample.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 91da972a95b58d44e8c74ea97f9bb694 +guid: 87469b38db2f0f140b4722f28fb43074 folderAsset: yes -timeCreated: 1524115554 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/VRM.Samples/Scenes/VRMRuntimeLoaderSample.unity b/Assets/VRM/Samples/FirstPersonSample/FirstPersonSample.unity similarity index 72% rename from Assets/VRM.Samples/Scenes/VRMRuntimeLoaderSample.unity rename to Assets/VRM/Samples/FirstPersonSample/FirstPersonSample.unity index 6dd4cbd08..77289e34c 100644 --- a/Assets/VRM.Samples/Scenes/VRMRuntimeLoaderSample.unity +++ b/Assets/VRM/Samples/FirstPersonSample/FirstPersonSample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,31 +38,31 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.18033902, g: 0.22578256, b: 0.3069559, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,17 +77,28 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -107,13 +118,16 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &147376043 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 147376044} - component: {fileID: 147376046} @@ -128,8 +142,9 @@ GameObject: --- !u!224 &147376044 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 147376043} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -146,22 +161,22 @@ RectTransform: --- !u!114 &147376045 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 147376043} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 32 @@ -179,15 +194,18 @@ MonoBehaviour: --- !u!222 &147376046 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 147376043} + m_CullTransparentMesh: 0 --- !u!1 &267321008 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 267321009} - component: {fileID: 267321012} @@ -203,8 +221,9 @@ GameObject: --- !u!224 &267321009 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 267321008} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -223,12 +242,13 @@ RectTransform: --- !u!114 &267321010 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 267321008} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -242,25 +262,27 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!114 &267321011 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 267321008} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -269,18 +291,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &267321012 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 267321008} + m_CullTransparentMesh: 0 --- !u!1 &283664911 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 283664914} - component: {fileID: 283664913} @@ -295,12 +322,13 @@ GameObject: --- !u!114 &283664912 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283664911} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: m_HorizontalAxis: Horizontal @@ -313,12 +341,13 @@ MonoBehaviour: --- !u!114 &283664913 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283664911} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -327,8 +356,9 @@ MonoBehaviour: --- !u!4 &283664914 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283664911} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -340,9 +370,10 @@ Transform: --- !u!1 &555566558 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 555566559} - component: {fileID: 555566562} @@ -358,8 +389,9 @@ GameObject: --- !u!224 &555566559 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 555566558} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -377,12 +409,13 @@ RectTransform: --- !u!114 &555566560 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 555566558} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -396,44 +429,45 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 555566561} m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &555566561 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 555566558} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -442,18 +476,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &555566562 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 555566558} + m_CullTransparentMesh: 0 --- !u!1 &568975773 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 568975775} - component: {fileID: 568975774} @@ -467,8 +506,9 @@ GameObject: --- !u!114 &568975774 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 568975773} m_Enabled: 1 m_EditorHideFlags: 0 @@ -494,8 +534,9 @@ MonoBehaviour: --- !u!4 &568975775 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 568975773} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -510,9 +551,10 @@ Transform: --- !u!1 &605703265 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 605703266} - component: {fileID: 605703268} @@ -527,8 +569,9 @@ GameObject: --- !u!224 &605703266 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 605703265} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -545,22 +588,22 @@ RectTransform: --- !u!114 &605703267 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 605703265} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -578,15 +621,18 @@ MonoBehaviour: --- !u!222 &605703268 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 605703265} + m_CullTransparentMesh: 0 --- !u!1 &635962095 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 635962096} - component: {fileID: 635962098} @@ -601,8 +647,9 @@ GameObject: --- !u!224 &635962096 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 635962095} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -620,22 +667,22 @@ RectTransform: --- !u!114 &635962097 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 635962095} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 @@ -646,15 +693,18 @@ MonoBehaviour: --- !u!222 &635962098 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 635962095} + m_CullTransparentMesh: 0 --- !u!1 &646222218 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 646222219} - component: {fileID: 646222221} @@ -669,8 +719,9 @@ GameObject: --- !u!224 &646222219 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 646222218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -687,22 +738,22 @@ RectTransform: --- !u!114 &646222220 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 646222218} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 32 @@ -720,19 +771,21 @@ MonoBehaviour: --- !u!222 &646222221 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 646222218} + m_CullTransparentMesh: 0 --- !u!1 &772693250 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 772693254} - component: {fileID: 772693251} - - component: {fileID: 772693253} - component: {fileID: 772693252} m_Layer: 0 m_Name: OutPov @@ -744,13 +797,20 @@ GameObject: --- !u!20 &772693251 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 772693250} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, 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 @@ -772,30 +832,25 @@ Camera: 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 - m_StereoMirrorMode: 0 --- !u!81 &772693252 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 772693250} - m_Enabled: 0 ---- !u!124 &772693253 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 772693250} m_Enabled: 0 --- !u!4 &772693254 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 772693250} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 1.2, z: 1} @@ -807,9 +862,10 @@ Transform: --- !u!1 &936781945 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 936781946} - component: {fileID: 936781948} @@ -824,8 +880,9 @@ GameObject: --- !u!224 &936781946 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 936781945} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -842,22 +899,22 @@ RectTransform: --- !u!114 &936781947 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 936781945} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -875,15 +932,18 @@ MonoBehaviour: --- !u!222 &936781948 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 936781945} + m_CullTransparentMesh: 0 --- !u!1 &991744088 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 991744089} - component: {fileID: 991744091} @@ -898,8 +958,9 @@ GameObject: --- !u!224 &991744089 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991744088} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -917,22 +978,22 @@ RectTransform: --- !u!114 &991744090 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991744088} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 @@ -943,15 +1004,18 @@ MonoBehaviour: --- !u!222 &991744091 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991744088} + m_CullTransparentMesh: 0 --- !u!1 &1148284494 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1148284495} - component: {fileID: 1148284496} @@ -965,8 +1029,9 @@ GameObject: --- !u!4 &1148284495 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1148284494} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -978,8 +1043,9 @@ Transform: --- !u!114 &1148284496 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1148284494} m_Enabled: 1 m_EditorHideFlags: 0 @@ -995,9 +1061,10 @@ MonoBehaviour: --- !u!1 &1175289393 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1175289395} - component: {fileID: 1175289394} @@ -1011,16 +1078,19 @@ GameObject: --- !u!108 &1175289394 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1175289393} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.33 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -1030,6 +1100,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1037,18 +1125,23 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1175289395 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1175289393} m_LocalRotation: {x: 0.2571214, y: -0.8612099, z: 0.4380491, w: 0.017861776} m_LocalPosition: {x: 2.84, y: 1.7, z: 2.02} @@ -1060,9 +1153,10 @@ Transform: --- !u!1 &1382317301 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1382317302} - component: {fileID: 1382317304} @@ -1077,8 +1171,9 @@ GameObject: --- !u!224 &1382317302 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382317301} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1095,22 +1190,22 @@ RectTransform: --- !u!114 &1382317303 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382317301} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 32 @@ -1128,15 +1223,18 @@ MonoBehaviour: --- !u!222 &1382317304 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382317301} + m_CullTransparentMesh: 0 --- !u!1 &1396766179 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1396766183} - component: {fileID: 1396766182} @@ -1152,15 +1250,20 @@ GameObject: --- !u!23 &1396766180 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1396766179} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1170,9 +1273,11 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1184,29 +1289,31 @@ MeshRenderer: --- !u!64 &1396766181 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1396766179} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 4 m_Convex: 0 - m_InflateMesh: 0 - m_SkinWidth: 0.01 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &1396766182 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1396766179} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1396766183 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1396766179} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.41} @@ -1218,14 +1325,13 @@ Transform: --- !u!1 &1468129200 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1468129205} - component: {fileID: 1468129204} - - component: {fileID: 1468129203} - - component: {fileID: 1468129202} - component: {fileID: 1468129201} m_Layer: 0 m_Name: FirstPerson @@ -1237,34 +1343,28 @@ GameObject: --- !u!81 &1468129201 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1468129200} - m_Enabled: 0 ---- !u!92 &1468129202 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1468129200} - m_Enabled: 0 ---- !u!124 &1468129203 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1468129200} m_Enabled: 0 --- !u!20 &1468129204 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1468129200} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, 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 @@ -1286,16 +1386,17 @@ Camera: 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 - m_StereoMirrorMode: 0 --- !u!4 &1468129205 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1468129200} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.13, z: -1.29} @@ -1307,13 +1408,13 @@ Transform: --- !u!1 &1919635062 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1919635063} - component: {fileID: 1919635067} - - component: {fileID: 1919635066} - component: {fileID: 1919635065} - component: {fileID: 1919635064} m_Layer: 0 @@ -1326,8 +1427,9 @@ GameObject: --- !u!4 &1919635063 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1919635062} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} m_LocalPosition: {x: -0.261, y: 1.497, z: 0.048} @@ -1339,8 +1441,9 @@ Transform: --- !u!114 &1919635064 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1919635062} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1372,27 +1475,28 @@ MonoBehaviour: --- !u!81 &1919635065 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1919635062} - m_Enabled: 0 ---- !u!124 &1919635066 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1919635062} m_Enabled: 0 --- !u!20 &1919635067 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1919635062} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, 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 @@ -1414,17 +1518,18 @@ Camera: 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 - m_StereoMirrorMode: 0 --- !u!1 &2036452537 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2036452538} - component: {fileID: 2036452541} @@ -1440,8 +1545,9 @@ GameObject: --- !u!224 &2036452538 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036452537} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1459,12 +1565,13 @@ RectTransform: --- !u!114 &2036452539 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036452537} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -1478,44 +1585,45 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 2036452540} m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &2036452540 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036452537} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1524,18 +1632,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &2036452541 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036452537} + m_CullTransparentMesh: 0 --- !u!1 &2082684583 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2082684587} - component: {fileID: 2082684586} @@ -1552,12 +1665,13 @@ GameObject: --- !u!114 &2082684584 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2082684583} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -1568,12 +1682,13 @@ MonoBehaviour: --- !u!114 &2082684585 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2082684583} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 @@ -1589,8 +1704,9 @@ MonoBehaviour: --- !u!223 &2082684586 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2082684583} m_Enabled: 1 serializedVersion: 3 @@ -1609,8 +1725,9 @@ Canvas: --- !u!224 &2082684587 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2082684583} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1631,8 +1748,9 @@ RectTransform: --- !u!114 &2082684588 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2082684583} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1644,9 +1762,10 @@ MonoBehaviour: --- !u!1 &2108006563 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2108006564} - component: {fileID: 2108006566} @@ -1661,8 +1780,9 @@ GameObject: --- !u!224 &2108006564 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108006563} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1680,22 +1800,22 @@ RectTransform: --- !u!114 &2108006565 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108006563} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 @@ -1706,6 +1826,8 @@ MonoBehaviour: --- !u!222 &2108006566 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108006563} + m_CullTransparentMesh: 0 diff --git a/Assets/VRM.Samples/Scenes/VRMRuntimeLoaderSample.unity.meta b/Assets/VRM/Samples/FirstPersonSample/FirstPersonSample.unity.meta similarity index 100% rename from Assets/VRM.Samples/Scenes/VRMRuntimeLoaderSample.unity.meta rename to Assets/VRM/Samples/FirstPersonSample/FirstPersonSample.unity.meta diff --git a/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs b/Assets/VRM/Samples/FirstPersonSample/VRMRuntimeLoader.cs similarity index 100% rename from Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs rename to Assets/VRM/Samples/FirstPersonSample/VRMRuntimeLoader.cs diff --git a/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs.meta b/Assets/VRM/Samples/FirstPersonSample/VRMRuntimeLoader.cs.meta similarity index 100% rename from Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs.meta rename to Assets/VRM/Samples/FirstPersonSample/VRMRuntimeLoader.cs.meta diff --git a/Assets/VRM.Samples/VRM.Samples.asmdef.meta b/Assets/VRM/Samples/RuntimeExporterSample.meta similarity index 57% rename from Assets/VRM.Samples/VRM.Samples.asmdef.meta rename to Assets/VRM/Samples/RuntimeExporterSample.meta index 358c0e71e..41b5d9f5f 100644 --- a/Assets/VRM.Samples/VRM.Samples.asmdef.meta +++ b/Assets/VRM/Samples/RuntimeExporterSample.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 627491ce4646ac8469d7689ab146358b -AssemblyDefinitionImporter: +guid: f6c5567db9a6f4843b19689d5e56e155 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/VRM.Samples/Scripts/CanvasManager.cs b/Assets/VRM/Samples/RuntimeExporterSample/CanvasManager.cs similarity index 100% rename from Assets/VRM.Samples/Scripts/CanvasManager.cs rename to Assets/VRM/Samples/RuntimeExporterSample/CanvasManager.cs diff --git a/Assets/VRM.Samples/Scripts/CanvasManager.cs.meta b/Assets/VRM/Samples/RuntimeExporterSample/CanvasManager.cs.meta similarity index 100% rename from Assets/VRM.Samples/Scripts/CanvasManager.cs.meta rename to Assets/VRM/Samples/RuntimeExporterSample/CanvasManager.cs.meta diff --git a/Assets/VRM.Samples/Scenes/VRMRuntimeExporterSample.unity b/Assets/VRM/Samples/RuntimeExporterSample/RuntimeExporterSample.unity similarity index 71% rename from Assets/VRM.Samples/Scenes/VRMRuntimeExporterSample.unity rename to Assets/VRM/Samples/RuntimeExporterSample/RuntimeExporterSample.unity index 423d932ea..e7c464c24 100644 --- a/Assets/VRM.Samples/Scenes/VRMRuntimeExporterSample.unity +++ b/Assets/VRM/Samples/RuntimeExporterSample/RuntimeExporterSample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,31 +38,31 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -71,23 +71,34 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -107,13 +118,16 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &23707192 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 23707193} - component: {fileID: 23707196} @@ -129,8 +143,9 @@ GameObject: --- !u!224 &23707193 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 23707192} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -148,12 +163,13 @@ RectTransform: --- !u!114 &23707194 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 23707192} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -167,44 +183,45 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 23707195} m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &23707195 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 23707192} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -213,18 +230,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &23707196 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 23707192} + m_CullTransparentMesh: 0 --- !u!1 &92488662 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 92488667} - component: {fileID: 92488666} @@ -241,8 +263,9 @@ GameObject: --- !u!114 &92488663 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92488662} m_Enabled: 1 m_EditorHideFlags: 0 @@ -251,15 +274,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_loadButton: {fileID: 1132913042} m_exportButton: {fileID: 23707194} + UseNormalize: 1 --- !u!114 &92488664 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92488662} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -270,12 +295,13 @@ MonoBehaviour: --- !u!114 &92488665 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92488662} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 @@ -291,8 +317,9 @@ MonoBehaviour: --- !u!223 &92488666 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92488662} m_Enabled: 1 serializedVersion: 3 @@ -311,8 +338,9 @@ Canvas: --- !u!224 &92488667 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92488662} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -331,9 +359,10 @@ RectTransform: --- !u!1 &258802523 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 258802527} - component: {fileID: 258802526} @@ -349,15 +378,20 @@ GameObject: --- !u!23 &258802524 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 258802523} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -367,9 +401,11 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -381,29 +417,31 @@ MeshRenderer: --- !u!64 &258802525 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 258802523} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 4 m_Convex: 0 - m_InflateMesh: 0 - m_SkinWidth: 0.01 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &258802526 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 258802523} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &258802527 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 258802523} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -415,14 +453,13 @@ Transform: --- !u!1 &1109443755 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1109443760} - component: {fileID: 1109443759} - - component: {fileID: 1109443758} - - component: {fileID: 1109443757} - component: {fileID: 1109443756} m_Layer: 0 m_Name: Main Camera @@ -434,34 +471,28 @@ GameObject: --- !u!81 &1109443756 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1109443755} - m_Enabled: 1 ---- !u!124 &1109443757 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1109443755} - m_Enabled: 1 ---- !u!92 &1109443758 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1109443755} m_Enabled: 1 --- !u!20 &1109443759 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1109443755} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, 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 @@ -483,16 +514,17 @@ Camera: 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 - m_StereoMirrorMode: 0 --- !u!4 &1109443760 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1109443755} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -2} @@ -504,9 +536,10 @@ Transform: --- !u!1 &1132913040 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1132913041} - component: {fileID: 1132913044} @@ -522,8 +555,9 @@ GameObject: --- !u!224 &1132913041 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1132913040} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -541,12 +575,13 @@ RectTransform: --- !u!114 &1132913042 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1132913040} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -560,44 +595,45 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1132913043} m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1132913043 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1132913040} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -606,18 +642,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1132913044 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1132913040} + m_CullTransparentMesh: 0 --- !u!1 &1207079224 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1207079226} - component: {fileID: 1207079225} @@ -631,16 +672,19 @@ GameObject: --- !u!108 &1207079225 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1207079224} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 2 @@ -650,6 +694,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -657,18 +719,23 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1207079226 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1207079224} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} @@ -680,9 +747,10 @@ Transform: --- !u!1 &1219439929 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1219439930} - component: {fileID: 1219439932} @@ -697,8 +765,9 @@ GameObject: --- !u!224 &1219439930 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1219439929} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -715,22 +784,22 @@ RectTransform: --- !u!114 &1219439931 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1219439929} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -748,15 +817,18 @@ MonoBehaviour: --- !u!222 &1219439932 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1219439929} + m_CullTransparentMesh: 0 --- !u!1 &1474386474 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1474386477} - component: {fileID: 1474386476} @@ -771,12 +843,13 @@ GameObject: --- !u!114 &1474386475 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1474386474} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: m_HorizontalAxis: Horizontal @@ -789,12 +862,13 @@ MonoBehaviour: --- !u!114 &1474386476 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1474386474} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -803,8 +877,9 @@ MonoBehaviour: --- !u!4 &1474386477 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1474386474} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -816,9 +891,10 @@ Transform: --- !u!1 &1543803957 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1543803958} - component: {fileID: 1543803960} @@ -833,8 +909,9 @@ GameObject: --- !u!224 &1543803958 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1543803957} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -851,22 +928,22 @@ RectTransform: --- !u!114 &1543803959 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1543803957} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -884,6 +961,8 @@ MonoBehaviour: --- !u!222 &1543803960 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1543803957} + m_CullTransparentMesh: 0 diff --git a/Assets/VRM.Samples/Scenes/VRMRuntimeExporterSample.unity.meta b/Assets/VRM/Samples/RuntimeExporterSample/RuntimeExporterSample.unity.meta similarity index 100% rename from Assets/VRM.Samples/Scenes/VRMRuntimeExporterSample.unity.meta rename to Assets/VRM/Samples/RuntimeExporterSample/RuntimeExporterSample.unity.meta diff --git a/Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs b/Assets/VRM/Samples/RuntimeExporterSample/VRMRuntimeExporter.cs similarity index 100% rename from Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs rename to Assets/VRM/Samples/RuntimeExporterSample/VRMRuntimeExporter.cs diff --git a/Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs.meta b/Assets/VRM/Samples/RuntimeExporterSample/VRMRuntimeExporter.cs.meta similarity index 100% rename from Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs.meta rename to Assets/VRM/Samples/RuntimeExporterSample/VRMRuntimeExporter.cs.meta diff --git a/Assets/VRM/Samples/SimpleViewer.meta b/Assets/VRM/Samples/SimpleViewer.meta new file mode 100644 index 000000000..bbaff45c2 --- /dev/null +++ b/Assets/VRM/Samples/SimpleViewer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 510324eca14aa8f48b3b00a354731c60 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM.Samples/Scripts.meta b/Assets/VRM/Samples/SimpleViewer/Scripts.meta similarity index 100% rename from Assets/VRM.Samples/Scripts.meta rename to Assets/VRM/Samples/SimpleViewer/Scripts.meta diff --git a/Assets/VRM.Samples/Scripts/AIUEO.cs b/Assets/VRM/Samples/SimpleViewer/Scripts/AIUEO.cs similarity index 100% rename from Assets/VRM.Samples/Scripts/AIUEO.cs rename to Assets/VRM/Samples/SimpleViewer/Scripts/AIUEO.cs diff --git a/Assets/VRM.Samples/Scripts/AIUEO.cs.meta b/Assets/VRM/Samples/SimpleViewer/Scripts/AIUEO.cs.meta similarity index 100% rename from Assets/VRM.Samples/Scripts/AIUEO.cs.meta rename to Assets/VRM/Samples/SimpleViewer/Scripts/AIUEO.cs.meta diff --git a/Assets/VRM.Samples/Scripts/FileDialogForWindows.cs b/Assets/VRM/Samples/SimpleViewer/Scripts/FileDialogForWindows.cs similarity index 100% rename from Assets/VRM.Samples/Scripts/FileDialogForWindows.cs rename to Assets/VRM/Samples/SimpleViewer/Scripts/FileDialogForWindows.cs diff --git a/Assets/VRM.Samples/Scripts/FileDialogForWindows.cs.meta b/Assets/VRM/Samples/SimpleViewer/Scripts/FileDialogForWindows.cs.meta similarity index 100% rename from Assets/VRM.Samples/Scripts/FileDialogForWindows.cs.meta rename to Assets/VRM/Samples/SimpleViewer/Scripts/FileDialogForWindows.cs.meta diff --git a/Assets/VRM.Samples/Scripts/RokuroCamera.cs b/Assets/VRM/Samples/SimpleViewer/Scripts/RokuroCamera.cs similarity index 100% rename from Assets/VRM.Samples/Scripts/RokuroCamera.cs rename to Assets/VRM/Samples/SimpleViewer/Scripts/RokuroCamera.cs diff --git a/Assets/VRM.Samples/Scripts/RokuroCamera.cs.meta b/Assets/VRM/Samples/SimpleViewer/Scripts/RokuroCamera.cs.meta similarity index 100% rename from Assets/VRM.Samples/Scripts/RokuroCamera.cs.meta rename to Assets/VRM/Samples/SimpleViewer/Scripts/RokuroCamera.cs.meta diff --git a/Assets/VRM.Samples/Scripts/TargetMover.cs b/Assets/VRM/Samples/SimpleViewer/Scripts/TargetMover.cs similarity index 100% rename from Assets/VRM.Samples/Scripts/TargetMover.cs rename to Assets/VRM/Samples/SimpleViewer/Scripts/TargetMover.cs diff --git a/Assets/VRM.Samples/Scripts/TargetMover.cs.meta b/Assets/VRM/Samples/SimpleViewer/Scripts/TargetMover.cs.meta similarity index 100% rename from Assets/VRM.Samples/Scripts/TargetMover.cs.meta rename to Assets/VRM/Samples/SimpleViewer/Scripts/TargetMover.cs.meta diff --git a/Assets/VRM.Samples/Scripts/ViewerUI.cs b/Assets/VRM/Samples/SimpleViewer/Scripts/ViewerUI.cs similarity index 100% rename from Assets/VRM.Samples/Scripts/ViewerUI.cs rename to Assets/VRM/Samples/SimpleViewer/Scripts/ViewerUI.cs diff --git a/Assets/VRM.Samples/Scripts/ViewerUI.cs.meta b/Assets/VRM/Samples/SimpleViewer/Scripts/ViewerUI.cs.meta similarity index 100% rename from Assets/VRM.Samples/Scripts/ViewerUI.cs.meta rename to Assets/VRM/Samples/SimpleViewer/Scripts/ViewerUI.cs.meta diff --git a/Assets/VRM.Samples/Scenes/SimpleViewer.unity b/Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity similarity index 99% rename from Assets/VRM.Samples/Scenes/SimpleViewer.unity rename to Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity index c84e01476..025a6e844 100644 --- a/Assets/VRM.Samples/Scenes/SimpleViewer.unity +++ b/Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity @@ -4148,7 +4148,6 @@ GameObject: m_Component: - component: {fileID: 1629460662} - component: {fileID: 1629460661} - - component: {fileID: 1629460659} - component: {fileID: 1629460658} - component: {fileID: 1629460657} m_Layer: 0 @@ -4181,14 +4180,6 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1629460656} m_Enabled: 1 ---- !u!124 &1629460659 -Behaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1629460656} - m_Enabled: 1 --- !u!20 &1629460661 Camera: m_ObjectHideFlags: 0 diff --git a/Assets/VRM.Samples/Scenes/SimpleViewer.unity.meta b/Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity.meta similarity index 100% rename from Assets/VRM.Samples/Scenes/SimpleViewer.unity.meta rename to Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity.meta diff --git a/Assets/VRM.Samples/Editor/Tests.meta b/Assets/VRM/Tests/SampleTests.meta similarity index 100% rename from Assets/VRM.Samples/Editor/Tests.meta rename to Assets/VRM/Tests/SampleTests.meta diff --git a/Assets/VRM.Samples/Resources.meta b/Assets/VRM/Tests/SampleTests/Resources.meta similarity index 100% rename from Assets/VRM.Samples/Resources.meta rename to Assets/VRM/Tests/SampleTests/Resources.meta diff --git a/Assets/VRM.Samples/Resources/Materials.meta b/Assets/VRM/Tests/SampleTests/Resources/Materials.meta similarity index 100% rename from Assets/VRM.Samples/Resources/Materials.meta rename to Assets/VRM/Tests/SampleTests/Resources/Materials.meta diff --git a/Assets/VRM.Samples/Resources/Materials/mtoon_culloff.mat b/Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_culloff.mat similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/mtoon_culloff.mat rename to Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_culloff.mat diff --git a/Assets/VRM.Samples/Resources/Materials/mtoon_culloff.mat.meta b/Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_culloff.mat.meta similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/mtoon_culloff.mat.meta rename to Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_culloff.mat.meta diff --git a/Assets/VRM.Samples/Resources/Materials/mtoon_cutout.mat b/Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_cutout.mat similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/mtoon_cutout.mat rename to Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_cutout.mat diff --git a/Assets/VRM.Samples/Resources/Materials/mtoon_cutout.mat.meta b/Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_cutout.mat.meta similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/mtoon_cutout.mat.meta rename to Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_cutout.mat.meta diff --git a/Assets/VRM.Samples/Resources/Materials/mtoon_opaque.mat b/Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_opaque.mat similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/mtoon_opaque.mat rename to Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_opaque.mat diff --git a/Assets/VRM.Samples/Resources/Materials/mtoon_opaque.mat.meta b/Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_opaque.mat.meta similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/mtoon_opaque.mat.meta rename to Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_opaque.mat.meta diff --git a/Assets/VRM.Samples/Resources/Materials/mtoon_transparent.mat b/Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_transparent.mat similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/mtoon_transparent.mat rename to Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_transparent.mat diff --git a/Assets/VRM.Samples/Resources/Materials/mtoon_transparent.mat.meta b/Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_transparent.mat.meta similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/mtoon_transparent.mat.meta rename to Assets/VRM/Tests/SampleTests/Resources/Materials/mtoon_transparent.mat.meta diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_cutout.mat b/Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_cutout.mat similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/vrm_unlit_cutout.mat rename to Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_cutout.mat diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_cutout.mat.meta b/Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_cutout.mat.meta similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/vrm_unlit_cutout.mat.meta rename to Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_cutout.mat.meta diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_texture.mat b/Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_texture.mat similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/vrm_unlit_texture.mat rename to Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_texture.mat diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_texture.mat.meta b/Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_texture.mat.meta similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/vrm_unlit_texture.mat.meta rename to Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_texture.mat.meta diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent.mat b/Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_transparent.mat similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent.mat rename to Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_transparent.mat diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent.mat.meta b/Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_transparent.mat.meta similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent.mat.meta rename to Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_transparent.mat.meta diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent_zwrite.mat b/Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_transparent_zwrite.mat similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent_zwrite.mat rename to Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_transparent_zwrite.mat diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent_zwrite.mat.meta b/Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_transparent_zwrite.mat.meta similarity index 100% rename from Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent_zwrite.mat.meta rename to Assets/VRM/Tests/SampleTests/Resources/Materials/vrm_unlit_transparent_zwrite.mat.meta diff --git a/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef b/Assets/VRM/Tests/SampleTests/VRM.Samples.Editor.Tests.asmdef similarity index 100% rename from Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef rename to Assets/VRM/Tests/SampleTests/VRM.Samples.Editor.Tests.asmdef diff --git a/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef.meta b/Assets/VRM/Tests/SampleTests/VRM.Samples.Editor.Tests.asmdef.meta similarity index 100% rename from Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef.meta rename to Assets/VRM/Tests/SampleTests/VRM.Samples.Editor.Tests.asmdef.meta diff --git a/Assets/VRM.Samples/Editor/Tests/VRMImportExportTests.cs b/Assets/VRM/Tests/SampleTests/VRMImportExportTests.cs similarity index 100% rename from Assets/VRM.Samples/Editor/Tests/VRMImportExportTests.cs rename to Assets/VRM/Tests/SampleTests/VRMImportExportTests.cs diff --git a/Assets/VRM.Samples/Editor/Tests/VRMImportExportTests.cs.meta b/Assets/VRM/Tests/SampleTests/VRMImportExportTests.cs.meta similarity index 100% rename from Assets/VRM.Samples/Editor/Tests/VRMImportExportTests.cs.meta rename to Assets/VRM/Tests/SampleTests/VRMImportExportTests.cs.meta diff --git a/Assets/VRM.Samples/Editor/Tests/VRMMaterialTests.cs b/Assets/VRM/Tests/SampleTests/VRMMaterialTests.cs similarity index 100% rename from Assets/VRM.Samples/Editor/Tests/VRMMaterialTests.cs rename to Assets/VRM/Tests/SampleTests/VRMMaterialTests.cs diff --git a/Assets/VRM.Samples/Editor/Tests/VRMMaterialTests.cs.meta b/Assets/VRM/Tests/SampleTests/VRMMaterialTests.cs.meta similarity index 100% rename from Assets/VRM.Samples/Editor/Tests/VRMMaterialTests.cs.meta rename to Assets/VRM/Tests/SampleTests/VRMMaterialTests.cs.meta diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index 9219c0c8d..a7fd4867b 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -16,5 +16,22 @@ "dependencies": { "com.vrmc.vrmshaders": "0.80.0", "com.vrmc.unigltf": "2.16.0" - } -} + }, + "samples": [ + { + "displayName": "SimpleViewer", + "description": "VRM runtime loader sample", + "path": "Samples/SimpleViewer" + }, + { + "displayName": "FirstPersonSample", + "description": "First Person layer sample with multi camera", + "path": "Samples/FirstPersonSample" + }, + { + "displayName": "RuntimeExporterSample", + "description": "VRM runtime exporter sample", + "path": "Samples/RuntimeExporterSample" + } + ] +} \ No newline at end of file diff --git a/README.ja.md b/README.ja.md index 3740b9fa0..0257e244d 100644 --- a/README.ja.md +++ b/README.ja.md @@ -3,80 +3,43 @@ # UniVRM -https://github.com/vrm-c/UniVRM - -UniVRM は、VRMフォーマットを読み書きする Unity package です。 - -バージョン `v0.80.0` から、`Unity-2019.4LTS` 以降をサポートします。 -* [Unityのバージョン](https://vrm.dev/docs/univrm/install/unity_version/) - - -* [UniVRMのバージョン](https://vrm.dev/docs/univrm/install/univrm_version/) -* [UniVRMマニュアル](https://vrm.dev/docs/univrm/) - -「UniVRM」は [VRM](https://vrm.dev/vrm_about/) の Unity 実装で、VRMモデルの作成・インポート・エクスポートができます。 +UniVRM は、[VRMフォーマット](https://vrm.dev/vrm_about/) を読み書きする Unity package です。 +VRMモデルの作成・インポート・エクスポートができます。 「VRM」はVRアプリケーション向けの人型3Dアバター（3Dモデル）データを扱うためのファイルフォーマットです。 glTF2.0をベースとしており、誰でも自由に利用することができます。 -インポートされたモデルは、 +## Manual -* [ヒューマノイド](https://vrm.dev/docs/univrm/humanoid/) -* [モデル情報](https://vrm.dev/docs/univrm/meta/) -* [マテリアル](https://vrm.dev/docs/univrm/shaders/) -* [表情制御](https://vrm.dev/docs/univrm/blendshape/) -* [視線制御](https://vrm.dev/docs/univrm/lookat/) -* [SpringBone](https://vrm.dev/docs/univrm/springbone/) -* [FirstPerson](https://vrm.dev/docs/univrm/firstperson/) - -のデータがあります。 +* [UniVRMマニュアル](https://vrm.dev/docs/univrm/) +* [サポートするUnityのバージョン](https://vrm.dev/docs/univrm/install/unity_version/) +* [UniVRMのバージョン](https://vrm.dev/docs/univrm/install/univrm_version/) ## License * [MIT License](./LICENSE.txt) -## Installation +## Install -https://vrm.dev/docs/univrm/install/ +バージョン `v0.80.0` から、`Unity-2019.4LTS` 以降をサポートしています。 -1. 本リポジトリの[リリースページ](https://github.com/vrm-c/UniVRM/releases)へ移動してください。 -1. 最新の``UniVRM0X-0.xx.unitypackage``をダウンロードしてください。 -1. ``UniVRM0X-0.xx.unitypackage``をUnityのプロジェクトにインポートしてください。 - -## Script Samples +### UnityPackage -* [Programming](https://vrm.dev/docs/univrm/programming/) -* [UniVRMサンプル](https://github.com/vrm-c/UniVRM/tree/master/Assets/VRM.Samples) -* [UniVRMTest(テストとサンプル)](https://github.com/vrm-c/UniVRMTest) - -`UniVRM10-*` は vrm-1.0 開発版のパッケージです。 - -## Contributing to UniVRM - -以下コマンドでUniVRMリポジトリをクローンして、UnityでUniVRMフォルダを開きます。 - -```console -$ git clone https://github.com/vrm-c/UniVRM.git -$ cd UniVRM -# MToon などの取得 -$ git submodule update --init --recursive -``` - -[コントリビューションガイド](https://github.com/vrm-c/UniVRM/wiki/コントリビューションガイド(ja))を参照してください。 - -## UPM +### UPM(開発者向け) https://vrm.dev/docs/univrm/install/univrm_upm/ -`v0.66.0` を任意のバージョンに読み替えてください。 +`v0.80.0` を任意のバージョンに読み替えてください。 ``` { "dependencies": { - // ... - "com.vrmc.vrmshaders": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.66.0", - "com.vrmc.unigltf": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.66.0", - "com.vrmc.univrm": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.66.0", - // ... + "com.vrmc.vrmshaders": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.80.0", + "com.vrmc.unigltf": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.80.0", + "com.vrmc.univrm": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.80.0", + // VRM-1.0βを試す場合 + "com.vrmc.univrm1": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM10#v0.80.0", } ``` + +## Folder構成