diff --git a/Assets/arts/spines/characters/p0010/p0010.atlas.txt b/Assets/arts/spines/characters/p0010/p0010.atlas.txt index f3247e07c..bfe80fb05 100644 --- a/Assets/arts/spines/characters/p0010/p0010.atlas.txt +++ b/Assets/arts/spines/characters/p0010/p0010.atlas.txt @@ -1,77 +1,179 @@ p0010.png -size:512,512 +size:1717,784 filter:Linear,Linear -eye_L -bounds:445,414,23,19 -offsets:1,1,25,21 -eye_R -bounds:148,2,19,14 -offsets:1,1,21,16 -eye_xuanyun -bounds:485,454,22,22 -gutou -bounds:141,89,70,53 -hand -bounds:148,18,44,69 -hand_L -bounds:232,41,35,39 -offsets:1,1,37,41 -head_1 -bounds:318,421,94,89 -offsets:1,1,96,91 -head_2 -bounds:314,218,43,58 -head_3 -bounds:213,82,41,60 -head_4 -bounds:2,3,94,81 -offsets:1,1,96,83 -head_5 -bounds:98,14,70,48 +pma:true +ding +bounds:610,14,140,77 +eye_l +bounds:498,523,33,29 +offsets:1,1,35,31 +eye_r +bounds:1188,221,31,26 +offsets:1,1,33,28 rotate:90 -head_6 -bounds:345,289,68,51 -offsets:1,1,70,53 -hit_yan1 -bounds:409,386,16,18 -hit_yan2 -bounds:485,432,20,20 -hit_yan3 -bounds:194,2,28,28 -kulou -bounds:345,342,77,62 -offsets:0,1,77,63 +eye_yun +bounds:1589,7,51,51 +fx1/Expl_09_00000 +bounds:901,111,147,141 +offsets:174,75,500,281 +fx1/Expl_09_00002 +bounds:352,228,293,257 +offsets:99,18,500,281 rotate:90 -leg_L -bounds:414,435,69,75 -leg_R -bounds:243,222,69,75 -pelvis -bounds:141,144,97,64 -spine_1 -bounds:141,210,100,87 -upperarm_L_1 -bounds:359,203,33,53 -offsets:1,1,35,55 +fx1/Expl_09_00004 +bounds:2,240,348,281 +offsets:70,0,500,281 +fx1/Expl_09_00006 +bounds:877,501,345,281 +offsets:68,0,500,281 +fx1/Expl_09_00008 +bounds:1224,529,319,253 +offsets:81,12,500,281 +fx1/Expl_09_00010 +bounds:611,245,307,226 +offsets:71,41,500,281 rotate:90 -upperarm_R_1 -bounds:359,238,53,49 -offsets:1,1,55,51 -upperarm_R_2 -bounds:194,32,36,48 -offsets:1,1,38,50 -weapon_1 -bounds:213,299,103,211 -offsets:1,1,105,213 -weapon_2 -bounds:2,86,137,211 -offsets:37,1,213,213 -xuanzhuan -bounds:2,299,209,211 -yinying -bounds:318,278,141,25 +fx1/Expl_09_00012 +bounds:498,554,377,228 +offsets:19,40,500,281 +fx1/Expl_09_00014 +bounds:2,9,339,229 +offsets:113,40,500,281 +fx1/Expl_09_00016 +bounds:343,7,265,219 +offsets:113,40,500,281 +fx1/Expl_09_00018 +bounds:839,501,31,51 +offsets:111,134,500,281 +guan +bounds:839,299,315,200 +offsets:1,1,317,202 +hair_1 +bounds:1224,340,240,187 +hair_l +bounds:1545,529,64,109 +rotate:90 +hair_r +bounds:1606,175,53,106 +offsets:0,1,53,107 +rotate:90 +hand_l_1 +bounds:1188,4,88,88 +offsets:0,1,88,89 +hand_l_2 +bounds:1661,62,37,37 +offsets:1,1,39,39 +hand_l_3 +bounds:1524,4,63,63 +offsets:1,1,65,65 +hand_l_4 +bounds:1278,20,93,69 +offsets:1,1,95,71 +hand_l_5 +bounds:1602,60,57,39 +offsets:1,1,59,41 +hand_r_1 +bounds:1323,91,115,41 +hand_r_2 +bounds:1554,76,46,44 +offsets:1,1,48,46 +hand_r_3 +bounds:1567,122,36,68 +offsets:1,1,38,70 +hand_r_4 +bounds:953,12,85,97 +offsets:1,1,87,99 +hand_r_5 +bounds:1653,475,62,52 +offsets:1,1,64,54 +hand_r_wo +bounds:866,2,90,85 +rotate:90 +head +bounds:1188,94,133,111 +offsets:1,1,135,113 +huiguang +bounds:2,523,494,259 +kua +bounds:1323,134,128,71 +offsets:1,1,130,73 +kulou1_1 +bounds:1453,192,138,151 +offsets:1,1,140,153 +rotate:90 +kulou1_2 +bounds:1136,3,73,50 +offsets:1,1,75,52 +rotate:90 +kulou1_3 +bounds:1605,101,80,72 +offsets:1,1,82,74 +kulou1_4 +bounds:1125,78,61,36 +offsets:1,1,63,38 +kulou1_5 +bounds:1433,14,53,89 +offsets:1,1,55,91 +rotate:90 +kulou1_6 +bounds:1433,14,53,89 +offsets:1,1,55,91 +rotate:90 +kulou1_7 +bounds:1653,394,79,49 +offsets:1,1,81,51 +rotate:90 +kulou1_8 +bounds:1050,69,73,45 +offsets:1,1,75,47 +kulou1_9 +bounds:1373,10,58,79 +offsets:1,1,60,81 +leg_l_1 +bounds:763,2,90,101 +offsets:1,1,92,103 +rotate:90 +leg_l_2 +bounds:1653,336,45,56 +offsets:1,1,47,58 +leg_l_3 +bounds:1040,2,65,94 +offsets:1,1,67,96 +rotate:90 +leg_r_1 +bounds:1156,398,66,101 +offsets:1,1,68,103 +leg_r_2 +bounds:1656,555,38,59 +offsets:1,1,40,61 +rotate:90 +leg_r_3 +bounds:1156,300,53,96 +offsets:1,1,55,98 +pifeng_1 +bounds:1545,595,187,170 +rotate:90 +pifeng_2 +bounds:1217,207,234,131 +qiliu +bounds:1453,132,112,58 +offsets:4,0,116,58 +spine +bounds:1606,230,100,109 +rotate:90 +yan01 +bounds:1466,332,185,195 +yan02 +bounds:1050,116,136,136 +yan03 +bounds:611,93,150,150 +yao +bounds:1440,69,61,112 +rotate:90 +yingzi +bounds:839,254,376,43 +offsets:1,1,378,45 +yun +bounds:763,94,149,136 +offsets:19,6,185,144 rotate:90 -zui -bounds:485,478,24,32 -zui1 -bounds:414,406,29,27 diff --git a/Assets/arts/spines/characters/p0010/p0010.atlas.txt.meta b/Assets/arts/spines/characters/p0010/p0010.atlas.txt.meta index 7af3fde2c..591b37d78 100644 --- a/Assets/arts/spines/characters/p0010/p0010.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0010/p0010.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 365afd9eefed3394b9014760c96f416c TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0010/p0010.png b/Assets/arts/spines/characters/p0010/p0010.png index 9339cba2b..1c714bb46 100644 Binary files a/Assets/arts/spines/characters/p0010/p0010.png and b/Assets/arts/spines/characters/p0010/p0010.png differ diff --git a/Assets/arts/spines/characters/p0010/p0010.png.meta b/Assets/arts/spines/characters/p0010/p0010.png.meta index 236730469..328e9efcd 100644 --- a/Assets/arts/spines/characters/p0010/p0010.png.meta +++ b/Assets/arts/spines/characters/p0010/p0010.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -63,20 +63,44 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -101,30 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/p0010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0010/p0010.skel.bytes b/Assets/arts/spines/characters/p0010/p0010.skel.bytes index 8a5ebb86a..9ea1f8fcd 100644 Binary files a/Assets/arts/spines/characters/p0010/p0010.skel.bytes and b/Assets/arts/spines/characters/p0010/p0010.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0010/p0010.skel.bytes.meta b/Assets/arts/spines/characters/p0010/p0010.skel.bytes.meta index 08fe8bcf7..ac65e47ac 100644 --- a/Assets/arts/spines/characters/p0010/p0010.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0010/p0010.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 4f2cc36d6e75c614ba5aaaedc6a0b455 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0010/p0010_atlas.asset.meta b/Assets/arts/spines/characters/p0010/p0010_atlas.asset.meta index b80a78fea..c45e5b6b6 100644 --- a/Assets/arts/spines/characters/p0010/p0010_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0010/p0010_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0010/p0010_material.mat b/Assets/arts/spines/characters/p0010/p0010_material.mat index 4874983ad..43d14852c 100644 --- a/Assets/arts/spines/characters/p0010/p0010_material.mat +++ b/Assets/arts/spines/characters/p0010/p0010_material.mat @@ -8,9 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: p0010_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ValidKeywords: [] m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -29,6 +28,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -36,9 +36,10 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 1 + - _StraightAlphaInput: 0 - _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/p0010/p0010_material.mat.meta b/Assets/arts/spines/characters/p0010/p0010_material.mat.meta index 751db92aa..19c3c97c9 100644 --- a/Assets/arts/spines/characters/p0010/p0010_material.mat.meta +++ b/Assets/arts/spines/characters/p0010/p0010_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0010/p0010_skeletondata.asset.meta b/Assets/arts/spines/characters/p0010/p0010_skeletondata.asset.meta index 10cb92f9f..9254fc986 100644 --- a/Assets/arts/spines/characters/p0010/p0010_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0010/p0010_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/p0010.prefab b/Assets/prefabs/spine/ui/characters/p0010.prefab index a680b2513..6ec5a855f 100644 --- a/Assets/prefabs/spine/ui/characters/p0010.prefab +++ b/Assets/prefabs/spine/ui/characters/p0010.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