diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/RenderTexture FadeOut Transparency.unity b/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/RenderTexture FadeOut Transparency.unity index 5383edd35..a77b62149 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/RenderTexture FadeOut Transparency.unity +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/RenderTexture FadeOut Transparency.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 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -54,11 +55,10 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -77,15 +77,18 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 512 m_PVRBounces: 2 - m_PVRFiltering: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 m_PVRFilteringMode: 1 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_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -107,13 +110,15 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &71621966 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 71621967} - component: {fileID: 71621969} @@ -128,7 +133,7 @@ GameObject: --- !u!224 &71621967 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 71621966} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -146,7 +151,7 @@ RectTransform: --- !u!114 &71621968 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 71621966} m_Enabled: 1 @@ -154,7 +159,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Material: {fileID: 0} @@ -182,15 +186,16 @@ MonoBehaviour: --- !u!222 &71621969 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 71621966} + m_CullTransparentMesh: 0 --- !u!1 &334034152 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 334034156} - component: {fileID: 334034155} @@ -207,7 +212,7 @@ GameObject: --- !u!114 &334034153 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 334034152} m_Enabled: 1 @@ -217,7 +222,6 @@ MonoBehaviour: m_EditorClassIdentifier: updateTiming: 1 threadedAnimation: 2 - isUpdatedExternally: 0 animationName: run loop: 1 timeScale: 1 @@ -245,15 +249,17 @@ MonoBehaviour: --- !u!23 &334034154 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 334034152} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, type: 2} m_StaticBatchInfo: @@ -266,6 +272,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -277,14 +284,14 @@ MeshRenderer: --- !u!33 &334034155 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 334034152} m_Mesh: {fileID: 0} --- !u!4 &334034156 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 334034152} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -297,7 +304,7 @@ Transform: --- !u!114 &334034157 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 334034152} m_Enabled: 1 @@ -328,7 +335,7 @@ MonoBehaviour: physicsMovementRelativeTo: {fileID: 0} threadedMeshGeneration: 2 singleSubmesh: 0 - maskInteraction: 0 + fixDrawOrder: 0 fixPrefabOverrideViaMeshFilter: 2 wasDeprecatedTransferred: 1 zSpacingDeprecated: 0 @@ -341,9 +348,9 @@ MonoBehaviour: --- !u!1 &541830406 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 541830407} - component: {fileID: 541830409} @@ -358,7 +365,7 @@ GameObject: --- !u!224 &541830407 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 541830406} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -376,7 +383,7 @@ RectTransform: --- !u!114 &541830408 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 541830406} m_Enabled: 1 @@ -384,7 +391,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Material: {fileID: 0} @@ -414,15 +420,16 @@ MonoBehaviour: --- !u!222 &541830409 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 541830406} + m_CullTransparentMesh: 0 --- !u!1 &592567553 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 592567554} - component: {fileID: 592567556} @@ -437,7 +444,7 @@ GameObject: --- !u!224 &592567554 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 592567553} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -460,7 +467,7 @@ RectTransform: --- !u!114 &592567555 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 592567553} m_Enabled: 1 @@ -468,7 +475,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_UiScaleMode: 1 @@ -485,7 +491,7 @@ MonoBehaviour: --- !u!223 &592567556 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 592567553} m_Enabled: 1 @@ -505,9 +511,9 @@ Canvas: --- !u!1 &1089682726 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1089682727} m_Layer: 0 @@ -520,7 +526,7 @@ GameObject: --- !u!224 &1089682727 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1089682726} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -538,9 +544,9 @@ RectTransform: --- !u!1 &1368805070 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1368805071} - component: {fileID: 1368805072} @@ -554,7 +560,7 @@ GameObject: --- !u!4 &1368805071 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1368805070} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -567,7 +573,7 @@ Transform: --- !u!114 &1368805072 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1368805070} m_Enabled: 1 @@ -577,13 +583,13 @@ MonoBehaviour: m_EditorClassIdentifier: renderTextureFadeout: {fileID: 1786065619} renderTextureFadeoutCanvas: {fileID: 1911967443} - normalSkeletonRenderer: {fileID: 0} + normalSkeletonRenderer: {fileID: 334034157} --- !u!1 &1369381599 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1369381601} - component: {fileID: 1369381600} @@ -598,7 +604,7 @@ GameObject: --- !u!108 &1369381600 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1369381599} m_Enabled: 1 @@ -625,22 +631,9 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 - m_FalloffTable: - m_Table[0]: 0 - m_Table[1]: 0 - m_Table[2]: 0 - m_Table[3]: 0 - m_Table[4]: 0 - m_Table[5]: 0 - m_Table[6]: 0 - m_Table[7]: 0 - m_Table[8]: 0 - m_Table[9]: 0 - m_Table[10]: 0 - m_Table[11]: 0 - m_Table[12]: 0 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_ShadowRadius: 0 @@ -648,7 +641,7 @@ Light: --- !u!4 &1369381601 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1369381599} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} @@ -661,7 +654,7 @@ Transform: --- !u!114 &1369381602 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1369381599} m_Enabled: 1 @@ -669,7 +662,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Version: 1 @@ -683,9 +675,9 @@ MonoBehaviour: --- !u!1 &1407691187 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1407691190} - component: {fileID: 1407691189} @@ -700,20 +692,24 @@ GameObject: --- !u!81 &1407691188 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1407691187} m_Enabled: 1 --- !u!20 &1407691189 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1407691187} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0.43316126, g: 0.5290042, b: 0.5849056, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -735,15 +731,15 @@ 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 &1407691190 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1407691187} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -756,9 +752,9 @@ Transform: --- !u!1 &1606174180 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1606174183} - component: {fileID: 1606174182} @@ -773,7 +769,7 @@ GameObject: --- !u!114 &1606174181 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1606174180} m_Enabled: 1 @@ -781,7 +777,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: - m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_HorizontalAxis: Horizontal @@ -794,7 +789,7 @@ MonoBehaviour: --- !u!114 &1606174182 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1606174180} m_Enabled: 1 @@ -802,7 +797,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: - m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_FirstSelected: {fileID: 0} @@ -811,7 +805,7 @@ MonoBehaviour: --- !u!4 &1606174183 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1606174180} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -824,9 +818,9 @@ Transform: --- !u!1 &1682675645 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1682675646} - component: {fileID: 1682675648} @@ -841,7 +835,7 @@ GameObject: --- !u!224 &1682675646 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1682675645} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -859,7 +853,7 @@ RectTransform: --- !u!114 &1682675647 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1682675645} m_Enabled: 1 @@ -867,7 +861,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Material: {fileID: 0} @@ -902,15 +895,16 @@ MonoBehaviour: --- !u!222 &1682675648 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1682675645} + m_CullTransparentMesh: 0 --- !u!1 &1735507357 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1735507358} - component: {fileID: 1735507360} @@ -925,7 +919,7 @@ GameObject: --- !u!224 &1735507358 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1735507357} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -943,7 +937,7 @@ RectTransform: --- !u!114 &1735507359 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1735507357} m_Enabled: 1 @@ -951,7 +945,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Material: {fileID: 0} @@ -981,15 +974,16 @@ MonoBehaviour: --- !u!222 &1735507360 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1735507357} + m_CullTransparentMesh: 0 --- !u!1 &1786065613 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1786065618} - component: {fileID: 1786065617} @@ -1008,7 +1002,7 @@ GameObject: --- !u!114 &1786065614 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1786065613} m_Enabled: 0 @@ -1016,10 +1010,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 25e6ceb271c9af848ae53f2af1073d0d, type: 3} m_Name: m_EditorClassIdentifier: + color: {r: 1, g: 1, b: 1, a: 1} + maxRenderTextureSize: 1024 + quad: {fileID: 0} + quadMaterial: {fileID: 0} + renderTexture: {fileID: 0} + targetCamera: {fileID: 0} + shaderPasses: 00000000 --- !u!114 &1786065615 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1786065613} m_Enabled: 1 @@ -1029,7 +1030,6 @@ MonoBehaviour: m_EditorClassIdentifier: updateTiming: 1 threadedAnimation: 2 - isUpdatedExternally: 0 animationName: run loop: 1 timeScale: 1 @@ -1057,15 +1057,17 @@ MonoBehaviour: --- !u!23 &1786065616 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1786065613} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, type: 2} m_StaticBatchInfo: @@ -1078,6 +1080,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1089,14 +1092,14 @@ MeshRenderer: --- !u!33 &1786065617 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1786065613} m_Mesh: {fileID: 0} --- !u!4 &1786065618 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1786065613} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1109,7 +1112,7 @@ Transform: --- !u!114 &1786065619 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1786065613} m_Enabled: 0 @@ -1121,7 +1124,7 @@ MonoBehaviour: --- !u!114 &1786065620 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1786065613} m_Enabled: 1 @@ -1152,7 +1155,7 @@ MonoBehaviour: physicsMovementRelativeTo: {fileID: 0} threadedMeshGeneration: 2 singleSubmesh: 0 - maskInteraction: 0 + fixDrawOrder: 0 fixPrefabOverrideViaMeshFilter: 2 wasDeprecatedTransferred: 1 zSpacingDeprecated: 0 @@ -1165,9 +1168,9 @@ MonoBehaviour: --- !u!1 &1799507977 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1799507978} m_Layer: 0 @@ -1180,7 +1183,7 @@ GameObject: --- !u!4 &1799507978 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1799507977} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1194,9 +1197,9 @@ Transform: --- !u!1 &1911967439 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1911967440} - component: {fileID: 1911967442} @@ -1214,7 +1217,7 @@ GameObject: --- !u!224 &1911967440 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1911967439} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1233,7 +1236,7 @@ RectTransform: --- !u!114 &1911967441 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1911967439} m_Enabled: 1 @@ -1280,7 +1283,7 @@ MonoBehaviour: multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} layoutScaleMode: 0 - referenceSize: {x: 2145.5999, y: 1302.059} + referenceSize: {x: 1496.1, y: 1302.059} pivotOffset: {x: 0, y: 0} referenceScale: 1 layoutScale: 1 @@ -1297,13 +1300,14 @@ MonoBehaviour: --- !u!222 &1911967442 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1911967439} + m_CullTransparentMesh: 0 --- !u!114 &1911967443 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1911967439} m_Enabled: 1 @@ -1315,7 +1319,7 @@ MonoBehaviour: --- !u!114 &1911967444 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1911967439} m_Enabled: 1 @@ -1323,10 +1327,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6cbe1f11426513d49ad8e21e9d6643f7, type: 3} m_Name: m_EditorClassIdentifier: + color: {r: 1, g: 1, b: 1, a: 1} + maxRenderTextureSize: 1024 + quad: {fileID: 0} + quadMaterial: {fileID: 2100000, guid: afeb0ae2ea2cda94796515bf8d1b3cb1, type: 2} + renderTexture: {fileID: 0} + targetCamera: {fileID: 0} + shaderPasses: 00000000 + customRenderRect: {fileID: 0} + meshRendererMaterialForTexture: + - texture: {fileID: 2800000, guid: 4ea2c33e839afb34c98f66e892b3b2d2, type: 3} + material: {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, type: 2} --- !u!114 &1911967445 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1911967439} m_Enabled: 1 @@ -1336,7 +1351,6 @@ MonoBehaviour: m_EditorClassIdentifier: updateTiming: 1 threadedAnimation: 2 - isUpdatedExternally: 0 animationName: run loop: 1 timeScale: 1 diff --git a/spine-unity/Assets/Spine/package.json b/spine-unity/Assets/Spine/package.json index a6042655c..b598690e4 100644 --- a/spine-unity/Assets/Spine/package.json +++ b/spine-unity/Assets/Spine/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.spine-unity", "displayName": "spine-unity Runtime", "description": "This plugin provides the spine-unity runtime core and examples. Spine Examples can be installed via the Samples tab.", - "version": "4.3.27", + "version": "4.3.28", "unity": "2018.3", "author": { "name": "Esoteric Software",