diff --git a/Assets/arts/spines/characters/m10011.meta b/Assets/arts/spines/characters/m10011.meta new file mode 100644 index 000000000..d0525ee6e --- /dev/null +++ b/Assets/arts/spines/characters/m10011.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11c9cec30472bfc45848676bb940df9a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10011/m10011.atlas.txt b/Assets/arts/spines/characters/m10011/m10011.atlas.txt new file mode 100644 index 000000000..365adfda9 --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011.atlas.txt @@ -0,0 +1,91 @@ +m10011.png +size:256,256 +filter:Linear,Linear +eye_hit +bounds:208,98,22,28 +eye_l +bounds:232,100,26,22 +offsets:1,1,28,24 +rotate:90 +eye_r +bounds:189,50,23,20 +offsets:1,1,25,22 +eye_yun +bounds:232,74,22,24 +gutou +bounds:2,8,39,60 +hair_1 +bounds:138,8,23,34 +hair_2 +bounds:178,98,28,28 +hair_3 +bounds:191,128,31,49 +rotate:90 +hand_l_1 +bounds:136,115,39,31 +offsets:1,1,41,33 +hand_l_2 +bounds:136,148,53,22 +offsets:1,1,55,24 +hand_l_3 +bounds:192,17,17,31 +offsets:1,1,19,33 +hand_l_4 +bounds:189,72,26,24 +offsets:1,1,28,26 +hand_l_5 +bounds:163,13,29,27 +offsets:1,1,31,29 +rotate:90 +hand_r_1 +bounds:112,76,47,22 +rotate:90 +hand_r_2 +bounds:211,17,17,31 +offsets:1,1,19,33 +hand_r_3 +bounds:112,33,41,23 +offsets:1,1,43,25 +rotate:90 +hand_r_4 +bounds:101,2,27,35 +offsets:1,1,29,37 +rotate:90 +head +bounds:41,170,93,59 +offsets:1,1,95,61 +leg_l_1 +bounds:193,210,44,57 +rotate:90 +leg_l_2 +bounds:137,44,41,24 +offsets:1,1,43,26 +rotate:90 +leg_r_1 +bounds:136,172,57,53 +rotate:90 +leg_r_2 +bounds:163,44,41,24 +offsets:1,1,43,26 +rotate:90 +ling +bounds:191,161,57,47 +offsets:1,1,59,49 +spine +bounds:43,31,41,67 +rotate:90 +wei1 +bounds:41,74,69,49 +wei2 +bounds:136,87,26,40 +rotate:90 +wuqi +bounds:2,70,37,159 +offsets:1,1,39,161 +xiabai +bounds:41,125,78,43 +yaodai +bounds:43,2,56,27 +offsets:1,1,58,29 +yingzi +bounds:2,231,189,23 diff --git a/Assets/arts/spines/characters/m10011/m10011.atlas.txt.meta b/Assets/arts/spines/characters/m10011/m10011.atlas.txt.meta new file mode 100644 index 000000000..eda5ccf5d --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 44f828f9d6756da458eb7c6b484be12b +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10011/m10011.png b/Assets/arts/spines/characters/m10011/m10011.png new file mode 100644 index 000000000..8fbed010b Binary files /dev/null and b/Assets/arts/spines/characters/m10011/m10011.png differ diff --git a/Assets/arts/spines/characters/m10011/m10011.png.meta b/Assets/arts/spines/characters/m10011/m10011.png.meta new file mode 100644 index 000000000..93b43937d --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 9f5e0b4ab0de95a498b47814483d1f96 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + 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: 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 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10011/m10011.skel.bytes b/Assets/arts/spines/characters/m10011/m10011.skel.bytes new file mode 100644 index 000000000..112c853af Binary files /dev/null and b/Assets/arts/spines/characters/m10011/m10011.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10011/m10011.skel.bytes.meta b/Assets/arts/spines/characters/m10011/m10011.skel.bytes.meta new file mode 100644 index 000000000..f217af0bf --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aefeec5e1326f8a49834faecad5af399 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10011/m10011_atlas.asset b/Assets/arts/spines/characters/m10011/m10011_atlas.asset new file mode 100644 index 000000000..d084ce7e4 --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011_atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: m10011_atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: 44f828f9d6756da458eb7c6b484be12b, type: 3} + materials: + - {fileID: 2100000, guid: 8cdc8157bf8e4b44da1ab3404251deb1, type: 2} diff --git a/Assets/arts/spines/characters/m10011/m10011_atlas.asset.meta b/Assets/arts/spines/characters/m10011/m10011_atlas.asset.meta new file mode 100644 index 000000000..23f952886 --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 254b7096a6b6e1444af89374ca9a0da1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10011/m10011_material.mat b/Assets/arts/spines/characters/m10011/m10011_material.mat new file mode 100644 index 000000000..7730ab9c8 --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011_material.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: m10011_material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 9f5e0b4ab0de95a498b47814483d1f96, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _Fill: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _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/m10011/m10011_material.mat.meta b/Assets/arts/spines/characters/m10011/m10011_material.mat.meta new file mode 100644 index 000000000..9abe84300 --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8cdc8157bf8e4b44da1ab3404251deb1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10011/m10011_skeletondata.asset b/Assets/arts/spines/characters/m10011/m10011_skeletondata.asset new file mode 100644 index 000000000..184443e26 --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011_skeletondata.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: m10011_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 254b7096a6b6e1444af89374ca9a0da1, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: aefeec5e1326f8a49834faecad5af399, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/m10011/m10011_skeletondata.asset.meta b/Assets/arts/spines/characters/m10011/m10011_skeletondata.asset.meta new file mode 100644 index 000000000..2944c3db0 --- /dev/null +++ b/Assets/arts/spines/characters/m10011/m10011_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: adf1d7da390c55a4a987056221442709 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10012/m10012.atlas.txt b/Assets/arts/spines/characters/m10012/m10012.atlas.txt index 8bde3de83..f1b271c8c 100644 --- a/Assets/arts/spines/characters/m10012/m10012.atlas.txt +++ b/Assets/arts/spines/characters/m10012/m10012.atlas.txt @@ -1,47 +1,62 @@ m10012.png size:512,512 filter:Linear,Linear -canying -bounds:2,156,113,148 -offsets:3,5,119,156 -clothes -bounds:88,56,98,58 -rotate:90 -eye -bounds:471,447,35,59 -offsets:0,0,36,59 -eye_xuanyun -bounds:143,308,22,22 +eye_hit +bounds:118,174,22,28 +eye_l +bounds:261,392,9,9 +offsets:1,1,11,11 +eye_r +bounds:278,406,9,9 +offsets:1,1,11,11 +eye_xx +bounds:175,243,17,21 +eye_yun +bounds:384,432,22,24 gutou -bounds:117,234,70,53 -rotate:90 -hair -bounds:345,435,124,71 -hand_l -bounds:331,358,90,75 -hand_r -bounds:400,305,49,60 +bounds:278,417,39,60 rotate:90 +hair_1 +bounds:175,347,84,54 +hair_2 +bounds:75,151,41,51 +hand_l_1 +bounds:340,420,42,36 +offsets:1,1,44,38 +hand_l_2 +bounds:2,27,43,44 +offsets:1,1,45,46 +hand_l_3 +bounds:2,2,28,23 +offsets:1,1,30,25 +hand_r_1 +bounds:175,266,41,35 +offsets:1,1,43,37 +hand_r_2 +bounds:142,228,31,30 +offsets:1,1,33,32 +hand_r_3 +bounds:226,316,29,29 +offsets:1,1,31,31 head -bounds:143,332,118,107 -hit_yan3 -bounds:462,326,28,28 -kulou -bounds:423,356,77,62 -offsets:0,1,77,63 -rotate:90 -leg_l -bounds:117,164,47,68 -leg_r -bounds:331,308,48,67 -rotate:90 +bounds:2,73,59,58 +offsets:1,1,61,60 +heikuang_l +bounds:75,133,19,16 +offsets:1,1,21,18 +heikuang_r +bounds:63,115,18,16 +offsets:1,1,20,18 +maozi +bounds:2,204,138,54 +offsets:1,1,140,56 spine -bounds:2,306,139,133 -upperarm_l -bounds:2,38,84,116 -upperarm_r -bounds:263,333,66,106 -weapon -bounds:2,441,341,65 -yingzi -bounds:2,17,83,19 +bounds:2,133,71,69 +touding +bounds:175,303,49,42 +offsets:1,1,51,44 +wei +bounds:175,403,101,53 +wuqi +bounds:2,260,171,196 +offsets:1,1,173,198 diff --git a/Assets/arts/spines/characters/m10012/m10012.atlas.txt.meta b/Assets/arts/spines/characters/m10012/m10012.atlas.txt.meta index c3c3a4012..3c26b743d 100644 --- a/Assets/arts/spines/characters/m10012/m10012.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10012/m10012.atlas.txt.meta @@ -3,5 +3,5 @@ guid: e13431c9141f91f419aadf09835bc16c TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10012.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10012/m10012.png b/Assets/arts/spines/characters/m10012/m10012.png index b7916ce6e..e98595e29 100644 Binary files a/Assets/arts/spines/characters/m10012/m10012.png and b/Assets/arts/spines/characters/m10012/m10012.png differ diff --git a/Assets/arts/spines/characters/m10012/m10012.png.meta b/Assets/arts/spines/characters/m10012/m10012.png.meta index 14ca24fee..87dfcddc8 100644 --- a/Assets/arts/spines/characters/m10012/m10012.png.meta +++ b/Assets/arts/spines/characters/m10012/m10012.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/m10012.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10012/m10012.skel.bytes b/Assets/arts/spines/characters/m10012/m10012.skel.bytes index 7864bc320..284b817a9 100644 Binary files a/Assets/arts/spines/characters/m10012/m10012.skel.bytes and b/Assets/arts/spines/characters/m10012/m10012.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10012/m10012.skel.bytes.meta b/Assets/arts/spines/characters/m10012/m10012.skel.bytes.meta index e6a6c516e..b1d61d18a 100644 --- a/Assets/arts/spines/characters/m10012/m10012.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10012/m10012.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 7ac79b90a1d0ffe4eaa1d8e90a10a544 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10012.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10012/m10012_atlas.asset.meta b/Assets/arts/spines/characters/m10012/m10012_atlas.asset.meta index c5531db20..9b0355f4a 100644 --- a/Assets/arts/spines/characters/m10012/m10012_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10012/m10012_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10012.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10012/m10012_material.mat b/Assets/arts/spines/characters/m10012/m10012_material.mat index 2830fb4c6..814f279d7 100644 --- a/Assets/arts/spines/characters/m10012/m10012_material.mat +++ b/Assets/arts/spines/characters/m10012/m10012_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10012_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/m10012/m10012_material.mat.meta b/Assets/arts/spines/characters/m10012/m10012_material.mat.meta index a723289c1..0138cf299 100644 --- a/Assets/arts/spines/characters/m10012/m10012_material.mat.meta +++ b/Assets/arts/spines/characters/m10012/m10012_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10012.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10012/m10012_skeletondata.asset.meta b/Assets/arts/spines/characters/m10012/m10012_skeletondata.asset.meta index c5a0f1c85..d90793a45 100644 --- a/Assets/arts/spines/characters/m10012/m10012_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10012/m10012_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10012.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/m10011.prefab b/Assets/prefabs/spine/ui/characters/m10011.prefab index 53e35256e..7054c8933 100644 --- a/Assets/prefabs/spine/ui/characters/m10011.prefab +++ b/Assets/prefabs/spine/ui/characters/m10011.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 @@ -156,10 +159,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 57032383fbfe6f345a76dd407b32affe, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: adf1d7da390c55a4a987056221442709, type: 2} 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 diff --git a/Assets/prefabs/spine/ui/characters/m10012.prefab b/Assets/prefabs/spine/ui/characters/m10012.prefab index 0a230b332..4425fd419 100644 --- a/Assets/prefabs/spine/ui/characters/m10012.prefab +++ b/Assets/prefabs/spine/ui/characters/m10012.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