diff --git a/Assets/arts/spines/characters/m10001/m10001.atlas.txt b/Assets/arts/spines/characters/m10001/m10001.atlas.txt index 871f92caa..57a0d88e2 100644 --- a/Assets/arts/spines/characters/m10001/m10001.atlas.txt +++ b/Assets/arts/spines/characters/m10001/m10001.atlas.txt @@ -2,36 +2,40 @@ m10001.png size:1024,1024 filter:Linear,Linear ear_r -bounds:2,35,93,87 +bounds:240,349,93,87 offsets:2,1,97,89 era_l -bounds:240,234,83,88 +bounds:351,643,83,88 offsets:2,1,86,90 eye -bounds:2,2,52,31 +bounds:116,205,52,31 offsets:1,1,54,33 eye1 -bounds:351,480,53,53 +bounds:2,54,53,53 eye_yun -bounds:465,615,43,47 +bounds:729,733,43,47 +rotate:90 huo -bounds:351,535,112,127 +bounds:2,109,112,127 offsets:1,1,114,129 quan1 -bounds:325,303,11,19 +bounds:351,622,11,19 offsets:1,1,13,21 quan2 -bounds:97,104,14,18 +bounds:240,329,14,18 offsets:1,1,16,20 quan3 -bounds:351,459,11,19 +bounds:436,712,11,19 offsets:1,1,13,21 quan4 -bounds:240,214,14,18 +bounds:335,418,14,18 offsets:1,1,16,20 spine -bounds:2,124,236,198 +bounds:2,238,236,198 offsets:2,2,240,202 +yingzi +bounds:351,733,376,43 +offsets:1,1,378,45 zhaozi -bounds:2,324,347,338 +bounds:2,438,347,338 offsets:1,2,349,341 diff --git a/Assets/arts/spines/characters/m10001/m10001.png b/Assets/arts/spines/characters/m10001/m10001.png index 28f610f4e..c6c9a0ed6 100644 Binary files a/Assets/arts/spines/characters/m10001/m10001.png and b/Assets/arts/spines/characters/m10001/m10001.png differ diff --git a/Assets/arts/spines/characters/m10001/m10001.skel.bytes b/Assets/arts/spines/characters/m10001/m10001.skel.bytes index 75c25fd12..8d87a5b34 100644 Binary files a/Assets/arts/spines/characters/m10001/m10001.skel.bytes and b/Assets/arts/spines/characters/m10001/m10001.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10001/m10001_material.mat b/Assets/arts/spines/characters/m10001/m10001_material.mat index e73c62eb7..c35c1ddbf 100644 --- a/Assets/arts/spines/characters/m10001/m10001_material.mat +++ b/Assets/arts/spines/characters/m10001/m10001_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: m10001_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -36,7 +37,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 diff --git a/Assets/arts/spines/characters/m10002/m10002.atlas.txt b/Assets/arts/spines/characters/m10002/m10002.atlas.txt index d0fe68e83..cc5095de3 100644 --- a/Assets/arts/spines/characters/m10002/m10002.atlas.txt +++ b/Assets/arts/spines/characters/m10002/m10002.atlas.txt @@ -1,39 +1,66 @@ m10002.png -size:256,256 +size:1024,1024 filter:Linear,Linear -clothes_1 -bounds:2,35,84,37 +FX1/FX1_00000 +bounds:2,463,300,169 rotate:90 -clothes_2 -bounds:86,61,61,30 +FX1/FX1_00001 +bounds:250,846,300,169 +FX1/FX1_00002 +bounds:2,161,300,169 rotate:90 +FX1/FX1_00003 +bounds:552,846,300,169 +FX1/FX1_00004 +bounds:250,675,300,169 +FX2/FX2_00000 +bounds:218,655,26,18 +offsets:22,15,150,84 +FX2/FX2_00001 +bounds:67,16,49,39 +offsets:27,15,150,84 +FX2/FX2_00002 +bounds:855,781,74,63 +offsets:31,13,150,84 +FX2/FX2_00003 +bounds:854,846,84,65 +offsets:32,12,150,84 +FX2/FX2_00004 +bounds:2,2,53,63 +offsets:62,14,150,84 +rotate:90 +ear_l +bounds:679,761,86,83 +offsets:1,2,88,86 +ear_r +bounds:767,761,86,83 +offsets:1,1,88,85 eye -bounds:2,10,47,23 -gutou -bounds:123,201,70,53 -hair -bounds:195,200,59,54 -head -bounds:2,185,119,69 -hit_yan3 -bounds:188,131,28,28 -kulou -bounds:2,121,77,62 -offsets:0,1,77,63 -leg_L -bounds:154,113,32,37 -leg_R -bounds:184,161,35,37 +bounds:552,739,125,105 +offsets:1,1,127,107 +eye_yun +bounds:552,690,43,47 +hand_l_1 +bounds:940,847,64,64 +offsets:1,1,66,66 +hand_l_2 +bounds:2,57,154,102 +offsets:1,2,156,105 +hand_r +bounds:854,913,154,102 +offsets:1,2,156,105 +shanzi1 +bounds:173,276,109,26 +offsets:1,1,111,28 +rotate:90 +shanzi2 +bounds:218,675,88,26 +offsets:1,1,90,28 +rotate:90 spine -bounds:81,124,59,50 -rotate:90 -upperarm_l -bounds:154,152,28,47 -upperarm_r -bounds:221,156,22,42 -weapon -bounds:41,52,67,43 -rotate:90 +bounds:2,765,246,250 +offsets:2,2,250,254 yingzi -bounds:133,116,83,19 +bounds:173,387,376,43 +offsets:1,1,378,45 rotate:90 diff --git a/Assets/arts/spines/characters/m10002/m10002.atlas.txt.meta b/Assets/arts/spines/characters/m10002/m10002.atlas.txt.meta index 7d54fb094..cd63b53fb 100644 --- a/Assets/arts/spines/characters/m10002/m10002.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10002/m10002.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 2347a9b423f128b43be267642300917f TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10002/m10002.png b/Assets/arts/spines/characters/m10002/m10002.png index f135e7100..9a4e00557 100644 Binary files a/Assets/arts/spines/characters/m10002/m10002.png and b/Assets/arts/spines/characters/m10002/m10002.png differ diff --git a/Assets/arts/spines/characters/m10002/m10002.png.meta b/Assets/arts/spines/characters/m10002/m10002.png.meta index 0196a57e3..53af217b3 100644 --- a/Assets/arts/spines/characters/m10002/m10002.png.meta +++ b/Assets/arts/spines/characters/m10002/m10002.png.meta @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -101,18 +101,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -125,6 +113,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m10002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10002/m10002.skel.bytes b/Assets/arts/spines/characters/m10002/m10002.skel.bytes index 00d008cb3..3188a2127 100644 Binary files a/Assets/arts/spines/characters/m10002/m10002.skel.bytes and b/Assets/arts/spines/characters/m10002/m10002.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10002/m10002.skel.bytes.meta b/Assets/arts/spines/characters/m10002/m10002.skel.bytes.meta index 002188450..e3a3ae31d 100644 --- a/Assets/arts/spines/characters/m10002/m10002.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10002/m10002.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 097bf9b14e05bfe438319cc40e62cfde TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10002/m10002_atlas.asset.meta b/Assets/arts/spines/characters/m10002/m10002_atlas.asset.meta index 9f69d57da..e20f67348 100644 --- a/Assets/arts/spines/characters/m10002/m10002_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10002/m10002_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10002/m10002_material.mat b/Assets/arts/spines/characters/m10002/m10002_material.mat index d08d76fff..aeb25c559 100644 --- a/Assets/arts/spines/characters/m10002/m10002_material.mat +++ b/Assets/arts/spines/characters/m10002/m10002_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10002_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: @@ -29,6 +29,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -39,6 +40,7 @@ Material: - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/m10002/m10002_material.mat.meta b/Assets/arts/spines/characters/m10002/m10002_material.mat.meta index 5549afc78..1e7c92527 100644 --- a/Assets/arts/spines/characters/m10002/m10002_material.mat.meta +++ b/Assets/arts/spines/characters/m10002/m10002_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10002/m10002_skeletondata.asset.meta b/Assets/arts/spines/characters/m10002/m10002_skeletondata.asset.meta index 40d11bfb5..8886704df 100644 --- a/Assets/arts/spines/characters/m10002/m10002_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10002/m10002_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/m10002.prefab b/Assets/prefabs/spine/ui/characters/m10002.prefab index eb1c59bfc..9d4578842 100644 --- a/Assets/prefabs/spine/ui/characters/m10002.prefab +++ b/Assets/prefabs/spine/ui/characters/m10002.prefab @@ -27,6 +27,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2663275627370592771} m_Father: {fileID: 0} @@ -81,6 +82,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 110436067314948100} m_Father: {fileID: 2951863086470196126} @@ -119,6 +121,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2663275627370592771} m_RootOrder: 0 @@ -160,6 +163,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -167,6 +171,13 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 0, y: 0} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 0, y: 0} + editReferenceRect: 0 updateWhenInvisible: 3 allowMultipleCanvasRenderers: 0 canvasRenderers: [] @@ -174,16 +185,20 @@ MonoBehaviour: enableSeparatorSlots: 0 separatorParts: [] updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0