[unity] More skeleton asset updates: Changed example skeleton atlas assets from using PMA to straight alpha for better compatibility with Linear color space.
@ -77,15 +77,17 @@ LightmapSettings:
|
|||||||
m_PVRDirectSampleCount: 32
|
m_PVRDirectSampleCount: 32
|
||||||
m_PVRSampleCount: 500
|
m_PVRSampleCount: 500
|
||||||
m_PVRBounces: 2
|
m_PVRBounces: 2
|
||||||
m_PVRFiltering: 0
|
m_PVRFilterTypeDirect: 0
|
||||||
|
m_PVRFilterTypeIndirect: 0
|
||||||
|
m_PVRFilterTypeAO: 0
|
||||||
m_PVRFilteringMode: 1
|
m_PVRFilteringMode: 1
|
||||||
m_PVRCulling: 1
|
m_PVRCulling: 1
|
||||||
m_PVRFilteringGaussRadiusDirect: 1
|
m_PVRFilteringGaussRadiusDirect: 1
|
||||||
m_PVRFilteringGaussRadiusIndirect: 5
|
m_PVRFilteringGaussRadiusIndirect: 5
|
||||||
m_PVRFilteringGaussRadiusAO: 2
|
m_PVRFilteringGaussRadiusAO: 2
|
||||||
m_PVRFilteringAtrousColorSigma: 1
|
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||||
m_PVRFilteringAtrousNormalSigma: 1
|
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||||
m_PVRFilteringAtrousPositionSigma: 1
|
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||||
m_LightingDataAsset: {fileID: 0}
|
m_LightingDataAsset: {fileID: 0}
|
||||||
m_UseShadowmask: 1
|
m_UseShadowmask: 1
|
||||||
--- !u!196 &4
|
--- !u!196 &4
|
||||||
@ -156,7 +158,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
|
m_Material: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
@ -165,6 +167,10 @@ MonoBehaviour:
|
|||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
skeletonDataAsset: {fileID: 11400000, guid: 3c48535ae5679204c950a22a7caaa5a4, type: 2}
|
skeletonDataAsset: {fileID: 11400000, guid: 3c48535ae5679204c950a22a7caaa5a4, type: 2}
|
||||||
|
additiveMaterial: {fileID: 0}
|
||||||
|
multiplyMaterial: {fileID: 0}
|
||||||
|
screenMaterial: {fileID: 0}
|
||||||
|
m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
initialSkinName: default
|
initialSkinName: default
|
||||||
initialFlipX: 0
|
initialFlipX: 0
|
||||||
initialFlipY: 0
|
initialFlipY: 0
|
||||||
@ -172,16 +178,37 @@ MonoBehaviour:
|
|||||||
startingLoop: 1
|
startingLoop: 1
|
||||||
timeScale: 1
|
timeScale: 1
|
||||||
freeze: 0
|
freeze: 0
|
||||||
unscaledTime: 0
|
layoutScaleMode: 0
|
||||||
|
referenceSize: {x: 491, y: 708}
|
||||||
|
pivotOffset: {x: 0, y: 0}
|
||||||
|
referenceScale: 1
|
||||||
|
layoutScale: 1
|
||||||
|
rectTransformSize: {x: 491, y: 708}
|
||||||
|
editReferenceRect: 0
|
||||||
|
updateWhenInvisible: 3
|
||||||
|
allowMultipleCanvasRenderers: 0
|
||||||
|
canvasRenderers: []
|
||||||
|
separatorSlotNames: []
|
||||||
|
enableSeparatorSlots: 0
|
||||||
|
separatorParts: []
|
||||||
|
updateSeparatorPartLocation: 1
|
||||||
|
updateSeparatorPartScale: 0
|
||||||
|
disableMeshAssignmentOnOverride: 1
|
||||||
|
physicsPositionInheritanceFactor: {x: 1, y: 1}
|
||||||
|
physicsRotationInheritanceFactor: 1
|
||||||
|
physicsMovementRelativeTo: {fileID: 0}
|
||||||
meshGenerator:
|
meshGenerator:
|
||||||
settings:
|
settings:
|
||||||
useClipping: 1
|
useClipping: 1
|
||||||
zSpacing: 0
|
zSpacing: 0
|
||||||
pmaVertexColors: 1
|
|
||||||
tintBlack: 0
|
tintBlack: 0
|
||||||
calculateTangents: 0
|
canvasGroupCompatible: 0
|
||||||
|
pmaVertexColors: 1
|
||||||
addNormals: 0
|
addNormals: 0
|
||||||
|
calculateTangents: 0
|
||||||
immutableTriangles: 0
|
immutableTriangles: 0
|
||||||
|
updateTiming: 1
|
||||||
|
unscaledTime: 0
|
||||||
--- !u!222 &57002146
|
--- !u!222 &57002146
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -221,7 +248,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -12.049179, y: 499.93677}
|
m_AnchoredPosition: {x: -12.049194, y: 499.93677}
|
||||||
m_SizeDelta: {x: 100, y: 54.64}
|
m_SizeDelta: {x: 100, y: 54.64}
|
||||||
m_Pivot: {x: -0.15, y: -2.04}
|
m_Pivot: {x: -0.15, y: -2.04}
|
||||||
--- !u!114 &140863501
|
--- !u!114 &140863501
|
||||||
@ -280,8 +307,11 @@ MonoBehaviour:
|
|||||||
followBoneRotation: 1
|
followBoneRotation: 1
|
||||||
followSkeletonFlip: 1
|
followSkeletonFlip: 1
|
||||||
followLocalScale: 0
|
followLocalScale: 0
|
||||||
|
followParentWorldScale: 0
|
||||||
followXYPosition: 1
|
followXYPosition: 1
|
||||||
followZPosition: 1
|
followZPosition: 1
|
||||||
|
followAttachmentZSpacing: 0
|
||||||
|
maintainedAxisOrientation: 1
|
||||||
--- !u!1 &189134934
|
--- !u!1 &189134934
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -592,7 +622,7 @@ RectTransform:
|
|||||||
m_PrefabParentObject: {fileID: 0}
|
m_PrefabParentObject: {fileID: 0}
|
||||||
m_PrefabInternal: {fileID: 0}
|
m_PrefabInternal: {fileID: 0}
|
||||||
m_GameObject: {fileID: 759111374}
|
m_GameObject: {fileID: 759111374}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0.012304246, w: 0.9999243}
|
m_LocalRotation: {x: 0, y: 0, z: 0.012304263, w: 0.9999243}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@ -601,7 +631,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 164.98044, y: 39.06775}
|
m_AnchoredPosition: {x: 164.98044, y: 39.06778}
|
||||||
m_SizeDelta: {x: 35.7, y: 54.1}
|
m_SizeDelta: {x: 35.7, y: 54.1}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &759111376
|
--- !u!114 &759111376
|
||||||
@ -660,8 +690,11 @@ MonoBehaviour:
|
|||||||
followBoneRotation: 1
|
followBoneRotation: 1
|
||||||
followSkeletonFlip: 1
|
followSkeletonFlip: 1
|
||||||
followLocalScale: 0
|
followLocalScale: 0
|
||||||
|
followParentWorldScale: 0
|
||||||
followXYPosition: 1
|
followXYPosition: 1
|
||||||
followZPosition: 1
|
followZPosition: 1
|
||||||
|
followAttachmentZSpacing: 0
|
||||||
|
maintainedAxisOrientation: 1
|
||||||
--- !u!1 &774800193
|
--- !u!1 &774800193
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -822,7 +855,7 @@ MonoBehaviour:
|
|||||||
m_HandleRect: {fileID: 1918252543}
|
m_HandleRect: {fileID: 1918252543}
|
||||||
m_Direction: 0
|
m_Direction: 0
|
||||||
m_Value: 0
|
m_Value: 0
|
||||||
m_Size: 1
|
m_Size: 0.9999999
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
@ -1120,7 +1153,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
|
m_Material: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
@ -1129,6 +1162,10 @@ MonoBehaviour:
|
|||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
skeletonDataAsset: {fileID: 11400000, guid: a467507a4ffb1d542a558739b2fede77, type: 2}
|
skeletonDataAsset: {fileID: 11400000, guid: a467507a4ffb1d542a558739b2fede77, type: 2}
|
||||||
|
additiveMaterial: {fileID: 0}
|
||||||
|
multiplyMaterial: {fileID: 0}
|
||||||
|
screenMaterial: {fileID: 0}
|
||||||
|
m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
initialSkinName: base
|
initialSkinName: base
|
||||||
initialFlipX: 0
|
initialFlipX: 0
|
||||||
initialFlipY: 0
|
initialFlipY: 0
|
||||||
@ -1136,16 +1173,37 @@ MonoBehaviour:
|
|||||||
startingLoop: 1
|
startingLoop: 1
|
||||||
timeScale: 1
|
timeScale: 1
|
||||||
freeze: 0
|
freeze: 0
|
||||||
unscaledTime: 0
|
layoutScaleMode: 0
|
||||||
|
referenceSize: {x: 535.3857, y: 654.491}
|
||||||
|
pivotOffset: {x: 0, y: 0}
|
||||||
|
referenceScale: 1
|
||||||
|
layoutScale: 1
|
||||||
|
rectTransformSize: {x: 535.3857, y: 654.491}
|
||||||
|
editReferenceRect: 0
|
||||||
|
updateWhenInvisible: 3
|
||||||
|
allowMultipleCanvasRenderers: 0
|
||||||
|
canvasRenderers: []
|
||||||
|
separatorSlotNames: []
|
||||||
|
enableSeparatorSlots: 0
|
||||||
|
separatorParts: []
|
||||||
|
updateSeparatorPartLocation: 1
|
||||||
|
updateSeparatorPartScale: 0
|
||||||
|
disableMeshAssignmentOnOverride: 1
|
||||||
|
physicsPositionInheritanceFactor: {x: 1, y: 1}
|
||||||
|
physicsRotationInheritanceFactor: 1
|
||||||
|
physicsMovementRelativeTo: {fileID: 0}
|
||||||
meshGenerator:
|
meshGenerator:
|
||||||
settings:
|
settings:
|
||||||
useClipping: 1
|
useClipping: 1
|
||||||
zSpacing: 0
|
zSpacing: 0
|
||||||
pmaVertexColors: 1
|
|
||||||
tintBlack: 0
|
tintBlack: 0
|
||||||
calculateTangents: 0
|
canvasGroupCompatible: 0
|
||||||
|
pmaVertexColors: 1
|
||||||
addNormals: 0
|
addNormals: 0
|
||||||
|
calculateTangents: 0
|
||||||
immutableTriangles: 0
|
immutableTriangles: 0
|
||||||
|
updateTiming: 1
|
||||||
|
unscaledTime: 0
|
||||||
--- !u!222 &1384013135
|
--- !u!222 &1384013135
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1228,7 +1286,7 @@ MonoBehaviour:
|
|||||||
m_HandleRect: {fileID: 2091633435}
|
m_HandleRect: {fileID: 2091633435}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 1
|
m_Value: 1
|
||||||
m_Size: 0.27235755
|
m_Size: 0.27162817
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 226 KiB After Width: | Height: | Size: 214 KiB |
|
Before Width: | Height: | Size: 215 KiB After Width: | Height: | Size: 194 KiB |
|
Before Width: | Height: | Size: 277 KiB After Width: | Height: | Size: 260 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 140 KiB After Width: | Height: | Size: 160 KiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 87 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 430 KiB After Width: | Height: | Size: 437 KiB |
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 134 KiB |
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 788 KiB After Width: | Height: | Size: 780 KiB |
|
Before Width: | Height: | Size: 342 KiB After Width: | Height: | Size: 327 KiB |
|
Before Width: | Height: | Size: 360 KiB After Width: | Height: | Size: 342 KiB |
|
Before Width: | Height: | Size: 402 KiB After Width: | Height: | Size: 407 KiB |
|
Before Width: | Height: | Size: 168 KiB After Width: | Height: | Size: 166 KiB |
|
Before Width: | Height: | Size: 311 KiB After Width: | Height: | Size: 580 KiB |
|
Before Width: | Height: | Size: 871 KiB After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 1.5 MiB |
|
Before Width: | Height: | Size: 510 KiB After Width: | Height: | Size: 515 KiB |
|
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 85 KiB |